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

ItEr18S09CUAltaTipoParteDeTraballoItEr17S12: Modify WorkReports entities

Browse source
This commit is contained in:
Susana Montes Pedreira 2009-07-21 20:01:27 +02:00 • committed by Javier Moran Rua
parent 4059f70b02
commit fbcd35beff
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java
View file

@ -18,9 +18,11 @@ public class WorkReportLine {
Integer numHours;
Set<Resource> resources;
Resource resource;
Set<OrderElement> orderElements;
OrderElement orderElement;
WorkReport workReport;
Set<Criterion> criterions;
@ -28,11 +30,11 @@ public class WorkReportLine {
}
public WorkReportLine(Integer numHours, Set<Resource> resources,
Set<OrderElement> orderElements, Set<Criterion> criterions) {
public WorkReportLine(Integer numHours, Resource resource,
OrderElement orderElement, Set<Criterion> 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<Resource> getResources() {
return resources;
public Resource getResource() {
return resource;
}
public void setResources(Set<Resource> resources) {
this.resources = resources;
public void setResource(Resource resource) {
this.resource = resource;
}
public Set<OrderElement> getOrderElements() {
return orderElements;
public OrderElement getOrderElement() {
return orderElement;
}
public void setOrderElements(Set<OrderElement> orderElements) {
this.orderElements = orderElements;
public void setOrderElement(OrderElement orderElement) {
this.orderElement = orderElement;
}
public Set<Criterion> getCriterions() {
@ -75,4 +77,12 @@ public class WorkReportLine {
public void setCriterions(Set<Criterion> criterions) {
this.criterions = criterions;
}
public WorkReport getWorkReport() {
return workReport;
}
public void setWorkReport(WorkReport workReport) {
this.workReport = workReport;
}
}

12
navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml
View file

@ -44,15 +44,11 @@
<property name="numHours"/>
<set name="resources">
<key column="WORK_REPORT_LINE_ID"/>
<one-to-many class="org.navalplanner.business.resources.entities.Resource"/>
</set>
<many-to-one name="workReport" class="org.navalplanner.business.workreports.entities.WorkReport" column="WORK_REPORT_ID" />
<set name="orderElements">
<key column="WORK_REPORT_LINE_ID"/>
<one-to-many class="org.navalplanner.business.orders.entities.OrderElement"/>
</set>
<many-to-one name="resource" class="org.navalplanner.business.resources.entities.Resource" column="RESOURCE_ID" />
<many-to-one name="orderElement" class="org.navalplanner.business.orders.entities.OrderElement" column="ORDER_ELEMENT_ID" />
<set name="criterions" table="CRITERION_WORK_REPORT_LINE" inverse="false">
<key column="WORK_REPORT_LINE_ID" not-null="false" />