Umožněn upload souborů k požadavkům na služební cesty a k vyúčtování služební cesty.

closes #131

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -422,11 +422,13 @@
 		<property name="dao" ref="tripReqDao"/>
 		<property name="validator" ref="validator"/>
 		<property name="numberSeriesService" ref="numericSeriesService"/>
+		<property name="documentFileStorage" ref="documentStorage"/>
 	</bean>
 	
 	<bean id="tripBillService" class="info.bukova.isspst.services.tripbill.TripBillServiceImpl">
 		<property name="dao" ref="tripBillDao"/>
 		<property name="validator" ref="validator"/>
+		<property name="documentFileStorage" ref="documentStorage"/>
 	</bean>
 	
 	<bean id="orderService" class="info.bukova.isspst.services.orders.OrderServiceImpl">

src/main/webapp/app/uploadComponents.zul

@@ -0,0 +1,37 @@
+<?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"?>
+
+	<vbox>
+		<button image="/img/upload-016.png"
+				label="Připojit soubor"
+				upload="true"
+				onUpload="@command('uploadAttachment')"
+				sclass="nicebutton" />
+		<grid model="@load(vm.attachments)" height="180px">
+			<columns>
+				<column label="Soubor" width="220px"/>
+				<column label="Popis" hflex="max"/>
+				<column width="200px"/>
+			</columns>
+			<rows>
+				<template name="model">
+					<row>
+						<a href="@load('/api/dl/'.concat(each.pathInFilesystem).concat('/').concat(each.fileName))"
+						   label="@load(each.fileName)"
+						   target="blank"/>
+						<textbox value="@bind(each.description)" sclass="grid-textbox-max"/>
+						<hbox>
+							<button image="/img/delete-016.png" label="Odebrat" onClick="@command('deleteAttachment', attachment=each)" sclass="nicebutton"/>
+							<button image="/img/download-016.png" label="Stáhnout" onClick="@command('downloadAttachment', attachment=each)" sclass="nicebutton"/>
+						</hbox>
+					</row>
+				</template>
+			</rows>
+		</grid>
+	</vbox>
+
+</zk>

src/main/webapp/main/trips/bill/tripBillForm.zul

@@ -18,7 +18,7 @@
 			zclass="form-caption"
 			label="${labels.TravelOrdersFormTitle}" />
 		<vlayout vflex="1">
-			<include src="../tripBillInterior.zul"/>
+			<include src="../tripBillInterior.zul" vflex="1"/>
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>

src/main/webapp/main/trips/requirements/requirementsForm.zul

@@ -6,6 +6,8 @@
 	<window
 		id="editWin"
 		closable="true"
+		width="95%"
+		height="95%"
 		border="normal"
 		position="center"
 		apply="org.zkoss.bind.BindComposer"
@@ -128,30 +130,7 @@
 						</row>
 					</rows>
 				</grid>
-				<vbox>
-					<button label="Připojit"
-							upload="true"
-							onUpload="@command('uploadAttachment')"
-							sclass="nicebutton" />
-					<grid model="@load(vm.attachments)">
-						<columns>
-							<column/>
-						</columns>
-						<rows>
-							<template name="model">
-								<row>
-									<a href="@load('/api/dl/'.concat(each.pathInFilesystem).concat('/').concat(each.fileName))"
-									   label="@load(each.fileName)"
-									   target="blank"/>
-									<hbox>
-										<button label="Odebrat" onClick="@command('deleteAttachment', attachment=each)"/>
-										<button label="Stáhnout" onClick="@command('downloadAttachment', attachment=each)"/>
-									</hbox>
-								</row>
-							</template>
-						</rows>
-					</grid>
-				</vbox>
+				<include src="/app/uploadComponents.zul"/>
 			</hbox>
 			<vbox>
 				<label value="${labels.RequirementsFormPassengers}"/>

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

@@ -75,6 +75,10 @@
 			</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>
 	<grid
 			model="@load(vm.dataBean.billItems)"
 			vflex="1">