git-svn-id: https://svn.coded.pt/svn/SIPRP@1675 bb69d46d-e84e-40c8-a05a-06db0d633741

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() );
 	}
 }
 

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() );
 	}
 }
 

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() );
 	}
 }
 

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 )

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() );
 	}
 }
 

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() );
 	}
 }
 

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() );
 	}
 }
 

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[]
+			where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).notIn( new Integer[] { excludeYear } ) );
-				{
-					excludeYear
-				} ) );
 		}
 		Select2 query = new Select2(
-			new String[]
+			new String[] { "analises_acidentes" },
-			{
+			new Integer[] { },
-				"analises_acidentes"
+			new Expression[] { },
-			},
+			new String[] { "DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano" },
-			new Integer[]
-			{
-			},
-			new Expression[]
-			{
-			},
-			new String[]
-			{
-				"DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano"
-			},
 			where,
-			new String[]
+			new String[] { "ano DESC" },
-			{
-				"ano DESC"
-			},
 			null, null, null );
 		query.disableOrderFieldsVerification();
 		Virtual2DArray array = getExecuter().executeQuery( query );

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();