diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java index d8b14997..28093a53 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java @@ -18,6 +18,7 @@ public abstract class _Prestadores extends siprp.database.cayenne.objects.BaseOb public static final String MORADA_PROPERTY = "morada"; public static final String NOME_PROPERTY = "nome"; public static final String NOME_PLAIN_PROPERTY = "nomePlain"; + public static final String OBSERVACOES_PROPERTY = "observacoes"; public static final String ESTABELECIMENTOS_ARRAY_PROPERTY = "estabelecimentosArray"; public static final String ESTABELECIMENTOS_ARRAY1_PROPERTY = "estabelecimentosArray1"; public static final String MARCACOES_TRABALHADOR_ARRAY_PROPERTY = "marcacoesTrabalhadorArray"; @@ -120,6 +121,14 @@ public abstract class _Prestadores extends siprp.database.cayenne.objects.BaseOb } + public void setObservacoes(String observacoes) { + writeProperty("observacoes", observacoes); + } + public String getObservacoes() { + return (String)readProperty("observacoes"); + } + + public void addToEstabelecimentosArray(siprp.database.cayenne.objects.Estabelecimentos obj) { addToManyTarget("estabelecimentosArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java index e2ae9fa6..ca759f1c 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java @@ -8,6 +8,7 @@ package siprp.database.cayenne.objects.auto; public abstract class _Trabalhadores extends siprp.database.cayenne.objects.BaseObject { public static final String ACTUALIZACAO_PROPERTY = "actualizacao"; + public static final String BI_PROPERTY = "bi"; public static final String CATEGORIA_PROPERTY = "categoria"; public static final String DATA_ADMISSAO_PROPERTY = "dataAdmissao"; public static final String DATA_ADMISSAO_FUNCAO_PROPERTY = "dataAdmissaoFuncao"; @@ -41,6 +42,14 @@ public abstract class _Trabalhadores extends siprp.database.cayenne.objects.Base } + public void setBi(String bi) { + writeProperty("bi", bi); + } + public String getBi() { + return (String)readProperty("bi"); + } + + public void setCategoria(String categoria) { writeProperty("categoria", categoria); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresProcesso.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresProcesso.java index 0ef06736..749194dd 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresProcesso.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresProcesso.java @@ -7,6 +7,7 @@ package siprp.database.cayenne.objects.auto; */ public abstract class _TrabalhadoresProcesso extends siprp.database.cayenne.objects.BaseObject { + public static final String ACTIVO_PROPERTY = "activo"; public static final String DATA_FIM_PROPERTY = "dataFim"; public static final String DATA_INICIO_PROPERTY = "dataInicio"; public static final String ESTADO_PROPERTY = "estado"; @@ -20,6 +21,14 @@ public abstract class _TrabalhadoresProcesso extends siprp.database.cayenne.obje public static final String ID_PK_COLUMN = "id"; + public void setActivo(String activo) { + writeProperty("activo", activo); + } + public String getActivo() { + return (String)readProperty("activo"); + } + + public void setDataFim(java.util.Date dataFim) { writeProperty("dataFim", dataFim); } diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index 83607f16..4d0751d2 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -30,7 +30,8 @@ public class UpdateList new siprp.update.updates.V7_7_To_V7_8(), new siprp.update.updates.V7_8_To_V7_9(), new siprp.update.updates.V7_9_To_V8_0(), new siprp.update.updates.V8_0_To_V8_1(), new siprp.update.updates.V8_1_To_V8_2(), new siprp.update.updates.V8_2_To_V8_3(), - new siprp.update.updates.V8_3_To_V8_4(), new siprp.update.updates.V8_4_To_V8_5() }; + new siprp.update.updates.V8_3_To_V8_4(), new siprp.update.updates.V8_4_To_V8_5(), + new siprp.update.updates.V8_5_To_V8_6() }; protected static Executer EXECUTER; protected static double version = -1; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java new file mode 100644 index 00000000..f3e5676c --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java @@ -0,0 +1,62 @@ +/* + * V8_12_To_V8_3.java + * + * Created on December 19, 2007, 3:12 PM + * + * To change this template, choose Tools | Template Manager + * and open the template in the editor. + */ + +package siprp.update.updates; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Field; + +/** + * + * @author tsimao + * + */ +public class V8_5_To_V8_6 implements siprp.update.Update +{ + public V8_5_To_V8_6() + { + } + + public String[] listChanges() + { + return new String[] { + "Adicionado campo 'activo' a TrabalhadoresProcesso\n"+ + "Adicionada observacao a Prestadores\n"+ + "Adicionado BI a Trabalhadores\n" + }; + } + + public double getStartVersion() + { + return 8.5; + } + + public double getEndVersion() + { + return 8.6; + } + + 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 trabalhadores_processo ADD COLUMN activo char default 'y';" + + "ALTER TABLE prestadores ADD COLUMN observacoes character varying(65535);" + + "ALTER TABLE trabalhadores ADD COLUMN bi character varying(255);"); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +}