From 98dac4a50aec87cabb68978d46155da1497566b5 Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
Date: Tue, 13 Sep 2011 12:58:28 +0200
Subject: [PATCH] [Bug #1147] Fix issues in Hours Worked Per Resource report

FEA: ItEr75S04BugFixing
---
 .../business/reports/dtos/HoursWorkedPerResourceDTO.java  | 8 +++++++-
 .../hoursWorkedPerWorker.properties                       | 6 +++---
 .../hoursWorkedPerWorker_en_US.properties                 | 8 ++++----
 .../hoursWorkedPerWorker_es_ES.properties                 | 6 +++---
 .../hoursWorkedPerWorker_gl_ES.properties                 | 8 ++++----
 .../web/reports/HoursWorkedPerWorkerModel.java            | 4 +++-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java
index e13e2abde..267d76dec 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java
@@ -32,7 +32,7 @@ import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.workreports.entities.WorkReportLine;
 import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
 
-public class HoursWorkedPerResourceDTO {
+public class HoursWorkedPerResourceDTO implements Comparable {
 
     private String workerName;
 
@@ -155,4 +155,10 @@ Resource resource,
         this.labels = labels;
     }
 
+    @Override
+    public int compareTo(Object o) {
+        return this.workerName
+                .compareTo(((HoursWorkedPerResourceDTO) o).workerName);
+    }
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
index 35f4daff2..9d59bec1e 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
@@ -5,10 +5,10 @@ date.start = Starting date :
 date.end = Ending date :
 criteria = Criteria :
 labels = Labels :
-headers.column1 = Hours start
-headers.column2 = Hours end
+headers.column1 = Start
+headers.column2 = End
 headers.column3 = Hours
-headers.column4 = Project code/name
+headers.column4 = Task code/name
 headers.column5 = Text fields
 headers.column6 = Labels
 total.day = Total hours per day:
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
index 8605e23c9..5d582c545 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
@@ -1,14 +1,14 @@
 # Locale for hoursWorkedPerWorkerReport.jrxml
 title = Work report
-subtitle = Worked hours per worker
+subtitle = Worked hours per resource
 date.start = Starting date:
 date.end = Ending date:
 criteria = Criteria :
 labels = Labels :
-headers.column1 = Hours start
-headers.column2 = Hours end
+headers.column1 = Start
+headers.column2 = End
 headers.column3 = Hours
-headers.column4 = Project code/name
+headers.column4 = Task code/name
 headers.column5 = Text fields
 headers.column6 = Labels
 total.day = Total hours per day:
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
index 29bb21574..8f10296b9 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
@@ -5,10 +5,10 @@ date.start = Fecha de inicio:
 date.end = Fecha de fin:
 criteria = Criterios :
 labels = Etiquetas :
-headers.column1 = Horas inicio
-headers.column2 = Horas fin
+headers.column1 = Inicio
+headers.column2 = Fin
 headers.column3 = Horas
-headers.column4 = Código/Nombre Proyecto
+headers.column4 = Código/Nombre tarea
 headers.column5 = Campos de texto
 headers.column6 = Etiquetas
 total.day = Horas totales por dia:
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
index 68e873aa8..d38413cea 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
@@ -5,14 +5,14 @@ date.start = Data de inicio:
 date.end = Data de fin:
 criteria = Criterios :
 labels = Etiquetas :
-headers.column1 = Horas inicio
-headers.column2 = Horas fin
+headers.column1 = Inicio
+headers.column2 = Fin
 headers.column3 = Horas
-headers.column4 = Código/Nome Proxecto
+headers.column4 = Código/Nome tarefa
 headers.column5 = Campos de texto
 headers.column6 = Etiquetas
 total.day = Horas totais por dia:
-total.worker = Horas totais por empleado:
+total.worker = Horas totais por empregado:
 note1 = Non hai partes de traballo para os traballadores seleccionados no intervalo de búsqueda.
 page = páxina
 of = de
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
index 62fa21d2c..ef80117f2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
@@ -22,6 +22,7 @@
 package org.navalplanner.web.reports;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -93,11 +94,12 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
             List<Label> labels, List<Criterion> criterions, Date startingDate,
             Date endingDate) {
 
-        final List<HoursWorkedPerResourceDTO> workingHoursPerWorkerList = resourceDAO
+        List<HoursWorkedPerResourceDTO> workingHoursPerWorkerList = resourceDAO
                 .getWorkingHoursPerWorker(resources, labels,  criterions, startingDate,
                         endingDate);
 
         if (workingHoursPerWorkerList != null && !workingHoursPerWorkerList.isEmpty()) {
+            Collections.sort(workingHoursPerWorkerList);
             setShowReportMessage(false);
             return new JRBeanCollectionDataSource(workingHoursPerWorkerList);
         } else {