IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Změněn způsob přenosu vyúčtování ke spolucestujícím: výúčtování se přenese pouze v případě, když ho ještě spolucestující needitoval. Do zeditovaného vyúčtování se vyúčtování žadatele už nepřenáší.

Browse Source 
Vyúčtování spolucestujících se schvalují každé zvlášť.
refs #212
This commit is contained in:
Josef Rokos
2015-04-24 14:00:36 +02:00
parent 93a463db69
commit 9d202192ee
12 changed files with 153 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/main/trips/requirements/tripBillSummary.zul
+31 -62
View File
@@ -5,68 +5,37 @@
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window id="billWin"
closable="true"
width="700px"
height="450px"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.tripbill.TripBillSummaryVM')">
<caption
src="/img/pickup-032.png"
zclass="form-caption"
label="${labels.TravelOrdersFormTitle}" />
<hbox vflex="1">
<vbox width="350px" vflex="1">
<label value="@load(vm.bill.ownedBy)" style="font-weight: bold; font-size: larger"/>
<hbox>
<label value="${labels.RequirementsFormFrom}: "/>
<label value="@load(vm.bill.requirement.from)"/>
<label value="${labels.RequirementsFormTo}: "/>
<label value="@load(vm.bill.requirement.to)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormStartDateTime}: "/>
<label value="@load(vm.bill.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormEndDate}: "/>
<label value="@load(vm.bill.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormPurpose}: "/>
<label value="@load(vm.bill.requirement.description)"/>
</hbox>
<hbox>
<label value="${labels.TripBillTotal}:"/> <label value="@load(vm.bill.total) @converter(vm.standardBigDecimalConverter)"/>
</hbox>
<button label="${labels.TripBillSummaryDetail}"
onClick="@command('showBill', bill=vm.bill)"
sclass="nicebutton"/>
<div visible="@load(not empty vm.bills)" vflex="1">
<separator bar="true" width="100%"/>
<label value="${labels.RequirementsFormPassengers}:"/>
<grid model="@load(vm.bills)" vflex="1">
<columns>
<column />
<column width="90px"/>
</columns>
<rows>
<template name="model">
<row>
<label value="@load(each.ownedBy)"/>
<button label="${labels.TripBillSummaryDetail}"
sclass="nicebutton"
onClick="@command('showBill', bill=each)"/>
</row>
</template>
</rows>
</grid>
</div>
</vbox>
<div id="billInt" vflex="1">
<vbox width="350px" vflex="1">
<label value="@load(vm.bill.ownedBy)" style="font-weight: bold; font-size: larger"/>
<hbox>
<label value="${labels.RequirementsFormFrom}: "/>
<label value="@load(vm.bill.requirement.from)"/>
<label value="${labels.RequirementsFormTo}: "/>
<label value="@load(vm.bill.requirement.to)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormStartDateTime}: "/>
<label value="@load(vm.bill.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormEndDate}: "/>
<label value="@load(vm.bill.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)"/>
</hbox>
<hbox>
<label value="${labels.RequirementsFormPurpose}: "/>
<label value="@load(vm.bill.requirement.description)"/>
</hbox>
<hbox>
<label value="${labels.TripBillTotal}:"/> <label value="@load(vm.bill.total) @converter(vm.standardBigDecimalConverter)"/>
</hbox>
<button label="${labels.TripBillSummaryDetail}"
onClick="@command('showBill', bill=vm.bill)"
sclass="nicebutton"/>
<separator bar="true" hflex="1"/>
<include src="../../approveStatus.zul" vflex="1"/>
</hbox>
</window>
</vbox>
</div>
</zk>
src/main/webapp/main/trips/requirements/tripBillSummaryMaster.zul
+38
View File
@@ -0,0 +1,38 @@
<?page title="${labels.TravelOrdersFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk xmlns="http://www.zkoss.org/2005/zul"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window id="win"
closable="true"
width="900px"
height="550px"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.tripbill.TripBillSummaryVM')">
<caption
src="/img/pickup-032.png"
zclass="form-caption"
label="${labels.TravelOrdersFormTitle}" />
<tabbox vflex="1">
<tabs children="@load(vm.bills)">
<template name="children">
<tab label="@load(each.ownedBy)" onClick="@command('setBill', bill=each)"/>
</template>
</tabs>
<tabpanels children="@load(vm.bills)">
<template name="children">
<tabpanel>
<include vflex="1" src="tripBillSummary.zul"/>
</tabpanel>
</template>
</tabpanels>
</tabbox>
</window>
</zk>