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

Resolve ZK binding model exception.

Browse source 
Code refactoring.
This commit is contained in:
Vova Perebykivskyi 2016-10-27 15:01:42 +03:00 • committed by Dgray16
parent 8f23e7e863
commit c168affc7c
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java
View file

@ -35,26 +35,24 @@ public class CalculatedConsolidatedValue extends ConsolidatedValue {
private CalculatedConsolidation consolidation;
public static CalculatedConsolidatedValue create() {
return create(new CalculatedConsolidatedValue());
}
public static CalculatedConsolidatedValue create(LocalDate date,
BigDecimal value, IntraDayDate taskEndDate) {
return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
}
protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value,
IntraDayDate taskEndDate) {
super(date, value, taskEndDate);
}
/**
* Constructor for {@link DeepCopy}. DO NOT USE!
*/
public CalculatedConsolidatedValue() {
}
protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
super(date, value, taskEndDate);
}
public static CalculatedConsolidatedValue create() {
return create(new CalculatedConsolidatedValue());
}
public static CalculatedConsolidatedValue create(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
}
public void setConsolidation(CalculatedConsolidation consolidation) {
this.consolidation = consolidation;
}

2
libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
View file

@ -63,7 +63,7 @@
value="@{criterionRequirementWrapper.criterionAndType}">
<bandpopup>
<listbox width="500px" height="150px" sizedByContent="true"
model="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
forEach="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
onSelect="assignedCriterionRequirementController.selectCriterionToHoursGroup(self.selectedItem, self.parent.parent,self.parent.parent.parent.parent.value);">
<listhead>
<listheader label="Type" />