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