Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -415,6 +415,9 @@ Search=Hledat
 Pending = Nevyřízené
 Archive = Archiv
 Completed = Vyřízeno
+Backup = Zálohování
+SigningYear = Rok podepsání
+DownloadZipArchive = Stáhnout ZIP archiv...
 
 GenerateBillingForPassengers = Generovat společný požadavek a vyúčtování
 Passenger = Pasažér

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

@@ -183,7 +183,7 @@
 		<property name="rootPath" value="${storage.root}"/>
 	</bean>
 
-	<bean id="signeDocStorage" class="info.bukova.isspst.storage.ReportFileStorageImpl">
+	<bean id="signedDocStorage" class="info.bukova.isspst.storage.ReportFileStorageImpl">
 		<property name="rootPath" value="${storage.signedDocuments}"/>
 	</bean>
 

src/main/webapp/css/zk-modify.css

@@ -93,3 +93,15 @@
 .user-disabled {
 	background-color: #fff2dd !important;
 }
+
+.signed-doc-agenda	{
+	background-color: #d0d0d0 !important;
+}
+
+.signed-doc-year	{
+	background-color: #e0e0e0 !important;
+}
+
+.signed-doc-date	{
+	background-color: #f0f0f0 !important;
+}

src/main/webapp/lists/signeddocs/grid.zul

@@ -3,6 +3,9 @@
 	<listbox
 		vflex="1"
 		hflex="60"
+		mold="paging"
+		pagingPosition="bottom"
+		autopaging="true"
 		selectedItem="@bind(vm.dataBean)"
 		onSelect="@command('onChangeSelectSignedDocs', ctrl=self)"
 		model="@load(vm.dataList)">

src/main/webapp/lists/signeddocs/headListBackup.zul

@@ -0,0 +1,12 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="none"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.signeddocs.SignedDocsTreeList')">
+		<include
+			vflex="1"
+			src="/lists/signeddocs/treeBackup.zul" />
+	</window>
+</zk>

src/main/webapp/lists/signeddocs/setup.zul

@@ -4,6 +4,7 @@
 	<zscript>
 		String gridActual = "/lists/signeddocs/headListActual.zul";
 		String gridArchive = "/lists/signeddocs/headListArchive.zul";
+		String treeBackup = "/lists/signeddocs/headListBackup.zul";
 	</zscript>
 	<window
 		vflex="1"

src/main/webapp/lists/signeddocs/tabPanels.zul

@@ -5,6 +5,7 @@
 	<tabs>
 		<tab label="${labels.ActualDocuments}" />
 		<tab label="${labels.Archive}" />
+		<tab label="${labels.Backup}" />
 	</tabs>
 	<tabpanels>
 		<tabpanel>
@@ -13,5 +14,8 @@
 		<tabpanel>
 			<include src="${gridArchive}" />
 		</tabpanel>
+		<tabpanel>
+			<include src="${treeBackup}" />
+		</tabpanel>
 	</tabpanels>
 </tabbox>

src/main/webapp/lists/signeddocs/treeBackup.zul

@@ -0,0 +1,25 @@
+<hlayout vflex="1" hflex="max">
+    <tree id="tree"
+          vflex="1" hflex="max"
+          model="@load(vm.treeBackup)"
+          selectedItem="@bind(vm.selectedNodeItem)"
+          itemRenderer="info.bukova.isspst.ui.signeddocs.SignedDocsTreeRenderer"
+          sclass="addScrollbar">
+
+        <treecols>
+            <treecol hflex="7" label="${labels.AgendaName}"/>
+            <treecol hflex="4" label="${labels.SigningYear}"/>
+            <treecol hflex="5" label="${labels.SigningDate}"/>
+            <treecol hflex="5" label="${labels.Number}"/>
+            <treecol hflex="15" label="${labels.OrderFormDescription}"/>
+            <treecol hflex="6" label="${labels.ReportReport}"/>
+        </treecols>
+    </tree>
+    <menupopup id="popupMenu">
+        <menuitem
+                image="/img/zip-032.png"
+                label="${labels.DownloadZipArchive}..."
+                onClick="@command('onCreateZipArchive')"
+                />
+    </menupopup>
+</hlayout>