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

adds the currency symbol and set the right parameter to method

Browse source 
reloadTotalBudget in the order edition view.

FEA: ItEr76S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2012-05-08 20:18:27 +01:00
parent 7364bb000d
commit a7e2850045
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
View file

@ -94,7 +94,6 @@ import org.zkoss.zul.Comboitem;
import org.zkoss.zul.ComboitemRenderer;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Label;
@ -1343,8 +1342,8 @@ public class OrderCRUDController extends GenericForwardComposer {
return orderModel.gettooltipText(order);
}
public void reloadTotalBudget(Decimalbox decimalboxTotalBudget) {
Util.reloadBindings(decimalboxTotalBudget);
public void reloadTotalBudget(Label labelTotalBudget) {
Util.reloadBindings(labelTotalBudget);
}
/**
@ -1726,4 +1725,7 @@ public class OrderCRUDController extends GenericForwardComposer {
return Util.getMoneyFormat();
}
public String getCurrencySymbol() {
return Util.getCurrencySymbol();
}
}

14
libreplan-webapp/src/main/webapp/orders/_edition.zul
View file

@ -169,20 +169,26 @@
<label value="${i18n:_('Work')}" />
<decimalbox id="boxWorkBudget" width="80px" scale = "2"
value="@{controller.order.workBudget}"
onChange="controller.reloadTotalBudget(txtTotalBudget)" />
onChange="controller.reloadTotalBudget(txtTotalBudget)"
format="@{controller.moneyFormat}"/>
<separator bar="false" spacing="15px" orient="vertical"/>
<label value="${i18n:_('Materials')}" />
<decimalbox id="boxMaterialsBudget" width="80px" scale="2"
value="@{controller.order.materialsBudget}"
onChange="controller.reloadTotalBudget(txtTotalBudget)" />
onChange="controller.reloadTotalBudget(txtTotalBudget)"
format="@{controller.moneyFormat}"/>
<separator bar="false" spacing="15px" orient="vertical"/>
<label value=" ${i18n:_('Total')} :" />
<label id="txtTotalBudget" value="@{controller.order.totalBudget}"/>
<label id="txtTotalBudget" value="@{controller.order.totalBudget}"/>
<label value="@{controller.currencySymbol}"/>
</hbox>
</row>
<row>
<label value="${i18n:_('Calculated budget')}" />
<label id="budget" value="@{controller.order.budget}" />
<hbox>
<label id="budget" value="@{controller.order.budget}" />
<label value="@{controller.currencySymbol}"/>
</hbox>
</row>
<row>
<label value="${i18n:_('Total hours')}" />