diff --git a/trunk/alter_20060516.sql b/trunk/alter_20060516.sql
new file mode 100644
index 00000000..3e76a52c
--- /dev/null
+++ b/trunk/alter_20060516.sql
@@ -0,0 +1,2 @@
+alter table empresas add inicio_contrato date;
+alter table empresas add duracao int;
\ No newline at end of file
diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index 1d988408..f27544b8 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -29,7 +29,7 @@ import javax.swing.tree.*;
public class Main implements com.evolute.utils.ui.window.Connector
{
- public final static String SHST_VERSION = "5.8.4";
+ public final static String SHST_VERSION = "5.8.6";
private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();
@@ -288,4 +288,4 @@ System.out.println( "INIT: " + d );
Singleton.setInstance( Singleton.DEFAULT_JDO_PROVIDER, jdoProvider );
System.out.println( "PM done " + new Date() + "JDO: " + jdoProvider );
}
-}
\ No newline at end of file
+}
diff --git a/trunk/siprp/clientes/EmpresaPanel.java b/trunk/siprp/clientes/EmpresaPanel.java
index 79d78098..a73b29f3 100644
--- a/trunk/siprp/clientes/EmpresaPanel.java
+++ b/trunk/siprp/clientes/EmpresaPanel.java
@@ -57,6 +57,8 @@ public class EmpresaPanel extends JPanel
private ContactoPanel contacto2Panel;
private JCalendarPanel envioPropostaPanel;
private JCalendarPanel aceitacaoPropostaPanel;
+ private JCalendarPanel inicioContratoPanel;
+ private JTextField duracaoContratoText;
private JCalendarPanel cancelamentoPanel;
private JCalendarPanel envioContratoPanel;
private JCalendarPanel recepcaoContratoPanel;
@@ -174,6 +176,11 @@ public class EmpresaPanel extends JPanel
envioPropostaPanel = new JCalendarPanel( null );
JLabel aceitacaoPropostaLabel = new JLabel( "Aceita\u00e7\u00e3o" );
aceitacaoPropostaPanel = new JCalendarPanel( null );
+ JLabel inicioContratoLabel = new JLabel( "In\u00edcio" );
+ inicioContratoPanel = new JCalendarPanel( null );
+ JLabel duracaoContratoLabel = new JLabel( "Dura\u00e7\u00e3o (meses)" );
+ duracaoContratoText = new JTextField();
+ duracaoContratoText.setDocument( new IntegerDocument( 5, false ) );
JLabel cancelamentoLabel = new JLabel( "Cancelamento" );
cancelamentoPanel = new JCalendarPanel( null );
JLabel envioContratoLabel = new JLabel( "Envio Contrato" );
@@ -322,15 +329,15 @@ public class EmpresaPanel extends JPanel
formalidadesPanel.add( envioPropostaPanel );
constraints.weightx = 0;
- gridbag.setConstraints( cancelamentoLabel, constraints );
- formalidadesPanel.add( cancelamentoLabel );
+ gridbag.setConstraints( inicioContratoLabel, constraints );
+ formalidadesPanel.add( inicioContratoLabel );
constraints.weightx = 0.2;
constraints.gridwidth = 1;
// JPanel perfisPanel = new JPanel();
- gridbag.setConstraints( cancelamentoPanel, constraints );
- formalidadesPanel.add( cancelamentoPanel );
-
+ gridbag.setConstraints( inicioContratoPanel, constraints );
+ formalidadesPanel.add( inicioContratoPanel );
+
constraints.weightx = 0.4;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( precoLabel, constraints );
@@ -346,10 +353,15 @@ public class EmpresaPanel extends JPanel
gridbag.setConstraints( aceitacaoPropostaPanel, constraints );
formalidadesPanel.add( aceitacaoPropostaPanel );
+ constraints.weightx = 0;
+ gridbag.setConstraints( duracaoContratoLabel, constraints );
+ formalidadesPanel.add( duracaoContratoLabel );
+
constraints.weightx = 0.2;
- constraints.gridwidth = 2;
- gridbag.setConstraints( servicosCombo, constraints );
- formalidadesPanel.add( servicosCombo );
+ constraints.gridwidth = 1;
+// JPanel perfisPanel = new JPanel();
+ gridbag.setConstraints( duracaoContratoText, constraints );
+ formalidadesPanel.add( duracaoContratoText );
constraints.weightx = 0;
constraints.gridwidth = 1;
@@ -376,14 +388,14 @@ public class EmpresaPanel extends JPanel
formalidadesPanel.add( envioContratoPanel );
constraints.weightx = 0;
- constraints.gridwidth = 1;
- gridbag.setConstraints( relatorioAnualLabel, constraints );
- formalidadesPanel.add( relatorioAnualLabel );
+ gridbag.setConstraints( cancelamentoLabel, constraints );
+ formalidadesPanel.add( cancelamentoLabel );
constraints.weightx = 0.2;
constraints.gridwidth = 1;
- gridbag.setConstraints( relatorioAnualPanel, constraints );
- formalidadesPanel.add( relatorioAnualPanel );
+// JPanel perfisPanel = new JPanel();
+ gridbag.setConstraints( cancelamentoPanel, constraints );
+ formalidadesPanel.add( cancelamentoPanel );
constraints.weightx = 0;
constraints.gridwidth = 1;
@@ -412,9 +424,8 @@ public class EmpresaPanel extends JPanel
constraints.weightx = 0.2;
constraints.gridwidth = 2;
- pad = new JPanel();
- gridbag.setConstraints( pad, constraints );
- formalidadesPanel.add( pad );
+ gridbag.setConstraints( servicosCombo, constraints );
+ formalidadesPanel.add( servicosCombo );
constraints.weightx = 0;
constraints.gridwidth = 1;
@@ -426,7 +437,6 @@ public class EmpresaPanel extends JPanel
gridbag.setConstraints( modalidadePagamentoText, constraints );
formalidadesPanel.add( modalidadePagamentoText );
-
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( envioIdictLabel, constraints );
@@ -436,7 +446,17 @@ public class EmpresaPanel extends JPanel
gridbag.setConstraints( envioIdictPanel, constraints );
formalidadesPanel.add( envioIdictPanel );
- constraints.weightx = 0.7;
+ constraints.weightx = 0;
+ constraints.gridwidth = 1;
+ gridbag.setConstraints( relatorioAnualLabel, constraints );
+ formalidadesPanel.add( relatorioAnualLabel );
+
+ constraints.weightx = 0.2;
+ constraints.gridwidth = 1;
+ gridbag.setConstraints( relatorioAnualPanel, constraints );
+ formalidadesPanel.add( relatorioAnualPanel );
+
+ constraints.weightx = 0.4;
constraints.gridwidth = GridBagConstraints.REMAINDER;
pad = new JPanel();
gridbag.setConstraints( pad, constraints );
@@ -708,6 +728,8 @@ public class EmpresaPanel extends JPanel
components.putComponent( EmpresaData.CONCELHO, concelhoText );
components.putComponent( EmpresaData.DATA_PROPOSTA, envioPropostaPanel );
components.putComponent( EmpresaData.DATA_ACEITACAO, aceitacaoPropostaPanel );
+ components.putComponent( EmpresaData.INICIO_CONTRATO, inicioContratoPanel );
+ components.putComponent( EmpresaData.DURACAO, duracaoContratoText );
components.putComponent( EmpresaData.DATA_CANCELAMENTO, cancelamentoPanel );
components.putDummy( EmpresaData.PERFIL_1 );
components.putDummy( EmpresaData.PERFIL_2);
diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/siprp/companydataloaders/SIPRPDataLoader.java
index a7472f30..f084da7d 100644
--- a/trunk/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/siprp/companydataloaders/SIPRPDataLoader.java
@@ -96,22 +96,22 @@ public class SIPRPDataLoader implements CompanyDataLoader
// 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" );
-// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-
-// Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-// Singleton.setInstance( Singleton65Constants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.3: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, "localhost:5432" );
+ Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.3: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, "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/siprp/data/Empresa.java b/trunk/siprp/data/Empresa.java
index bc4af209..7a64f2dc 100644
--- a/trunk/siprp/data/Empresa.java
+++ b/trunk/siprp/data/Empresa.java
@@ -1,7 +1,7 @@
/*
* Empresa.java
*
-* Generated by com.evutils.codegen.JDOObjectGenerator on Jan 31, 2006
+* Generated by com.evutils.codegen.JDOObjectGenerator on 17/Mai/2006
*
* Use but DON'T TOUCH
*/
@@ -26,6 +26,8 @@ public final class Empresa implements JDOInnerObject
private String concelho;
private Date data_proposta;
private Date data_aceitacao;
+ private Date inicio_contrato;
+ private Integer duracao;
private Date data_cancelamento;
private String perfil_1;
private String perfil_2;
@@ -115,6 +117,14 @@ public final class Empresa implements JDOInnerObject
{
return data_aceitacao;
}
+ else if( fieldName == EmpresaData.INICIO_CONTRATO )
+ {
+ return inicio_contrato;
+ }
+ else if( fieldName == EmpresaData.DURACAO )
+ {
+ return duracao;
+ }
else if( fieldName == EmpresaData.DATA_CANCELAMENTO )
{
return data_cancelamento;
@@ -275,6 +285,14 @@ public final class Empresa implements JDOInnerObject
{
return data_aceitacao;
}
+ else if( fieldName.equals( EmpresaData.INICIO_CONTRATO ) )
+ {
+ return inicio_contrato;
+ }
+ else if( fieldName.equals( EmpresaData.DURACAO ) )
+ {
+ return duracao;
+ }
else if( fieldName.equals( EmpresaData.DATA_CANCELAMENTO ) )
{
return data_cancelamento;
@@ -440,6 +458,14 @@ public final class Empresa implements JDOInnerObject
{
data_aceitacao = ( Date ) value;
}
+ else if( fieldName == EmpresaData.INICIO_CONTRATO )
+ {
+ inicio_contrato = ( Date ) value;
+ }
+ else if( fieldName == EmpresaData.DURACAO )
+ {
+ duracao = ( Integer ) value;
+ }
else if( fieldName == EmpresaData.DATA_CANCELAMENTO )
{
data_cancelamento = ( Date ) value;
@@ -600,6 +626,14 @@ public final class Empresa implements JDOInnerObject
{
data_aceitacao = ( Date ) value;
}
+ else if( fieldName.equals( EmpresaData.INICIO_CONTRATO ) )
+ {
+ inicio_contrato = ( Date ) value;
+ }
+ else if( fieldName.equals( EmpresaData.DURACAO ) )
+ {
+ duracao = ( Integer ) value;
+ }
else if( fieldName.equals( EmpresaData.DATA_CANCELAMENTO ) )
{
data_cancelamento = ( Date ) value;
diff --git a/trunk/siprp/data/EmpresaData.java b/trunk/siprp/data/EmpresaData.java
index eea9b2e5..437a7f72 100644
--- a/trunk/siprp/data/EmpresaData.java
+++ b/trunk/siprp/data/EmpresaData.java
@@ -1,7 +1,7 @@
/*
* EmpresaData.java
*
-* Generated by com.evutils.codegen.JDOObjectGenerator on Jan 31, 2006
+* Generated by com.evutils.codegen.JDOObjectGenerator on 17/Mai/2006
*
* Use but DON'T TOUCH
*/
@@ -27,6 +27,8 @@ public final class EmpresaData extends JDOObject
public static final String CONCELHO = "concelho";
public static final String DATA_PROPOSTA = "data_proposta";
public static final String DATA_ACEITACAO = "data_aceitacao";
+ public static final String INICIO_CONTRATO = "inicio_contrato";
+ public static final String DURACAO = "duracao";
public static final String DATA_CANCELAMENTO = "data_cancelamento";
public static final String PERFIL_1 = "perfil_1";
public static final String PERFIL_2 = "perfil_2";
@@ -58,22 +60,23 @@ public final class EmpresaData extends JDOObject
DESIGNACAO_SOCIAL, DESIGNACAO_SOCIAL_PLAIN, SERVICO_SAUDE_TIPO,
SERVICO_SAUDE_DESIGNACAO, SERVICO_HIGIENE_TIPO, SERVICO_HIGIENE_DESIGNACAO,
MORADA, CODIGO_POSTAL, LOCALIDADE, DISTRITO, CONCELHO, DATA_PROPOSTA,
- DATA_ACEITACAO, DATA_CANCELAMENTO, PERFIL_1, PERFIL_2, DATA_ENVIO_CONTRATO,
- DATA_RECEPCAO_CONTRATO, DATA_ENVIO_IDICT, DATA_RELATORIO_ANUAL, CODIGO_1,
- CODIGO_2, CODIGO_3, CAE, ACTIVIDADE, CONTRIBUINTE, SEGURANCA_SOCIAL, PRECO_HIGIENE,
- PRECO_MEDICINA, PERIODICIDADE, CONTACTO_1, CONTACTO_2, SERVICOS, A_CONSULTAS,
- A_EXAMES, B_CONSULTAS, B_EXAMES, };
+ DATA_ACEITACAO, INICIO_CONTRATO, DURACAO, DATA_CANCELAMENTO, PERFIL_1, PERFIL_2,
+ DATA_ENVIO_CONTRATO, DATA_RECEPCAO_CONTRATO, DATA_ENVIO_IDICT,
+ DATA_RELATORIO_ANUAL, CODIGO_1, CODIGO_2, CODIGO_3, CAE, ACTIVIDADE, CONTRIBUINTE,
+ SEGURANCA_SOCIAL, PRECO_HIGIENE, PRECO_MEDICINA, PERIODICIDADE, CONTACTO_1,
+ CONTACTO_2, SERVICOS, A_CONSULTAS, A_EXAMES, B_CONSULTAS, B_EXAMES, };
protected static final String ALL_FIELD_NAMES[] = new String[]{
ID, DESIGNACAO_SOCIAL, DESIGNACAO_SOCIAL_PLAIN, SERVICO_SAUDE_TIPO,
SERVICO_SAUDE_DESIGNACAO, SERVICO_HIGIENE_TIPO, SERVICO_HIGIENE_DESIGNACAO,
MORADA, CODIGO_POSTAL, LOCALIDADE, DISTRITO, CONCELHO, DATA_PROPOSTA,
- DATA_ACEITACAO, DATA_CANCELAMENTO, PERFIL_1, PERFIL_2, DATA_ENVIO_CONTRATO,
- DATA_RECEPCAO_CONTRATO, DATA_ENVIO_IDICT, DATA_RELATORIO_ANUAL, CODIGO_1,
- CODIGO_2, CODIGO_3, CAE, ACTIVIDADE, CONTRIBUINTE, SEGURANCA_SOCIAL, PRECO_HIGIENE,
- PRECO_MEDICINA, PERIODICIDADE, CONTACTO_1, CONTACTO_2, SERVICOS, INACTIVO,
- ACTUALIZACAO, A_CONSULTAS, A_EXAMES, B_CONSULTAS, B_EXAMES, };
+ DATA_ACEITACAO, INICIO_CONTRATO, DURACAO, DATA_CANCELAMENTO, PERFIL_1, PERFIL_2,
+ DATA_ENVIO_CONTRATO, DATA_RECEPCAO_CONTRATO, DATA_ENVIO_IDICT,
+ DATA_RELATORIO_ANUAL, CODIGO_1, CODIGO_2, CODIGO_3, CAE, ACTIVIDADE, CONTRIBUINTE,
+ SEGURANCA_SOCIAL, PRECO_HIGIENE, PRECO_MEDICINA, PERIODICIDADE, CONTACTO_1,
+ CONTACTO_2, SERVICOS, INACTIVO, ACTUALIZACAO, A_CONSULTAS, A_EXAMES, B_CONSULTAS,
+ B_EXAMES, };
private HashMap dataHash;
diff --git a/trunk/siprp/data/EmpresaID.java b/trunk/siprp/data/EmpresaID.java
index 68fcce9d..ddee27c0 100644
--- a/trunk/siprp/data/EmpresaID.java
+++ b/trunk/siprp/data/EmpresaID.java
@@ -1,7 +1,7 @@
/*
* EmpresaID.java
*
-* Generated by com.evolute.codegen.jdo.idclassgenerators.JPOXIDClassGenerator on Jan 31, 2006
+* Generated by com.evolute.codegen.jdo.idclassgenerators.JPOXIDClassGenerator on 17/Mai/2006
*
* Use but DON'T TOUCH
*/
diff --git a/trunk/siprp/data/package.jdo b/trunk/siprp/data/package.jdo
index 477f0586..5ef176e2 100644
--- a/trunk/siprp/data/package.jdo
+++ b/trunk/siprp/data/package.jdo
@@ -159,6 +159,18 @@
+
+
+
+
+
+
+
+
+
+
+
+