diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
index cca918b6..c35e5d4b 100644
--- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
@@ -6,6 +6,8 @@
package siprp.companydataloaders;
+import javax.swing.JCheckBox;
+
import com.evolute.utils.*;
import siprp.*;
@@ -103,16 +105,22 @@ public class SIPRPDataLoader implements CompanyDataLoader
// 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://" );
+// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver: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://" );
- Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" );
+ Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost: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/higiene/gestao/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java
index 3abac82c..cf42d31e 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java
@@ -7,6 +7,7 @@ import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.List;
+import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -22,6 +23,8 @@ public class EmpresaPanel extends JPanel
private final JComboBox comboEmpresa = new JComboBox();
+ private final JCheckBox checkImpressao = new JCheckBox("Imprimir tabela alargada");
+
private final GerirEmpresaPanel panelEmpresa = new GerirEmpresaPanel();
private final GerirEstabelecimentosPanel panelEstabelecimentos = new GerirEstabelecimentosPanel();
@@ -54,7 +57,7 @@ public class EmpresaPanel extends JPanel
private void setupLayout()
{
double[] cols = new double[]{
- TableLayout.MINIMUM, TableLayout.FILL,
+ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
};
double[] rows = new double[]{
TableLayout.MINIMUM, TableLayout.FILL,
@@ -67,14 +70,16 @@ public class EmpresaPanel extends JPanel
private void placeComponents()
{
- this.add( new JLabel( "Empresa" ), new TableLayoutConstraints(0,0) );
- this.add( comboEmpresa, new TableLayoutConstraints(1,0) );
- this.add( tabs, new TableLayoutConstraints(0,1,1,1) );
+ this.add( new JLabel( "Empresa" ), new TableLayoutConstraints( 0, 0 ) );
+ this.add( comboEmpresa, new TableLayoutConstraints( 1, 0 ) );
+ this.add( checkImpressao, new TableLayoutConstraints( 2, 0 ) );
+ this.add( tabs, new TableLayoutConstraints( 0, 1, 2, 1 ) );
}
private void startupListeners()
{
- comboEmpresa.addItemListener( new ItemListener(){
+ comboEmpresa.addItemListener( new ItemListener()
+ {
@Override
public void itemStateChanged( ItemEvent e )
{
@@ -90,5 +95,5 @@ public class EmpresaPanel extends JPanel
}
});
}
-
+
}
diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java
index 6093c906..b71d09d4 100644
--- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java
+++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java
@@ -14,6 +14,7 @@ import java.util.Vector;
import siprp.update.updates.V10_0_To_V10_1;
import siprp.update.updates.V10_1_To_V10_2;
import siprp.update.updates.V10_2_To_V10_3;
+import siprp.update.updates.V10_3_To_V10_4;
import siprp.update.updates.V9_1_To_V9_2;
import siprp.update.updates.V9_2_To_V9_3;
import siprp.update.updates.V9_3_To_V9_4;
@@ -57,7 +58,9 @@ public class UpdateList
new V9_5_To_V9_6(), new V9_6_To_V9_7(),
new V9_7_To_V9_8(), new V9_8_To_V9_9(),
new V9_9_To_V10_0(), new V10_0_To_V10_1(),
- new V10_1_To_V10_2(), new V10_2_To_V10_3() };
+ new V10_1_To_V10_2(), new V10_2_To_V10_3(),
+ new V10_3_To_V10_4()
+ };
protected static Executer EXECUTER;
protected static double version = -1;
diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java
new file mode 100644
index 00000000..33f0197a
--- /dev/null
+++ b/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java
@@ -0,0 +1,48 @@
+package siprp.update.updates;
+
+import com.evolute.utils.Singleton;
+import com.evolute.utils.db.DBManager;
+import com.evolute.utils.db.Executer;
+
+public class V10_3_To_V10_4
+ implements siprp.update.Update
+{
+
+ public V10_3_To_V10_4()
+ {
+ }
+
+ public String []listChanges()
+ {
+ return new String[]{
+ "adicionado campo a empresa (Imprimir tabela alargada)"
+ };
+ }
+
+ public double getStartVersion()
+ {
+ return 10.3;
+ }
+
+ public double getEndVersion()
+ {
+ return 10.4;
+ }
+
+ public void doUpdate()
+ throws Exception
+ {
+ DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER );
+ Executer executer = dbm.getSharedExecuter();
+ com.evolute.utils.sql.Update update =
+ new com.evolute.utils.sql.Update(
+ "alter table empresas add column imprimir_tabela_alargada boolean;"
+ );
+ executer.executeQuery( update );
+ }
+
+ public String toString()
+ {
+ return "v" + getStartVersion() + " para v" + getEndVersion();
+ }
+}
diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml
index be7728d3..d923514f 100644
--- a/trunk/common/src/SIPRPMap.map.xml
+++ b/trunk/common/src/SIPRPMap.map.xml
@@ -77,6 +77,7 @@
+
@@ -850,6 +851,7 @@
+
diff --git a/trunk/common/src/siprp/database/cayenne/objects/SIPRPMap.java b/trunk/common/src/siprp/database/cayenne/objects/SIPRPMap.java
new file mode 100644
index 00000000..02e79964
--- /dev/null
+++ b/trunk/common/src/siprp/database/cayenne/objects/SIPRPMap.java
@@ -0,0 +1,18 @@
+package siprp.database.cayenne.objects;
+
+import siprp.database.cayenne.objects.auto._SIPRPMap;
+
+public class SIPRPMap extends _SIPRPMap {
+
+ private static SIPRPMap instance;
+
+ private SIPRPMap() {}
+
+ public static SIPRPMap getInstance() {
+ if(instance == null) {
+ instance = new SIPRPMap();
+ }
+
+ return instance;
+ }
+}
diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_Empresas.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_Empresas.java
index 7bc49558..f3074752 100644
--- a/trunk/common/src/siprp/database/cayenne/objects/auto/_Empresas.java
+++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_Empresas.java
@@ -50,6 +50,7 @@ public abstract class _Empresas extends BaseObject {
public static final String DISTRITO_PROPERTY = "distrito";
public static final String DURACAO_PROPERTY = "duracao";
public static final String ID_PROPERTY = "id";
+ public static final String IMPRIMIR_TABELA_ALARGADA_PROPERTY = "imprimirTabelaAlargada";
public static final String INACTIVO_PROPERTY = "inactivo";
public static final String INICIO_CONTRATO_PROPERTY = "inicioContrato";
public static final String LOCALIDADE_PROPERTY = "localidade";
@@ -257,6 +258,13 @@ public abstract class _Empresas extends BaseObject {
return (Integer)readProperty("id");
}
+ public void setImprimirTabelaAlargada(Boolean imprimirTabelaAlargada) {
+ writeProperty("imprimirTabelaAlargada", imprimirTabelaAlargada);
+ }
+ public Boolean getImprimirTabelaAlargada() {
+ return (Boolean)readProperty("imprimirTabelaAlargada");
+ }
+
public void setInactivo(String inactivo) {
writeProperty("inactivo", inactivo);
}
diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_SIPRPMap.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_SIPRPMap.java
new file mode 100644
index 00000000..97b98c02
--- /dev/null
+++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_SIPRPMap.java
@@ -0,0 +1,12 @@
+package siprp.database.cayenne.objects.auto;
+
+
+
+/**
+ * This class was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public class _SIPRPMap {
+}
\ No newline at end of file