From 5e00405ec23e52ac91ea9388e216eb1aaa8a6dcc Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Wed, 1 Jun 2011 14:17:50 +0200 Subject: [PATCH] [Bug #1014] include the name of the assigned task to each report line, in the report worked hours per each resource. FEA: ItEr74S04BugFixing --- .../dtos/HoursWorkedPerResourceDTO.java | 11 +++++++++ .../jasper/hoursWorkedPerWorkerReport.jrxml | 24 ++++++++++++------- .../hoursWorkedPerWorker.properties | 2 +- .../hoursWorkedPerWorker_en_US.properties | 2 +- .../hoursWorkedPerWorker_es_ES.properties | 2 +- .../hoursWorkedPerWorker_gl_ES.properties | 2 +- 6 files changed, 30 insertions(+), 13 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 29fd6ee3d..88bdf6776 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 @@ -45,6 +45,8 @@ public class HoursWorkedPerResourceDTO { private String orderElementCode; + private String orderElementName; + private String descriptionValues; private String labels; @@ -59,6 +61,7 @@ Resource resource, this.clockFinish = workReportLine.getClockFinish(); this.numHours = workReportLine.getNumHours(); this.orderElementCode = workReportLine.getOrderElement().getCode(); + this.orderElementName = workReportLine.getOrderElement().getName(); this.descriptionValues = descriptionValuesAsString(workReportLine.getDescriptionValues()); this.labels = labelsAsString(workReportLine.getLabels()); } @@ -127,6 +130,14 @@ Resource resource, this.orderElementCode = orderElementCode; } + public String getOrderElementName() { + return orderElementName; + } + + public void setOrderElementName(String orderElementName) { + this.orderElementName = orderElementName; + } + public String getDescriptionValues() { return descriptionValues; } diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml index 8817a37cd..32826d65b 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml @@ -13,6 +13,7 @@ + @@ -70,7 +71,7 @@ - + @@ -105,7 +106,7 @@ - + @@ -294,37 +295,42 @@ - + - + - + - + - + - + - + + + + + + diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties index 0aabd0bac..35f4daff2 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties @@ -8,7 +8,7 @@ labels = Labels : headers.column1 = Hours start headers.column2 = Hours end headers.column3 = Hours -headers.column4 = Project code +headers.column4 = Project 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 ef3385f24..8605e23c9 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 @@ -8,7 +8,7 @@ labels = Labels : headers.column1 = Hours start headers.column2 = Hours end headers.column3 = Hours -headers.column4 = Project code +headers.column4 = Project 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 f41a597ac..06a83d2ad 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 @@ -8,7 +8,7 @@ labels = Etiquetas : headers.column1 = Horas inicio headers.column2 = Horas fin headers.column3 = Horas -headers.column4 = Código Pedido +headers.column4 = Código/Nombre Pedido 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 e5296a410..b0391340d 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 @@ -8,7 +8,7 @@ labels = Etiquetas : headers.column1 = Horas inicio headers.column2 = Horas fin headers.column3 = Horas -headers.column4 = Código orde +headers.column4 = Código/Nome orde headers.column5 = Campos de texto headers.column6 = Etiquetas total.day = Horas totais por dia: