From 23a3d9234386c5ef7d72613119a764d56d9623ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 28 Oct 2008 11:10:33 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@786 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../GestaoDadosRelatorioWindow.java | 8 +++ trunk/common/src/leaf/ui/LeafTextArea.java | 71 +++++++++++++++++++ .../cayenne/objects/HsRiscoMedida.java | 2 +- .../cayenne/providers/PlanoActuacaoDAO.java | 25 +++++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 trunk/SIPRPSoft/src/siprp/higiene/legislacao/GestaoDadosRelatorioWindow.java create mode 100644 trunk/common/src/leaf/ui/LeafTextArea.java diff --git a/trunk/SIPRPSoft/src/siprp/higiene/legislacao/GestaoDadosRelatorioWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/legislacao/GestaoDadosRelatorioWindow.java new file mode 100644 index 00000000..324c422d --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/higiene/legislacao/GestaoDadosRelatorioWindow.java @@ -0,0 +1,8 @@ +package siprp.higiene.legislacao; + +import javax.swing.JFrame; + +public class GestaoDadosRelatorioWindow extends JFrame +{ + +} diff --git a/trunk/common/src/leaf/ui/LeafTextArea.java b/trunk/common/src/leaf/ui/LeafTextArea.java new file mode 100644 index 00000000..e4656459 --- /dev/null +++ b/trunk/common/src/leaf/ui/LeafTextArea.java @@ -0,0 +1,71 @@ +package leaf.ui; + +import java.beans.PropertyChangeListener; + +import javax.swing.JComponent; +import javax.swing.JTextArea; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; + +public class LeafTextArea extends JTextArea +{ + + private static final long serialVersionUID = 1L; + + private static final String PROPERTY = "CHANGED"; + + private final ChangeThread thread = new ChangeThread(); + + private boolean isRunning = true; + + public LeafTextArea( PropertyChangeListener parent ) + { + this.addPropertyChangeListener( PROPERTY, parent ); + this.addCaretListener( new CaretListener() + { + @Override + public void caretUpdate( CaretEvent e ) + { + firePropertyChange( PROPERTY, false, true ); + } + } ); + } + + @Override + public void setEditable( boolean b ) + { + super.setEditable( b ); + if( b ) + { + startThread(); + } + else + { + stopThread(); + } + } + + private void startThread() + { + isRunning = true; + thread.start(); + } + + private void stopThread() + { + isRunning = false; + } + + private class ChangeThread extends Thread + { + @Override + public synchronized void start() + { + while( isRunning ) + { + + } + } + } + +} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRiscoMedida.java b/trunk/common/src/siprp/database/cayenne/objects/HsRiscoMedida.java index a42c7427..4ff1a772 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRiscoMedida.java +++ b/trunk/common/src/siprp/database/cayenne/objects/HsRiscoMedida.java @@ -8,7 +8,7 @@ public class HsRiscoMedida extends _HsRiscoMedida { @Override public String toString() { - String d = getToHsMedida().getDescription(); + String d = getToHsMedida().getRequesitosLegais(); return d == null ? " " : d.substring( 0, Math.min( 20, d.length() ) ) + "..."; } } diff --git a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java index ae7771c3..13be35fa 100644 --- a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java +++ b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java @@ -1,6 +1,7 @@ package siprp.database.cayenne.providers; import java.util.Date; +import java.util.LinkedList; import java.util.List; import org.apache.cayenne.DataObjectUtils; @@ -16,6 +17,7 @@ import siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo; import siprp.database.cayenne.objects.HsRisco; import siprp.database.cayenne.objects.HsRiscoTema; import siprp.database.cayenne.objects.MarcacoesEstabelecimento; +import siprp.medicina.presencas.actions.RealizouAction; public class PlanoActuacaoDAO extends MainDAO { @@ -73,6 +75,29 @@ public class PlanoActuacaoDAO extends MainDAO return context.performQuery( query ); } + public List getRelatoriosNotIn( List dates ) + { + List result = new LinkedList(); + if( dates != null ) + { + SelectQuery query = new SelectQuery( HsRelatorio.class ); + query.andQualifier( ExpressionFactory.noMatchExp( HsRelatorio.IS_SUBMETIDO_PROPERTY, null ) ); + List all = context.performQuery( query ); + for( HsRelatorio relatorio : all ) + { + MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento(); + if( visita != null ) + { + Date dateVisita = visita.getData(); + if( dateVisita != null && !dates.contains( dateVisita ) ) + { + result.add( relatorio ); + } + } + } + } + return result; + } // public Legislacao createNovaLegislacao( Legislacao parent ) // { // Legislacao legislacaoObject = (Legislacao) context.newObject( Legislacao.class );