Objednávku lze nyní označit jako objednanou.

Na schválené položky se propíš číslo objednávky.
Všechny objednávky, které schválené a objednané položky obsahují již
není možno znovu objednat.
Objednávky mazat nelze, takže mazání dokladů neřešíme.

closes #153

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

@@ -279,6 +279,7 @@ false=Ne
 Information=Informace
 Order=Objednávka
 Orders=Objednávky
+OrderAbr=Obj.
 
 MaterialRequirement=Požadavek na materiál
 MaterialRequirements=Požadavky na materiál

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

@@ -219,6 +219,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
 
+    <bean id="requirementItemDao" class="info.bukova.isspst.dao.jpa.RequirementItemDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
     <bean id="numericSeriesDao" class="info.bukova.isspst.dao.jpa.NumberSeriesDaoJPA">
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>

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

@@ -27,9 +27,13 @@
 						model="@load(vm.dataList)">
 						<listhead menupopup="auto">
 							<listheader
-								hflex="10"
+								hflex="3"
+								sort="auto(ordered)"
+								label="${labels.OrderAbr}" />
+							<listheader
+								hflex="7"
 								sort="czech(numser)"
-								label="${labels.OrderFormNumber}" />
+								label="${labels.number}" />
 							<listheader
 								hflex="10"
 								sort="auto(orderDate)"
@@ -79,6 +83,19 @@
 								label="${labels.OrderFormDescription}" />
 						</listhead>
 						<auxhead visible="@load(vm.filter)">
+							<auxheader>
+								<div sclass="find-grid-cell">
+									<div sclass="find-grid-divtextbox">
+										<checkbox
+											label="${labels.OrderFormOrdered}"
+											checked="@bind(vm.filterTemplate.ordered)"
+											onClick="@command('doFilter')" />
+									</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">
@@ -251,6 +268,7 @@
 						</auxhead>
 						<template name="model">
 							<listitem>
+								<listcell label="@load(each.ordered) @converter(vm.standardBoolConverter)" />
 								<listcell label="@load(each.numser)" />
 								<listcell label="@load(each.orderDate) @converter('formatedDate', format=labels.DateFormat)" />
 								<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
@@ -308,6 +326,10 @@
 								hflex="15"
 								sort="czech(description)"
 								label="${labels.RequirementItemDescription}" />
+							<listheader
+								hflex="5"
+								sort="auto(reqItem.orderNum)"
+								label="${labels.OrderAbr}" />
 						</listhead>
 						<template name="model">
 							<listitem>
@@ -319,6 +341,7 @@
 								<listcell label="@load(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.description)" />
+								<listcell label="@load(each.reqItem.orderNum)" />
 							</listitem>
 						</template>
 					</listbox>

src/main/webapp/main/orders/created/orderForm.zul

@@ -42,6 +42,16 @@
 									<column />
 								</columns>
 								<rows vflex="max">
+									<row>
+										<cell sclass="row-title"></cell>
+										<cell>
+											<checkbox
+												id="idOrderOrdered"
+												disabled="@load(fx.icludedRequirementItemFromAnotherOrder)"
+												label="${labels.OrderFormOrdered}"
+												checked="@bind(fx.ordered)" />
+										</cell>
+									</row>
 									<row>
 										<cell sclass="row-title">${labels.OrderFormNumber} :</cell>
 										<cell>
@@ -532,6 +542,10 @@
 						hflex="15"
 						sort="czech(description)"
 						label="${labels.RequirementItemDescription}" />
+					<listheader
+						hflex="5"
+						sort="auto(reqItem.orderNum)"
+						label="${labels.OrderAbr}" />
 				</listhead>
 				<template name="model">
 					<listitem>
@@ -542,7 +556,7 @@
 							<textbox
 								inplace="true"
 								sclass="grid-textbox-max-right"
-								readonly="${not sec:isAllGranted('ROLE_ADMIN')}"
+								readonly="true"
 								onFocus="@command('onFocusItem', item=each, ctrl=self)"
 								onChange="@command('recalculate', form=fx, changed='quantity')"
 								value="@bind(each.quantity) @converter(vm.standardBigDecimalConverter)" />
@@ -567,6 +581,7 @@
 								value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
 						</listcell>
 						<listcell label="@load(each.description)" />
+						<listcell label="@load(each.reqItem.orderNum)" />
 					</listitem>
 				</template>
 			</listbox>