diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java index e7d2020f2..45fd09730 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java @@ -18,9 +18,11 @@ public class WorkReportLine { Integer numHours; - Set resources; + Resource resource; - Set orderElements; + OrderElement orderElement; + + WorkReport workReport; Set criterions; @@ -28,11 +30,11 @@ public class WorkReportLine { } - public WorkReportLine(Integer numHours, Set resources, - Set orderElements, Set criterions) { + public WorkReportLine(Integer numHours, Resource resource, + OrderElement orderElement, Set criterions) { this.numHours = numHours; - this.resources = resources; - this.orderElements = orderElements; + this.resource = resource; + this.orderElement = orderElement; this.criterions = criterions; } @@ -52,20 +54,20 @@ public class WorkReportLine { this.numHours = numHours; } - public Set getResources() { - return resources; + public Resource getResource() { + return resource; } - public void setResources(Set resources) { - this.resources = resources; + public void setResource(Resource resource) { + this.resource = resource; } - public Set getOrderElements() { - return orderElements; + public OrderElement getOrderElement() { + return orderElement; } - public void setOrderElements(Set orderElements) { - this.orderElements = orderElements; + public void setOrderElement(OrderElement orderElement) { + this.orderElement = orderElement; } public Set getCriterions() { @@ -75,4 +77,12 @@ public class WorkReportLine { public void setCriterions(Set criterions) { this.criterions = criterions; } + + public WorkReport getWorkReport() { + return workReport; + } + + public void setWorkReport(WorkReport workReport) { + this.workReport = workReport; + } } diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml index e72331cbe..6f6c4d009 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml @@ -44,15 +44,11 @@ - - - - + - - - - + + +