RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1147] Fix issues in Hours Worked Per Resource report

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Ignacio Diaz Teijido 2011-09-13 12:58:28 +02:00 • committed by Manuel Rego Casasnovas
parent b096b7c5bc
commit 98dac4a50a
6 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java
View file

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

6
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
View file

@ -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:

8
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
View file

@ -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:

6
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
View file

@ -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:

8
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
View file

@ -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

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
View file

@ -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 {