Merge branch 'Verze_1.0'

Conflicts:
	src/main/webapp/WEB-INF/locales/zk-label.properties
	src/main/webapp/app/mainMenu.zul

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

@@ -40,6 +40,8 @@ RequirementItemUnitPrice=Jedn. cena
 RequirementItemTotal=Celkem
 RequirementItemDescription=Poznámka
 
+RequirementInvoicedAmount=Fakturovaná částka:
+
 
 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené
@@ -362,8 +364,8 @@ WorkgroupFormCannotAddWorkgroup=Komisi nelze přidat
 WorkgroupFormOrderLimit=Limit nákupů
 WorkgroupIsInWorkgroup=Komisi nelze smazat, protože je členem některého střediska
 
-Help=Příručka
 GoogleDriveUrl=Odkaz na Google Drive
+Help=Příručka
 
 ModuleNotActive=Modul není aktivovaný
 

src/main/webapp/WEB-INF/web.xml

@@ -192,6 +192,10 @@
     <location>/error.zul</location>   
   </error-page>
 
+	<session-config>
+      <session-timeout>480</session-timeout>
+  </session-config>
+	
 	<welcome-file-list>
 		<welcome-file>index.zul</welcome-file>
 		<welcome-file>index.zhtml</welcome-file>

src/main/webapp/app/mainMenu.zul

@@ -135,6 +135,9 @@
 					href="/j_spring_security_logout" />
 			</menupopup>
 		</menu>
+		<menuitem label="${labels.Help}" target="blank"
+          href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
+          tooltiptext="${labels.GoogleDriveUrl}" />
 		<menuseparator />
 		<menuitem 
 		  image="/img/search.png"

src/main/webapp/app/template.zhtml

@@ -51,6 +51,6 @@
 		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer"> Verze 1.0 </div>
+		<div id="footer"> Verze 1.3 </div>
 	</div>
 </html>

src/main/webapp/main/invoicing/invoicingGrid.zul

@@ -123,6 +123,27 @@
 						</div>
 					</div>
 				</auxheader>
+				<auxheader>
+				  <div zclass="find-grid-cell">
+            <div sclass="find-grid-divtextbox">
+              <combobox
+                ctrlKeys="${labels.HandleComboKeyFilter}"
+                onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+                onChange="@command('doFilter')"
+                width="100%"
+                selectedItem="@bind(vm.filterTemplate.requirement.ownedBy)"
+                model="@load(vm.users)"
+                readonly="true">
+                <template name="model">
+                  <comboitem label="@load(each.fullName)" />
+                </template>
+              </combobox>
+            </div>
+            <div sclass="find-grid-img">
+              <image src="/img/funnel.png" />
+            </div>
+          </div>
+				</auxheader>
 				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">

src/main/webapp/main/orders/approved/grid.zul

@@ -32,6 +32,10 @@
 			<listhead menupopup="auto">
 				<listheader width="27" />
 				<listheader
+          hflex="6"
+          sort="czech(requirement.numser)"
+          label="${labels.InvoicingRequirementNumber}" />
+				<listheader
 					hflex="7"
 					sort="czech(code)"
 					label="${labels.RequirementItemCode}" />
@@ -82,6 +86,21 @@
 			<auxhead visible="@load(vm.filter)">
 				<auxheader />
 				<auxheader>
+          <div sclass="find-grid-cell">
+            <div sclass="find-grid-divtextbox">
+              <textbox
+                value="@bind(vm.filterTemplate.requirement.numser)"
+                instant="true"
+                onChange="@command('doFilter')"
+                maxlength="@load(vm.lengthText)"
+                sclass="find-grid-textbox" />
+            </div>
+            <div sclass="find-grid-img">
+              <image src="/img/funnel.png" />
+            </div>
+          </div>
+        </auxheader>
+				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
 							<textbox
@@ -268,6 +287,7 @@
 			<template name="model">
 				<listitem context="popupMenu">
 					<listcell />
+					<listcell label="@load(each.requirement.numser)"/>
 					<listcell label="@load(each.code)" />
 					<listcell label="@load(each.name)" />
 					<listcell label="@load(each.textItem)" />

src/main/webapp/main/orders/requirements/reqListMyAll.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+	   <vbox>
+	     <include src="/main/approveStatus.zul" />
+	     
+	     <hbox visible="@load(not empty vm.invoicedAmount)">
+	       <label value="${labels.RequirementInvoicedAmount}"/>
+	       <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+	     </hbox>
+	     
+	   </vbox>
 	</div>
 </hbox>

src/main/webapp/main/orders/requirements/reqListMyCenters.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+		<vbox>
+       <include src="/main/approveStatus.zul" />
+       
+       <hbox visible="@load(not empty vm.invoicedAmount)">
+         <label value="${labels.RequirementInvoicedAmount}"/>
+         <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+       </hbox>
+       
+     </vbox>
 	</div>
 </hbox>

src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+		<vbox>
+       <include src="/main/approveStatus.zul" />
+       
+       <hbox visible="@load(not empty vm.invoicedAmount)">
+         <label value="${labels.RequirementInvoicedAmount}"/>
+         <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+       </hbox>
+       
+     </vbox>
 	</div>
 </hbox>