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

Add type information in expenses sheet list and form

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-06-07 11:33:13 +02:00
parent bf1553829f
commit 49ecc85aef
2 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
View file

@ -623,4 +623,47 @@ public class ExpenseSheetCRUDController extends
cancel = true;
}
public String getType() {
return getType(expenseSheetModel.getExpenseSheet());
}
private String getType(ExpenseSheet expenseSheet) {
if (expenseSheet != null && expenseSheet.isPersonal()) {
return _("Personal");
}
return _("Regular");
}
public RowRenderer getExpenseSheetsRenderer() {
return new RowRenderer() {
@Override
public void render(Row row, Object data) throws Exception {
final ExpenseSheet expenseSheet = (ExpenseSheet) data;
row.setValue(expenseSheet);
Util.appendLabel(row, expenseSheet.getFirstExpense().toString());
Util.appendLabel(row, expenseSheet.getLastExpense().toString());
Util.appendLabel(row,
Util.addCurrencySymbol(expenseSheet.getTotal()));
Util.appendLabel(row, expenseSheet.getCode());
Util.appendLabel(row, expenseSheet.getDescription());
Util.appendLabel(row, getType(expenseSheet));
Util.appendOperationsAndOnClickEvent(row, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
goToEditForm(expenseSheet);
}
}, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
confirmDelete(expenseSheet);
}
});
}
};
}
}

34
libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul
View file

@ -40,7 +40,8 @@
<separator bar="false" spacing="10px" orient="horizontal"/>
<grid id="listing" mold="paging" pageSize="10"
model="@{controller.expenseSheets}" sclass="clickable-rows">
model="@{controller.expenseSheets}" sclass="clickable-rows"
rowRenderer="@{controller.expenseSheetsRenderer}">
<columns sizable="true">
<column id="columnFirstExpense" label="${i18n:_('First expense')}"
sort="auto(firstExpense, lastExpense)" />
@ -52,33 +53,10 @@
sort="auto(code)" />
<column label="${i18n:_('Description')}"
sort="auto(description)" />
<column label="${i18n:_('Type')}"
sort="auto(personal)" />
<column label="${i18n:_('Operations')}" />
</columns>
<rows>
<row self="@{each='expensesheet'}" value="@{expensesheet}" onClick="controller.goToEditForm(self.value);">
<label value="@{expensesheet.firstExpense, converter='org.libreplan.web.common.typeconverters.LocalDateConverter'}" />
<label value="@{expensesheet.lastExpense, converter='org.libreplan.web.common.typeconverters.LocalDateConverter'}"/>
<hbox>
<label value="@{expensesheet.total}" />
<label value="@{controller.currencySymbol}" />
</hbox>
<label value="@{expensesheet.code}" />
<label value="@{expensesheet.description}" />
<hbox>
<button sclass="icono" image="/common/img/ico_editar1.png"
hoverImage="/common/img/ico_editar.png"
tooltiptext="${i18n:_('Edit')}"
onClick="controller.goToEditForm(self.parent.parent.value);">
</button>
<button sclass="icono" image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}"
onClick="controller.confirmDelete(self.parent.parent.value);">
</button>
</hbox>
</row>
</rows>
</grid>
</window>
@ -109,6 +87,10 @@
<label value="${i18n:_('Description')}" />
<textbox width="400px" value="@{controller.expenseSheet.description}"/>
</row>
<row>
<label value="${i18n:_('Type')}" />
<label value="@{controller.type}" />
</row>
<row visible="@{controller.expenseSheet.personal}">
<label value="${i18n:_('Resource')}" />
<label value="@{controller.resource}" />