From 172f09be1792dc452be5ac03cd3935bee7d3c561 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Wed, 4 May 2011 12:28:11 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1675 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../FormDirGerRh.java | 2 +- .../FormDirSiprp.java | 2 +- .../analiseacidentestrabalho/FormGestor.java | 2 +- .../java/analiseacidentestrabalho/FormHS.java | 3 +- .../analiseacidentestrabalho/FormMedico.java | 2 +- .../java/analiseacidentestrabalho/FormRH.java | 2 +- .../FormSeguranca.java | 2 +- .../db/providers/AnalisesDataProvider.java | 28 ++++--------------- .../src/java/utils/Utils.java | 11 ++++++++ 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java index b66148b6..049b222c 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java @@ -1698,7 +1698,7 @@ public class FormDirGerRh extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java index 30638405..79dd5116 100755 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java @@ -1722,7 +1722,7 @@ public class FormDirSiprp extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java index ebb24920..e1459377 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java @@ -1776,7 +1776,7 @@ public class FormGestor extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java index 63881aa2..ccda294c 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java @@ -33,7 +33,6 @@ import db.providers.AnalisesActualDataProvider; import db.providers.AnalisesConcluidasDataProvider; import db.providers.AnalisesDataProvider; import db.providers.AnalisesSeguimentoDataProvider; -import db.providers.EstatisticasDataProvider; import global.Global; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -2115,7 +2114,7 @@ public class FormHS extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0 ].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } public void dropCurrentYear_valueChangeListener( ValueChangeEvent event ) diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java index fe1e34df..35524f6f 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java @@ -1954,7 +1954,7 @@ public class FormMedico extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java index f8ff8d34..064f5d5b 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java @@ -2150,7 +2150,7 @@ public class FormRH extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java index 0bb1bee8..560886cf 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java @@ -2249,7 +2249,7 @@ public class FormSeguranca extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java index 58b02dde..a9555486 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java @@ -3109,31 +3109,15 @@ public class AnalisesDataProvider extends GenericDataProvider Expression where = new Field( "apagada" ).isEqual( "n" ); if ( excludeYear != null ) { - where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).notIn( new Integer[] - { - excludeYear - } ) ); + where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).notIn( new Integer[] { excludeYear } ) ); } Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano" }, where, - new String[] - { - "ano DESC" - }, + new String[] { "ano DESC" }, null, null, null ); query.disableOrderFieldsVerification(); Virtual2DArray array = getExecuter().executeQuery( query ); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java index 450829d3..365aed89 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java @@ -515,6 +515,17 @@ public class Utils { } } + public static Integer getDefaultSelectedYear() + { + Integer result = null; + + java.util.Calendar calendar = java.util.Calendar.getInstance(); + calendar.setTime( new Date() ); + result = calendar.get( java.util.Calendar.YEAR ); + + return result; + } + public static Option[] getYearDropValues() { Calendar calendar = Calendar.getInstance();