Upraveno zobrazování seznamu souborů...

closes #214

src/main/webapp/main/trips/tripBillInterior.zul

@@ -1,51 +1,53 @@
-<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"/>
-			<column hflex="min"/>
-			<column hflex="2"/>
-			<column hflex="2"/>
-			<column hflex="2"/>
+			<column hflex="min" />
+			<column hflex="min" />
+			<column hflex="2" />
+			<column hflex="2" />
+			<column hflex="2" />
 		</columns>
 		<auxhead>
-			<auxheader label="${labels.TripBillTravelBegin}" colspan="2"/>
-			<auxheader label="${labels.TripBillTravelTarget}"/>
-			<auxheader label="${labels.TripBillPurpose}"/>
-			<auxheader label="${labels.TripBillTravelEnd}"/>
+			<auxheader
+				label="${labels.TripBillTravelBegin}"
+				colspan="2" />
+			<auxheader label="${labels.TripBillTravelTarget}" />
+			<auxheader label="${labels.TripBillPurpose}" />
+			<auxheader label="${labels.TripBillTravelEnd}" />
 		</auxhead>
 		<rows>
 			<row>
 				<cell colspan="2">
-					<label value="@load(vm.dataBean.requirement.from)"/>
+					<label value="@load(vm.dataBean.requirement.from)" />
 				</cell>
 				<cell>
-					<label value="@load(vm.dataBean.requirement.to)"/>
+					<label value="@load(vm.dataBean.requirement.to)" />
 				</cell>
 				<cell>
-					<label value="@load(vm.dataBean.requirement.description)"/>
+					<label value="@load(vm.dataBean.requirement.description)" />
 				</cell>
 				<cell>
-					<label value="@load(vm.dataBean.requirement.end)"/>
+					<label value="@load(vm.dataBean.requirement.end)" />
 				</cell>
 			</row>
 			<row>
-				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)"/>
-				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format='hh:mm')"/>
-				<cell/>
-				<cell/>
-				<label value="@load(vm.dataBean.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)"/>
+				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)" />
+				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format='hh:mm')" />
+				<cell />
+				<cell />
+				<label value="@load(vm.dataBean.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)" />
 			</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,103 +94,180 @@
 							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">
-				<label value=""/>
+				<label value="" />
 			</auxheader>
 			<!-- <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>
@@ -226,105 +311,116 @@
 				</auxheader>-->
 		</auxhead>
 		<columns visible="false">
-			<column width="60px"/>
-			<column width="60px"/>
-			<column hflex="max"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
-			<column width="70px"/>
+			<column width="60px" />
+			<column width="60px" />
+			<column hflex="max" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<column width="70px" />
+			<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')"/>
+					<label value="@load(each.date) @converter('formatedDate', format='dd.MM')" />
 					<vbox>
-						<label value="${labels.TripBillTo}"/>
-						<label value="${labels.TripBillBack}"/>
+						<label value="${labels.TripBillTo}" />
+						<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"
+							readonly="@load(vm.billDisabled or disabled)" />
+						<textbox
+							inplace="true"
 							value="@load(each.back)"
 							maxlength="@load(vm.lengthText)"
 							sclass="grid-textbox-max-left"
-								 readonly="@load(vm.billDisabled or disabled)"/>
+							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"
+							disabled="@load(vm.billDisabled or disabled)" />
+						<timebox
+							inplace="true"
 							width="68px"
 							value="@bind(each.backArrival)"
 							onChange="@command('calculate')"
 							format="short"
-								 disabled="@load(vm.billDisabled or disabled)"/>
+							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"
+							disabled="@load(vm.billDisabled or disabled)" />
+						<timebox
+							inplace="true"
 							width="68px"
 							value="@bind(each.backDeparture)"
 							onChange="@command('calculate')"
 							format="short"
-								 disabled="@load(vm.billDisabled or disabled)"/>
+							disabled="@load(vm.billDisabled or disabled)" />
 					</vbox>
 					<vbox>
-						<combobox inplace="true"
+						<combobox
+							inplace="true"
 							model="@load(vm.vehicles)"
 							selectedItem="@bind(each.toVehicle)"
 							width="67px"
 							readonly="true"
 							disabled="@load(vm.billDisabled or disabled)">
 							<template name="model">
-								<comboitem label="@load(each.code)"/>
+								<comboitem label="@load(each.code)" />
 							</template>
 						</combobox>
-
-						<combobox inplace="true"
+						<combobox
+							inplace="true"
 							model="@load(vm.vehicles)"
 							selectedItem="@bind(each.backVehicle)"
 							width="67px"
 							readonly="true"
 							disabled="@load(vm.billDisabled or disabled)">
 							<template name="model">
-								<comboitem label="@load(each.code)"/>
+								<comboitem label="@load(each.code)" />
 							</template>
 						</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"
+							disabled="@load(vm.billDisabled or disabled)" />
+						<timebox
+							inplace="true"
 							width="68px"
 							value="@bind(each.endWork)"
 							format="short"
-								 disabled="@load(vm.billDisabled or disabled)"/>
+							disabled="@load(vm.billDisabled or disabled)" />
 					</vbox>
 					<vbox>
 						<textbox
@@ -332,14 +428,14 @@
 							width="68px"
 							maxlength="@load(vm.lengthText)"
 							value="@bind(each.distance) @converter(vm.standardBigDecimalConverter)"
-								readonly="@load(vm.billDisabled or disabled)"/>
+							readonly="@load(vm.billDisabled or disabled)" />
 						<textbox
 							inplace="true"
 							width="68px"
 							value="@bind(each.distanceAmount) @converter(vm.standardBigDecimalConverter)"
 							maxlength="@load(vm.lengthText)"
 							onChange="@command('calculate')"
-								readonly="@load(vm.billDisabled or disabled)"/>
+							readonly="@load(vm.billDisabled or disabled)" />
 					</vbox>
 					<vbox>
 						<textbox
@@ -347,62 +443,80 @@
 							width="68px"
 							maxlength="@load(vm.lengthText)"
 							value="@bind(each.fuelConsumption) @converter(vm.standardBigDecimalConverter)"
-								readonly="@load(vm.billDisabled or disabled)"/>
+							readonly="@load(vm.billDisabled or disabled)" />
 						<textbox
 							inplace="true"
 							width="68px"
 							value="@bind(each.fuelAmount) @converter(vm.standardBigDecimalConverter)"
 							maxlength="@load(vm.lengthText)"
 							onChange="@command('calculate')"
-								readonly="@load(vm.billDisabled or disabled)"/>
+							readonly="@load(vm.billDisabled or disabled)" />
 					</vbox>
 					<textbox
 						inplace="true"
 						value="@bind(each.carefare) @converter(vm.standardBigDecimalConverter)"
 						maxlength="@load(vm.lengthText)"
 						onChange="@command('calculate')"
-							readonly="@load(vm.billDisabled or disabled)"/>
+						readonly="@load(vm.billDisabled or disabled)" />
 					<textbox
 						inplace="true"
 						value="@bind(each.housing) @converter(vm.standardBigDecimalConverter)"
 						maxlength="@load(vm.lengthText)"
 						onChange="@command('calculate')"
-							readonly="@load(vm.billDisabled or disabled)"/>
-					<combobox inplace="true" selectedIndex="@bind(each.freeMealsCount)"
+						readonly="@load(vm.billDisabled or disabled)" />
+					<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)"/>
+					<label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)" />
 					<textbox
 						inplace="true"
 						value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)"
 						maxlength="@load(vm.lengthText)"
 						onChange="@command('calculate')"
-							readonly="@load(vm.billDisabled or disabled)"/>
-					<label value="@load(each.total) @converter(vm.standardBigDecimalConverter)"/>
-					<label value="@load(each.adjustedTotal) @converter(vm.standardBigDecimalConverter)"/>
+						readonly="@load(vm.billDisabled or disabled)" />
+					<label value="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
+					<label value="@load(each.adjustedTotal) @converter(vm.standardBigDecimalConverter)" />
 				</row>
 			</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>