diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java index a066651a..362c95b0 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java @@ -32,6 +32,7 @@ import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Insert; import com.evolute.utils.sql.Select; import com.evolute.utils.sql.Select2; +import com.evolute.utils.sql.Update; /** * @@ -214,19 +215,15 @@ public class LembretesDataProvider public void apagarLembreteByID( Integer id ) throws Exception { - Delete delete = - new Delete( "lembretes", - new Field( "id" ).isEqual( id ) ); - EXECUTER.executeQuery( delete ); + Update update = new Update( "lembretes", new Assignment[]{ new Assignment(new Field("deleted_date"),new Date()) }, new Field("id").isEqual( id ) ); + EXECUTER.executeQuery( update ); } public void apagarLembreteByMarcacaoTrabalhadorID( Integer marcacaoID ) throws Exception { - Delete delete = - new Delete( "lembretes", - new Field( "marcacao_trabalhador_id" ).isEqual( marcacaoID ) ); - EXECUTER.executeQuery( delete ); + Update update = new Update( "lembretes", new Assignment[]{ new Assignment(new Field("deleted_date"),new Date()) }, new Field("marcacao_trabalhador_id").isEqual( marcacaoID ) ); + EXECUTER.executeQuery( update ); } public int countLembretesByTipo( Integer tipoID ) @@ -236,7 +233,8 @@ public class LembretesDataProvider new Select( new String[]{ "lembretes" }, new String[]{ "COUNT(*)" }, new Field( "tipo_id" ).isEqual( tipoID ).and( - new Field( "data" ).isLessOrEqual( new Date() ) ) ); + new Field( "data" ).isLessOrEqual( new Date() ) ).and( + new Field( "deleted_date" ).isEqual( null ) ) ); Virtual2DArray array = EXECUTER.executeQuery( select ); if( array.columnLength() == 0 || array.get( 0, 0 ) == null ) { @@ -260,7 +258,8 @@ public class LembretesDataProvider "marcacao_trabalhador_id", "enviar_email", "periodicidade_dias", "periodicidade_meses" , "trabalhadores_consultas_datas_id", "trabalhadores_ecds_datas_id" }, new Field( "tipo_id" ).isEqual( tipoID ).and( - new Field( "data" ).isLessOrEqual( new Date() ) ) ); + new Field( "data" ).isLessOrEqual( new Date() ) ).and( + new Field( "deleted_date" ).isEqual( null ) ) ); Virtual2DArray array = EXECUTER.executeQuery( select ); Lembrete lembretes[] = new Lembrete[ array.columnLength() ]; for( int n = 0; n < lembretes.length; n++ ) @@ -297,7 +296,8 @@ public class LembretesDataProvider "trabalhador_id", "marcacao_estabelecimento_id", "marcacao_trabalhador_id", "enviar_email", "periodicidade_dias", "periodicidade_meses", "trabalhadores_consultas_datas_id", "trabalhadores_ecds_datas_id" }, - new Field( "id" ).isEqual( id ) ); + new Field( "id" ).isEqual( id ).and( + new Field( "deleted_date" ).isEqual( null ) ) ); Virtual2DArray array = EXECUTER.executeQuery( select ); if( array.columnLength() == 0 ) { diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesPanel.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesPanel.java deleted file mode 100644 index 1e7375cf..00000000 --- a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesPanel.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * LembretesPanel.java - * - * Created on February 6, 2007, 5:14 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.lembretes; - -import java.awt.*; -import javax.swing.*; - -/** - * - * @author fpalma - */ -public class LembretesPanel extends JPanel -{ - - /** Creates a new instance of LembretesPanel */ - public LembretesPanel() - { - setupComponents(); - } - - private void setupComponents() - { - } -} diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java index e4f757a7..a3940a88 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java @@ -36,6 +36,7 @@ import javax.swing.event.ListSelectionListener; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.providers.MedicinaDAO; +import siprp.lembretes.marcacoes.LembretesMarcacaoPanel; import siprp.lembretes.remarcacoes.LembretesRemarcacaoPanel; /** @@ -284,6 +285,7 @@ public class LembretesWindow extends JFrame } if( CODE_MARCACOES.equals( tipo.getCodigo() ) ) { + lembretesPanel.add( new LembretesMarcacaoPanel( empresaID, estabelecimentoID ) ); } if( CODE_OUTROS.equals( tipo.getCodigo() ) ) { diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/LembretesMarcacaoPanel.java b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/LembretesMarcacaoPanel.java new file mode 100755 index 00000000..8c1c3add --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/LembretesMarcacaoPanel.java @@ -0,0 +1,69 @@ +/* + * LembretesRemarcacaoPanel.java + * + * Created on 13 de Fevereiro de 2007, 23:24 + * + * To change this template, choose Tools | Template Manager + * and open the template in the editor. + */ + +package siprp.lembretes.marcacoes; + +import java.awt.BorderLayout; +import java.awt.GridLayout; + +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import siprp.lembretes.LembretesConstants; + +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel; + + +public class LembretesMarcacaoPanel extends JPanel + implements LembretesConstants +{ + protected JScrollPane listTrabalhadoresScroll; + protected MultipleActionListPanel listTrabalhadoresPanel; + + protected MarcacoesDataProvider provider; + + private final Integer empresaID; + private final Integer estabelecimentoID; + + private JDOProvider JDO; + + /** Creates a new instance of LembretesRemarcacaoPanel */ + public LembretesMarcacaoPanel( Integer empresaID, Integer estabelecimentoID ) + throws Exception + { + this.empresaID = empresaID; + this.estabelecimentoID = estabelecimentoID; + provider = MarcacoesDataProvider.getProvider(); + setupComponents(); + } + + private void setupComponents() + throws Exception + { + listTrabalhadoresPanel = + new MultipleActionListPanel( + new MarcacoesActionFactory[]{ }, + new MarcacoesActionFactory[]{ new MarcacoesActionFactory( MarcacoesActionFactory.TRABALHADOR ) } ); + listTrabalhadoresScroll = + new JScrollPane( listTrabalhadoresPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); + setLayout( new GridLayout( 1, 2 ) ); + JPanel trabalhadoresPanel = new JPanel(); + add( trabalhadoresPanel ); + + trabalhadoresPanel.setLayout( new BorderLayout() ); + trabalhadoresPanel.add( new JLabel( "Consultas / ECDs", JLabel.CENTER ), BorderLayout.NORTH ); + trabalhadoresPanel.add( listTrabalhadoresScroll, BorderLayout.CENTER ); + + listTrabalhadoresPanel.showList( provider.getLembretesMarcacaoTrabalhador( empresaID, estabelecimentoID ) ); +// listEstabelecimentosPanel.showList( estabelecimentos.toArray( new IDObject[ estabelecimentos.size() ] ) ); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesActionFactory.java b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesActionFactory.java new file mode 100755 index 00000000..c1eafae9 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesActionFactory.java @@ -0,0 +1,54 @@ +/* + * RemarcacoesActionFactory.java + * + * Created on January 31, 2007, 6:37 PM + * + * To change this template, choose Tools | Template Manager + * and open the template in the editor. + */ + +package siprp.lembretes.marcacoes; + +import javax.swing.Action; + +import siprp.lembretes.marcacoes.actions.TratarCriacaoProcessoTrabalhadorAction; + +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.panel.multipleactionlist.ActionFactory; + +/** + * + * @author fpalma + */ +public class MarcacoesActionFactory implements ActionFactory +{ + public static final int TRABALHADOR = 0; + + protected final int TIPO; + + /** + * Creates a new instance of RemarcacoesActionFactory + */ + public MarcacoesActionFactory( int tipo ) + { + TIPO = tipo; + } + + public Action createAction(IDObject[] objects) + { + return null; + } + + public Action createAction(IDObject object) + { + switch( TIPO ) + { + case TRABALHADOR: + return new TratarCriacaoProcessoTrabalhadorAction( object ); + + default: + return null; + } + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java index 627bb41d..7387c03d 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java @@ -9,6 +9,14 @@ package siprp.lembretes.remarcacoes; +import java.text.DateFormat; +import java.util.Date; +import java.util.Locale; + +import siprp.data.Marcacao; +import siprp.lembretes.LembretesConstants; +import siprp.lembretes.LembretesDataProvider; + import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.data.IDObject; @@ -19,14 +27,6 @@ import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select; import com.evolute.utils.sql.Select2; -import java.text.DateFormat; -import java.util.Date; -import java.util.Locale; -import siprp.data.Marcacao; -import siprp.database.cayenne.providers.MedicinaDAO; -import siprp.lembretes.LembretesConstants; -import siprp.lembretes.LembretesDataProvider; -import siprp.medicina.processo.database.MedicinaProcessoDAO; /** * @@ -68,7 +68,8 @@ public class RemarcacoesDataProvider { Expression result = new Field( "lembretes.tipo_id" ).isEqual( lembretesProvider.getTipoLembreteByCodigo( LembretesConstants.CODE_REMARCACOES ).getID() ).and( - new Field( "lembretes.data" ).isLessOrEqual( new Field( "current_date" ) ) ); + new Field( "lembretes.data" ).isLessOrEqual( new Field( "current_date" ) ) ).and( + new Field( "lembretes.deleted_date" ).isEqual( null ) ); if( empresaID != null ) { result = result.and( new Field("empresas.id").isEqual( empresaID ) ); diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index c8b34513..a7295fd5 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -32,7 +32,7 @@ public class UpdateList 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_5_To_V8_6(), new siprp.update.updates.V8_6_To_V8_7(), - new siprp.update.updates.V8_7_To_V8_8() }; + new siprp.update.updates.V8_7_To_V8_8(), new siprp.update.updates.V8_8_To_V8_9() }; protected static Executer EXECUTER; protected static double version = -1; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java new file mode 100644 index 00000000..6cc411dc --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java @@ -0,0 +1,61 @@ +/* + * V8_1_To_V8_2.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; + +/** + * + * @author fpalma + */ +public class V8_8_To_V8_9 + implements siprp.update.Update +{ + + /** + * Creates a new instance of V8_6_To_V8_7 + */ + public V8_8_To_V8_9() + { + } + + public String []listChanges() + { + return new String[]{ "Adicionada coluna em 'lembretes' para marcar lembretes já tratados" }; + } + + public double getStartVersion() + { + return 8.8; + } + + public double getEndVersion() + { + return 8.9; + } + + 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 lembretes add column deleted_date timestamp;" ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +}