Skupiny materiálu a služeb lze nyní zadávat pomocí kódu.

Položku lze přidat bez výběru materiálu a služeb.
Upraveny styly.

closes #138

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

@@ -287,6 +287,7 @@ LoginViaGoogle=Přihlásit účtem Google
 DateFormat=dd. MM. yyyy
 
 AddItem=Přidat položku
+SelectGroup=Vybrat skupinu...
 RemoveItem=Smazat
 
 Amount=Částka

src/main/webapp/app/index.zul

@@ -1,4 +1,4 @@
-<?page title="Informace" contentType="text/html;charset=UTF-8"?>
+<?page title="${labels.Information}" contentType="text/html;charset=UTF-8"?>
 <zk>
 
 <zscript>

src/main/webapp/app/info.zul

@@ -1,4 +1,4 @@
-<?page title="Informace" contentType="text/html;charset=UTF-8"?>
+<?page title="${labels.Information}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<window
 		vflex="1"
@@ -8,14 +8,17 @@
 		<caption
 			zclass="form-caption"
 			label="${labels.Information}" />
-		<vbox vflex="1">
-			<hbox>
+		<vbox
+			vflex="1"
+			hflex="1">
+			<hbox hflex="1">
 				<label value="${labels.LogedInUser}" />
 				<image src="/img/user-small.png" />
 				<label value="@load(vm.user)" />
 			</hbox>
 			<groupbox
 				vflex="1"
+				hflex="1"
 				mold="3d">
 				<caption
 					image="/img/commission-small.png"

src/main/webapp/main/orders/material/reqHeadForm.zul

@@ -2,6 +2,8 @@
 <zk>
 	<window
 		id="editWin"
+		width="95%"
+		height="95%"
 		closable="true"
 		border="normal"
 		position="center"
@@ -12,6 +14,8 @@
 			image="/img/beam-032.png"
 			zclass="form-caption"
 			label="${labels.MaterialRequirement}" />
-		<include src="/main/orders/requirements/reqForm.zul" />
+		<include
+			vflex="1"
+			src="/main/orders/requirements/reqForm.zul" />
 	</window>
 </zk>

src/main/webapp/main/orders/material/selectMaterial.zul

@@ -5,13 +5,14 @@
 		closable="true"
 		border="normal"
 		position="center"
+		vflex="1"
 		apply="org.zkoss.bind.BindComposer"
 		viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.material.SelectMaterialItems')">
 		<caption
 			src="/img/palet-032.png"
 			zclass="form-caption"
 			label="${labels.AgendaMaterial}" />
-		<vlayout>
+		<vlayout vflex="1">
 			<toolbar>
 				<toolbarbutton
 					image="/img/funnel.png"
@@ -20,6 +21,7 @@
 					onClick="@command('onFilterMaterial')" />
 			</toolbar>
 			<listbox
+				vflex="1"
 				model="@load(vm.materialList)"
 				selectedItem="@bind(vm.selectedItem)">
 				<listhead menupopup="auto">

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

@@ -1,6 +1,7 @@
 <vlayout
 	form="@id('fx') @load(vm.dataBean) @save(vm.dataBean, before='save') @validator(vm.requirementFormValidator)"
-	hflex="1">
+	hflex="1"
+	vflex="1">
 	<grid hflex="min">
 		<columns>
 			<column
@@ -83,11 +84,17 @@
 			disabled="@load(empty fx.centre)"
 			image="/img/item-add.png"
 			label="${labels.AddItem}"
+			onClick="@command('addNewItem')"
+			sclass="nicebutton" />
+		<button
+			disabled="@load(empty fx.centre)"
+			image="/img/item-add.png"
+			label="${labels.SelectGroup}"
 			onClick="@command('addSelectedItem')"
 			sclass="nicebutton" />
 	</hbox>
 	<listbox
-		height="180px"
+		vflex="1"
 		model="@load(vm.syncItems)"
 		selectedItem="@bind(vm.selectedItem)"
 		selectedIndex="@bind(vm.selItemIndex)">
@@ -124,17 +131,27 @@
 		<template name="model">
 			<listitem>
 				<listcell>
-					<textbox
+					<combobox
+						width="100%"
+						value="@bind(each.code)"
+						model="@load(vm.requirementGroups)"
 						inplace="true"
-						sclass="grid-textbox-max"
-						readonly="true"
 						onFocus="@command('onFocusItem', item=each, ctrl=self)"
-						value="@bind(each.code)" />
+						onChange="@command('onChangeGroup')"
+						autocomplete="true"
+						selectedItem="@bind(each.reqSubject)">
+						<template
+							name="model"
+							var="subject">
+							<comboitem label="@load(subject.code)" />
+						</template>
+					</combobox>
 				</listcell>
 				<listcell>
 					<textbox
 						inplace="true"
 						sclass="grid-textbox-max"
+						readonly="false"
 						onFocus="@command('onFocusItem', item=each, ctrl=self)"
 						value="@bind(each.name)" />
 				</listcell>

src/main/webapp/main/orders/services/reqHeadForm.zul

@@ -2,6 +2,8 @@
 <zk>
 	<window
 		id="editWin"
+		width="95%"
+		height="95%"
 		closable="true"
 		border="normal"
 		position="center"
@@ -12,6 +14,8 @@
 			image="/img/worker-032.png"
 			zclass="form-caption"
 			label="${labels.ServiceRequirement}" />
-		<include src="/main/orders/requirements/reqForm.zul" />
+		<include
+			vflex="1"
+			src="/main/orders/requirements/reqForm.zul" />
 	</window>
 </zk>