Upraveno zobrazování seznamu souborů...

closes #214
Verze_2.0
František Přibyl 10 years ago
parent 67629cf312
commit b63a2c3944

@ -1,8 +1,8 @@
<zk xmlns="http://www.zkoss.org/2005/zul" <zk
xmlns="http://www.zkoss.org/2005/zul"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<grid> <grid>
<columns visible="false"> <columns visible="false">
<column hflex="min" /> <column hflex="min" />
@ -12,7 +12,9 @@
<column hflex="2" /> <column hflex="2" />
</columns> </columns>
<auxhead> <auxhead>
<auxheader label="${labels.TripBillTravelBegin}" colspan="2"/> <auxheader
label="${labels.TripBillTravelBegin}"
colspan="2" />
<auxheader label="${labels.TripBillTravelTarget}" /> <auxheader label="${labels.TripBillTravelTarget}" />
<auxheader label="${labels.TripBillPurpose}" /> <auxheader label="${labels.TripBillPurpose}" />
<auxheader label="${labels.TripBillTravelEnd}" /> <auxheader label="${labels.TripBillTravelEnd}" />
@ -41,11 +43,11 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<grid> <hlayout vflex="min">
<grid hflex="min">
<columns> <columns>
<column hflex="min" /> <column hflex="min" />
<column hflex="min" /> <column hflex="min" />
<column hflex="1" />
</columns> </columns>
<rows> <rows>
<row> <row>
@ -60,12 +62,12 @@
</cell> </cell>
</row> </row>
<row> <row>
<cell rowspan="3"> <cell rowspan="5">
<textbox <textbox
placeholder="${labels.TripBillResultMessageText}" placeholder="${labels.TripBillResultMessageText}"
value="@bind(vm.dataBean.resultMessage)" value="@bind(vm.dataBean.resultMessage)"
style="resize:none" style="resize:none"
rows="3" rows="9"
cols="80" /> cols="80" />
</cell> </cell>
<cell> <cell>
@ -92,19 +94,37 @@
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
</cell> </cell>
</row> </row>
<row />
<row />
</rows> </rows>
</grid> </grid>
<groupbox closable="true" mold="3d" open="false"> <groupbox
<caption src="/img/expand-016.png" label="Přiložené soubory"/> sclass="addScrollbar"
<include src="/app/uploadComponents.zul"/> hflex="1"
vflex="1"
closable="false"
mold="3d">
<caption
src="/img/expand-016.png"
label="Přiložené soubory" />
<include
hflex="1"
height="160px"
src="/app/uploadComponents.zul" />
</groupbox> </groupbox>
</hlayout>
<grid <grid
sclass="addScrollbar"
model="@load(vm.dataBean.billItems)" model="@load(vm.dataBean.billItems)"
vflex="1"> vflex="1">
<auxhead> <auxhead vflex="min">
<auxheader rowspan="2"> <auxheader rowspan="2">
<div sclass="vertikaal" height="50px"> <div
<label value="${labels.TripBillDate}" sclass="bold"/> sclass="vertikaal"
height="50px">
<label
value="${labels.TripBillDate}"
sclass="bold" />
</div> </div>
</auxheader> </auxheader>
<auxheader colspan="2"> <auxheader colspan="2">
@ -113,82 +133,141 @@
<!-- <auxheader > <!-- <auxheader >
<label value=""/> <label value=""/>
</auxheader> --> </auxheader> -->
<auxheader colspan="2" align="center"> <auxheader
<label value="${labels.TripBillDepartureArrival}" sclass="bold"/> colspan="2"
align="center">
<label
value="${labels.TripBillDepartureArrival}"
sclass="bold" />
</auxheader> </auxheader>
<!-- <auxheader> <!-- <auxheader>
<label value=""/> <label value=""/>
</auxheader> --> </auxheader> -->
<auxheader rowspan="2" valign="bottom" height="110px"> <auxheader
<div sclass="vertikaal" height="88px" width="88px"> rowspan="2"
valign="bottom"
height="110px">
<div
sclass="vertikaal"
height="88px"
width="88px">
<vbox> <vbox>
<label value="${labels.TripBillUsed}" sclass="bold"/> <label
<label value="${labels.TripBillVehicle}" sclass="bold"/> value="${labels.TripBillUsed}"
sclass="bold" />
<label
value="${labels.TripBillVehicle}"
sclass="bold" />
</vbox> </vbox>
</div> </div>
</auxheader> </auxheader>
<auxheader rowspan="2" valign="bottom" height="112px"> <auxheader
<div sclass="vertikaal" height="101px" width="90px"> rowspan="2"
valign="bottom"
height="112px">
<div
sclass="vertikaal"
height="101px"
width="90px">
<vbox> <vbox>
<label value="${labels.TripBillBeginEnd}" sclass="bold"/> <label
<label value="${labels.TripBillWork}" sclass="bold"/> value="${labels.TripBillBeginEnd}"
sclass="bold" />
<label
value="${labels.TripBillWork}"
sclass="bold" />
</vbox> </vbox>
</div> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<html> <html>
<![CDATA[${labels.TripBillTraveled} <br /> ${labels.TripBillKm} ]]> <![CDATA[${labels.TripBillTraveled} <br /> ${labels.TripBillKm} ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader> <auxheader>
<html> <html>
<![CDATA[${labels.TripBillConsumption} <br /> ${labels.TripBillPHM} ]]> <![CDATA[${labels.TripBillConsumption} <br /> ${labels.TripBillPHM} ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<html> <html>
<![CDATA[${labels.TripBillCarfare} <br /> ${labels.TripBillLocal} <br /> ${labels.TripBillTransportation} ]]> <![CDATA[${labels.TripBillCarfare} <br /> ${labels.TripBillLocal} <br /> ${labels.TripBillTransportation} ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<label value="${labels.TripBillHousing}" sclass="bold"/> <label
value="${labels.TripBillHousing}"
sclass="bold" />
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<html> <html>
<![CDATA[${labels.TripBillNumber} <br /> ${labels.TripBillMeals} <br /> ${labels.TripBillFree} ]]> <![CDATA[${labels.TripBillNumber} <br /> ${labels.TripBillMeals} <br /> ${labels.TripBillFree} ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<label value="${labels.TripBillMealExpenses}" sclass="bold"/> <label
value="${labels.TripBillMealExpenses}"
sclass="bold" />
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<html> <html>
<![CDATA[${labels.TripBillNecessary} <br /> ${labels.TripBillOther} <br /> ${labels.TripBillExpenses} ]]> <![CDATA[${labels.TripBillNecessary} <br /> ${labels.TripBillOther} <br /> ${labels.TripBillExpenses} ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<label value="${labels.TripBillTotal}" sclass="bold"/> <label
value="${labels.TripBillTotal}"
sclass="bold" />
</auxheader> </auxheader>
<auxheader rowspan="2"> <auxheader rowspan="2">
<label value="${labels.TripBillAdjusted}" sclass="bold"/> <label
value="${labels.TripBillAdjusted}"
sclass="bold" />
</auxheader> </auxheader>
</auxhead> </auxhead>
<auxhead> <auxhead>
<!-- <auxheader> <!-- <auxheader>
<label value=""/> <label value=""/>
</auxheader> --> </auxheader> -->
<auxheader colspan="2" align="center"> <auxheader
<label value="${labels.TripBillTravelTarget}" sclass="bold"/> colspan="2"
align="center">
<label
value="${labels.TripBillTravelTarget}"
sclass="bold" />
</auxheader> </auxheader>
<!-- <auxheader > <!-- <auxheader >
<label value=""/> <label value=""/>
</auxheader> --> </auxheader> -->
<auxheader> <auxheader>
<label value="${labels.TripBillHourMin}" sclass="bold"/> <label
value="${labels.TripBillHourMin}"
sclass="bold" />
</auxheader> </auxheader>
<auxheader> <auxheader>
<label value="${labels.TripBillHourMin}" sclass="bold"/> <label
value="${labels.TripBillHourMin}"
sclass="bold" />
</auxheader> </auxheader>
<!-- <auxheader> <!-- <auxheader>
<label value=""/> <label value=""/>
@ -198,12 +277,18 @@
</auxheader> --> </auxheader> -->
<auxheader> <auxheader>
<html> <html>
<![CDATA[<div> ${labels.TripBillTraveled} <br /> ${labels.TripBillKm} <br /> ${labels.TripBillInKc}</div> ]]> <![CDATA[<div> ${labels.TripBillTraveled} <br /> ${labels.TripBillKm} <br /> ${labels.TripBillInKc}</div> ]]>
</html> </html>
</auxheader> </auxheader>
<auxheader> <auxheader>
<html> <html>
<![CDATA[${labels.TripBillConsumption} <br /> ${labels.TripBillPHM} <br /> ${labels.TripBillInKc}]]> <![CDATA[${labels.TripBillConsumption} <br /> ${labels.TripBillPHM} <br /> ${labels.TripBillInKc}]]>
</html> </html>
</auxheader> </auxheader>
<!-- <auxheader> <!-- <auxheader>
@ -243,7 +328,9 @@
<column width="70px" /> <column width="70px" />
<column width="70px" /> <column width="70px" />
</columns> </columns>
<rows> <rows
sclass="addScrollbar"
vflex="1">
<template name="model"> <template name="model">
<row> <row>
<label value="@load(each.date) @converter('formatedDate', format='dd.MM')" /> <label value="@load(each.date) @converter('formatedDate', format='dd.MM')" />
@ -252,25 +339,29 @@
<label value="${labels.TripBillBack}" /> <label value="${labels.TripBillBack}" />
</vbox> </vbox>
<vbox hflex="max"> <vbox hflex="max">
<textbox inplace="true" <textbox
inplace="true"
value="@load(each.to)" value="@load(each.to)"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
sclass="grid-textbox-max-left" sclass="grid-textbox-max-left"
readonly="@load(vm.billDisabled or disabled)" /> readonly="@load(vm.billDisabled or disabled)" />
<textbox inplace="true" <textbox
inplace="true"
value="@load(each.back)" value="@load(each.back)"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
sclass="grid-textbox-max-left" sclass="grid-textbox-max-left"
readonly="@load(vm.billDisabled or disabled)" /> readonly="@load(vm.billDisabled or disabled)" />
</vbox> </vbox>
<vbox> <vbox>
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.toArrival)" value="@bind(each.toArrival)"
onChange="@command('calculate')" onChange="@command('calculate')"
format="short" format="short"
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.backArrival)" value="@bind(each.backArrival)"
onChange="@command('calculate')" onChange="@command('calculate')"
@ -278,13 +369,15 @@
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
</vbox> </vbox>
<vbox> <vbox>
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.toDeparture)" value="@bind(each.toDeparture)"
onChange="@command('calculate')" onChange="@command('calculate')"
format="short" format="short"
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.backDeparture)" value="@bind(each.backDeparture)"
onChange="@command('calculate')" onChange="@command('calculate')"
@ -292,7 +385,8 @@
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
</vbox> </vbox>
<vbox> <vbox>
<combobox inplace="true" <combobox
inplace="true"
model="@load(vm.vehicles)" model="@load(vm.vehicles)"
selectedItem="@bind(each.toVehicle)" selectedItem="@bind(each.toVehicle)"
width="67px" width="67px"
@ -302,8 +396,8 @@
<comboitem label="@load(each.code)" /> <comboitem label="@load(each.code)" />
</template> </template>
</combobox> </combobox>
<combobox
<combobox inplace="true" inplace="true"
model="@load(vm.vehicles)" model="@load(vm.vehicles)"
selectedItem="@bind(each.backVehicle)" selectedItem="@bind(each.backVehicle)"
width="67px" width="67px"
@ -315,12 +409,14 @@
</combobox> </combobox>
</vbox> </vbox>
<vbox> <vbox>
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.beginWork)" value="@bind(each.beginWork)"
format="short" format="short"
disabled="@load(vm.billDisabled or disabled)" /> disabled="@load(vm.billDisabled or disabled)" />
<timebox inplace="true" <timebox
inplace="true"
width="68px" width="68px"
value="@bind(each.endWork)" value="@bind(each.endWork)"
format="short" format="short"
@ -368,16 +464,25 @@
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" onChange="@command('calculate')"
readonly="@load(vm.billDisabled or disabled)" /> readonly="@load(vm.billDisabled or disabled)" />
<combobox inplace="true" selectedIndex="@bind(each.freeMealsCount)" <combobox
inplace="true"
selectedIndex="@bind(each.freeMealsCount)"
readonly="true" readonly="true"
disabled="@load(vm.billDisabled or disabled)" disabled="@load(vm.billDisabled or disabled)"
width="60px" width="60px"
onBlur="@command('calculate')"> onBlur="@command('calculate')">
<comboitem value="0" label="0"/> <comboitem
<comboitem value="1" label="1"/> value="0"
<comboitem value="2" label="2"/> label="0" />
<comboitem value="3" label="3"/> <comboitem
value="1"
label="1" />
<comboitem
value="2"
label="2" />
<comboitem
value="3"
label="3" />
</combobox> </combobox>
<label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)" /> <label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)" />
<textbox <textbox
@ -392,17 +497,26 @@
</template> </template>
</rows> </rows>
</grid> </grid>
<div hflex="1" align="end" > <div
hflex="1"
align="end">
<vbox> <vbox>
<hbox> <hbox>
<label value="Záloha: " style="font-size: 14px;"/> <label
<label value="@load(vm.dataBean.requirement.downPayment) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px;"/> value="Záloha: "
style="font-size: 14px;" />
<label
value="@load(vm.dataBean.requirement.downPayment) @converter(vm.standardBigDecimalConverter)"
style="font-size: 14px;" />
</hbox> </hbox>
<hbox> <hbox>
<label value="${labels.TripBillTotal}: " style="font-size: 14px; font-weight: bold;"/> <label
<label value="@load(vm.dataBean.total) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px; font-weight: bold;"/> value="${labels.TripBillTotal}: "
style="font-size: 14px; font-weight: bold;" />
<label
value="@load(vm.dataBean.total) @converter(vm.standardBigDecimalConverter)"
style="font-size: 14px; font-weight: bold;" />
</hbox> </hbox>
</vbox> </vbox>
</div> </div>
</zk> </zk>
Loading…
Cancel
Save