diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java index 5b020f4e..19a9c768 100644 --- a/trunk/SIPRPSoft/src/siprp/Main.java +++ b/trunk/SIPRPSoft/src/siprp/Main.java @@ -60,7 +60,7 @@ import com.evolute.utils.ui.window.LoginWindow; public class Main implements com.evolute.utils.ui.window.Connector { - public final static String SHST_VERSION = "11.9.10"; + public final static String SHST_VERSION = "11.10.0"; private static String dbase; private SIPRPTracker siprpTracker; diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index b1005a3b..ba02f062 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -86,20 +86,20 @@ public class SIPRPDataLoader implements CompanyDataLoader Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "siprp" ); Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "org.postgresql.Driver" ); -// Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" ); -// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" ); Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); +// Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); +// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index a53c2a93..f11d6d60 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -30,6 +30,7 @@ import siprp.update.updates.V11_5_To_V11_6; import siprp.update.updates.V11_6_To_V11_7; import siprp.update.updates.V11_7_To_V11_8; import siprp.update.updates.V11_8_To_V11_9; +import siprp.update.updates.V11_9_To_V11_10; import siprp.update.updates.V6_1_To_V7_0; import siprp.update.updates.V7_0_To_V7_2; import siprp.update.updates.V7_2_To_V7_4; @@ -101,7 +102,8 @@ public class UpdateList new V11_1_To_V11_2(), new V11_2_To_V11_3(), new V11_3_To_V11_4(), new V11_4_To_V11_5(), new V11_5_To_V11_6(), new V11_6_To_V11_7(), - new V11_7_To_V11_8(), new V11_8_To_V11_9() + new V11_7_To_V11_8(), new V11_8_To_V11_9(), + new V11_9_To_V11_10() }; protected static Executer EXECUTER; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10.java new file mode 100644 index 00000000..49b673d9 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10.java @@ -0,0 +1,115 @@ +package siprp.update.updates; + +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.util.Vector; + +import javax.imageio.ImageIO; + +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.BlobUpdate; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.Select2; +import com.evolute.utils.sql.Update; + +public class V11_9_To_V11_10 implements siprp.update.Update +{ + + public V11_9_To_V11_10() + { + } + + public String []listChanges() + { + return new String[]{ + "A actualizar informacao dos tecnicos de higiene e seguranca" + }; + } + + public double getStartVersion() + { + return 11.9; + } + + public double getEndVersion() + { + return 11.10; + } + + public void doUpdate() throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + + String nomes[] = new String[]{ + "David Afonso", + "B\u00e1rbara Gon\u00e7alves", + "Ana Sofia Jorge" + }; + Integer ids[] = new Integer[]{ + 3, + 4, + 5 + }; + String caps[] = new String[]{ + "28291002EC3", + "em emiss\u00e3o - A 100 60 1820 D", + "17050910EC5" }; + String assinaturas[] = new String[]{ + null, + "siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png", + "siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png" }; + + for( int n = 0; n < ids.length; n++ ) + { + Vector assignments = new Vector(); + assignments.add( new Assignment( "cap", caps[ n ] ) ); + if( assinaturas[ n ] != null ) + { + Integer assinaturaID = null; + String assinatura = "Assinatura(" + nomes[ n ] + ")"; + BufferedImage assinaturaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( + assinaturas[ n ] ) ); + ByteArrayOutputStream assinaturaBytesStream = new ByteArrayOutputStream(); + ImageIO.write( assinaturaImage, "PNG", assinaturaBytesStream ); + if( assinaturaImage == null || assinaturaBytesStream.size() == 0 ) + { + throw new Exception("Erro ao ler assinatura: " + assinatura ); + } + Insert insertQuery = new Insert( "image", new Assignment[]{ + new Assignment(new Field("name"),assinatura) + } ); + Virtual2DArray array = executer.executeQuery( insertQuery ); + Select2 selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assinatura ),null,null,null,null); + array = executer.executeQuery( selectQuery ); + if( array.columnLength() == 1 ) + { + assinaturaID = (Integer) array.get( 0, 0 ); + } + if( assinaturaID == null ) + { + throw new Exception("Erro ao inserir assinatura: " + assinatura ); + } + BlobUpdate blobUpdate = new BlobUpdate("image","image_data",assinaturaBytesStream.toByteArray(),new Field("id").isEqual( assinaturaID ) ); + executer.executeQuery( blobUpdate ); + assignments.add( new Assignment( "assinatura", assinaturaID ) ); + } + Update update = + new Update( "marcacoes_tecnicos_hst", + assignments.toArray( new Assignment[ assignments.size() ] ), + new Field( "id" ).isEqual( ids[ n ] ) ); + executer.executeQuery( update ); + } + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png new file mode 100644 index 00000000..7dfee8e2 Binary files /dev/null and b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png differ diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png new file mode 100644 index 00000000..1e5fa9e7 Binary files /dev/null and b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png differ