diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerInAMonthDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerInAMonthDTO.java index 2d5d6f68d..97e618cfb 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerInAMonthDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerInAMonthDTO.java @@ -21,19 +21,20 @@ package org.navalplanner.business.reports.dtos; -import org.navalplanner.business.resources.entities.Worker; import org.navalplanner.business.workingday.EffortDuration; +import org.navalplanner.business.resources.entities.Resource; + public class HoursWorkedPerWorkerInAMonthDTO { - private String workerName; + private String resourceName; private EffortDuration numHours; - public HoursWorkedPerWorkerInAMonthDTO(Worker worker, + public HoursWorkedPerWorkerInAMonthDTO(Resource resource, EffortDuration numHours) { - this.workerName = worker.getName(); + this.resourceName = resource.getName(); this.numHours = numHours; } @@ -45,16 +46,16 @@ public class HoursWorkedPerWorkerInAMonthDTO { this.numHours = numHours; } - public String getWorkerName() { - return workerName; + public String getResourceName() { + return resourceName; } - public void setWorkerName(String workerName) { - this.workerName = workerName; + public void setResourceName(String resourceName) { + this.resourceName = resourceName; } public String toString() { - return getWorkerName() + "; " + getNumHours(); + return getResourceName() + "; " + getNumHours(); } -} \ No newline at end of file +} diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java index e3f2a40c0..0dcc3ed85 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java @@ -242,12 +242,12 @@ public class ResourceDAO extends IntegrationEntityDAO implements for (Object row: rows) { Object[] columns = (Object[]) row; - Worker worker = (Worker) findExistingEntity((Long) columns[0]); + Resource resource = (Resource) findExistingEntity((Long) columns[0]); EffortDuration effort = EffortDuration.seconds(((Long) columns[1]) .intValue()); HoursWorkedPerWorkerInAMonthDTO dto = new HoursWorkedPerWorkerInAMonthDTO( - worker, effort); + resource, effort); result.add(dto); } return result; diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml index ba50044da..c42434d24 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml @@ -5,7 +5,7 @@ - + @@ -128,7 +128,7 @@ - +