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

Add a Planned Budget column and change sorter on Total Budget to Projects List tab

Browse source 
Planned Budget will reflect the amounts planned on project tasks.  Changed the sorter on Total Budget to use the amounts estimated on the
General data tab instead of the amounts on project tasks.
This commit is contained in:
lmann99 2017-01-08 00:40:11 -05:00
parent 21c41a4e35
commit 8243aa6304
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1286,6 +1286,7 @@ public class OrderCRUDController extends GenericForwardComposer {
appendDate(row, order.getDeadline()); appendDate(row, order.getDeadline());
appendCustomer(row, order.getCustomer()); appendCustomer(row, order.getCustomer());
appendObject(row, Util.addCurrencySymbol(order.getTotalManualBudget())); appendObject(row, Util.addCurrencySymbol(order.getTotalManualBudget()));
appendObject(row, Util.addCurrencySymbol(order.getTotalBudget()));
appendObject(row, order.getTotalHours()); appendObject(row, order.getTotalHours());
appendObject(row, _(order.getState().toString())); appendObject(row, _(order.getState().toString()));
appendOperations(row, order); appendOperations(row, order);

3
libreplan-webapp/src/main/webapp/orders/_list.zul
View file

@ -32,7 +32,8 @@
sort="auto(initDate,deadline)" sortDirection="ascending" sclass="date" hflex="min"/> sort="auto(initDate,deadline)" sortDirection="ascending" sclass="date" hflex="min"/>
<column label="${i18n:_('Deadline')}" sort="auto(deadline,initDate)" align="center" sclass="date" hflex="min"/> <column label="${i18n:_('Deadline')}" sort="auto(deadline,initDate)" align="center" sclass="date" hflex="min"/>
<column label="${i18n:_('Customer')}" sort="auto(customerReference)" hflex="min"/> <column label="${i18n:_('Customer')}" sort="auto(customerReference)" hflex="min"/>
<column label="${i18n:_('Total Budget')}" sort="auto(totalBudget)" align="right" hflex="min"/> <column label="${i18n:_('Total Budget')}" sort="auto(totalManualBudget)" align="right" hflex="min"/>
<column label="${i18n:_('Planned Budget')}" sort="auto(totalBudget)" align="right" hflex="min"/>
<column label="${i18n:_('Hours')}" sort="auto(totalHours)" align="right" hflex="min"/> <column label="${i18n:_('Hours')}" sort="auto(totalHours)" align="right" hflex="min"/>
<column label="${i18n:_('State')}" sort="auto(lower(state))" align="center" hflex="min"/> <column label="${i18n:_('State')}" sort="auto(lower(state))" align="center" hflex="min"/>
<column label="${i18n:_('Operations')}" sclass="operations" width="120px"/> <column label="${i18n:_('Operations')}" sclass="operations" width="120px"/>