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

ItEr40S22CUProcuraOrganizacionsTraballoItEr32S10: Fix problem with hours group code in previous commits.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-12-27 13:36:12 +01:00 • committed by Javier Moran Rua
parent b027ea288f
commit 12c6e231ce
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
View file

@ -86,8 +86,8 @@ public class HoursGroup extends BaseEntity implements Cloneable {
return code;
}
public void setCode(String name) {
this.code = name;
public void setCode(String code) {
this.code = code;
}
public ResourceEnum getResourceType() {

4
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
View file

@ -39,6 +39,8 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen
public class OrderLine extends OrderElement {
private static final String INITIAL_HOURS_GROUP_CODE = "HOURS-GROUP-CODE";
public static OrderLine create() {
OrderLine result = new OrderLine();
result.setNewObject(true);
@ -49,6 +51,7 @@ public class OrderLine extends OrderElement {
OrderLine result = create();
HoursGroup hoursGroup = HoursGroup.create(result);
result.addHoursGroup(hoursGroup);
hoursGroup.setCode(INITIAL_HOURS_GROUP_CODE);
hoursGroup.setFixedPercentage(false);
hoursGroup.setPercentage(new BigDecimal(1));
hoursGroup.setWorkingHours(hours);
@ -162,6 +165,7 @@ public class OrderLine extends OrderElement {
HoursGroup hoursGroup = HoursGroup.create(this);
hoursGroup.setWorkingHours(workHours);
hoursGroup.setPercentage((new BigDecimal(1).setScale(2)));
hoursGroup.setCode(INITIAL_HOURS_GROUP_CODE);
hoursGroups.add(hoursGroup);
} else {