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

ItEr44S11CUImportarTraballoRealizadoPorSubcontrataItEr43S14: Removing field totalBudget of Order while it is being calculated from workBudget and materialBudget.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-01-22 08:16:34 +01:00 • committed by Javier Moran Rua
parent 0151aac692
commit 6d8b909b63
4 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -47,11 +47,6 @@ public class Order extends OrderLineGroup {
Order order = new Order();
order.setNewObject(true);
order.setWorkBudget(new BigDecimal(0).setScale(2));
order.setMaterialsBudget(new BigDecimal(0).setScale(2));
order.setTotalBudget(new BigDecimal(0).setScale(2));
order.setTotalHours(new Integer(0));
order.setState(OrderStatusEnum.getDefault());
OrderLineGroup.setupOrderLineGroup(order);
return order;
@ -77,15 +72,13 @@ public class Order extends OrderLineGroup {
private Integer lastOrderElementSequenceCode = 0;
private BigDecimal workBudget;
private BigDecimal workBudget = BigDecimal.ZERO.setScale(2);
private BigDecimal materialsBudget;
private BigDecimal materialsBudget = BigDecimal.ZERO.setScale(2);
private BigDecimal totalBudget;
private Integer totalHours = 0;
private Integer totalHours;
private OrderStatusEnum state;
private OrderStatusEnum state = OrderStatusEnum.getDefault();
private ExternalCompany customer;
@ -94,27 +87,35 @@ public class Order extends OrderLineGroup {
private String externalCode;
public BigDecimal getWorkBudget() {
if (workBudget == null) {
return BigDecimal.ZERO;
}
return workBudget;
}
public void setWorkBudget(BigDecimal workBudget) {
if (workBudget == null) {
workBudget = BigDecimal.ZERO.setScale(2);
}
this.workBudget = workBudget;
}
public BigDecimal getMaterialsBudget() {
if (materialsBudget == null) {
return BigDecimal.ZERO;
}
return materialsBudget;
}
public void setMaterialsBudget(BigDecimal materialsBudget) {
if (materialsBudget == null) {
materialsBudget = BigDecimal.ZERO.setScale(2);
}
this.materialsBudget = materialsBudget;
}
public BigDecimal getTotalBudget() {
return totalBudget;
}
public void setTotalBudget(BigDecimal totalBudget) {
this.totalBudget = totalBudget;
return getWorkBudget().add(getMaterialsBudget());
}
public Integer getTotalHours() {

1
navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
View file

@ -73,7 +73,6 @@
<property name="workBudget" access="field" />
<property name="materialsBudget" access="field" />
<property name="totalBudget" access="field" />
<property name="totalHours" access="field" />
<property name="customerReference" access="field" />
<property name="externalCode" access="field" />

20
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -22,7 +22,6 @@ package org.navalplanner.web.orders;
import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ConcurrentModificationException;
import java.util.Date;
@ -559,20 +558,6 @@ public class OrderCRUDController extends GenericForwardComposer {
return OrderStatusEnum.values();
}
public void calculateTotalBudget(BigDecimal workBudget,
BigDecimal materialsBudget, Label txtTotalBudget) {
BigDecimal sum = new BigDecimal(0);
if ((workBudget != null) && (materialsBudget != null)) {
sum = workBudget.add(materialsBudget);
} else if (workBudget != null) {
sum = workBudget;
} else if (materialsBudget != null) {
sum = materialsBudget;
}
txtTotalBudget.setValue(sum.toString());
txtTotalBudget.invalidate();
}
public List<ExternalCompany> getExternalCompaniesAreClient() {
return orderModel.getExternalCompaniesAreClient();
}
@ -718,4 +703,9 @@ public class OrderCRUDController extends GenericForwardComposer {
public String getTooltipText(final Order order) {
return orderModel.gettooltipText(order);
}
public void reloadTotalBudget(Label txtTotalBudget) {
Util.reloadBindings(txtTotalBudget);
}
}

4
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -120,12 +120,12 @@
<label value="${i18n:_('Work')}" />
<decimalbox id="boxWorkBudget" width="150px" scale = "2"
value="@{controller.order.workBudget}"
onChange="controller.calculateTotalBudget(self.value,boxMaterialsBudget.value,txtTotalBudget)"/>
onChange="controller.reloadTotalBudget(txtTotalBudget)" />
<separator bar="false" spacing="15px" orient="vertical"/>
<label value="${i18n:_('Materials')}" />
<decimalbox id="boxMaterialsBudget" width="150px" scale="2"
value="@{controller.order.materialsBudget}"
onChange="controller.calculateTotalBudget(boxWorkBudget.value,self.value,txtTotalBudget)"/>
onChange="controller.reloadTotalBudget(txtTotalBudget)" />
<separator bar="false" spacing="15px" orient="vertical"/>
<label value="${i18n:_(' Total :')}" />
<label id="txtTotalBudget" value="@{controller.order.totalBudget}"/>