Pro org.codehaus.castor přidána vazba na xercesImpl.

Implicitní plnění měrných jednotek.
Příprava položek pro nové požadavky.
Logování událostí probíhá od úrovně warning.
Logování hibernate dotazů deaktivováno.

refs #100

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

@@ -22,6 +22,15 @@ RequirementsGridCenter=Středisko
 RequirementsGridDescription=Popis
 RequirementsGridDeliveryDate=Datum dodání
 
+RequirementItemCode=Kód
+RequirementItemName=Text
+RequirementItemQuantity=Množství
+RequirementItemMUnit=MJ
+RequirementItemUnitPrice=Jedn. cena
+RequirementItemTotal=Celkem
+RequirementItemDescription=Poznámka
+
+
 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené
 
@@ -180,4 +189,5 @@ false=Ne
 DateFormat=dd. MM. yyyy
 
 AddItem=Přidat položku...
+RemoveItem=Smazat položku...
  

src/main/webapp/lists/munits/munitsGrid.zul

@@ -26,7 +26,7 @@
 				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
-							<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							<textbox value="@bind(vm.filterTemplate.nameSpecial)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
 						</div>
 						<div sclass="find-grid-img">
 							<image src="/img/funnel.png" />
@@ -48,7 +48,7 @@
 			<template name="model">
 				<listitem>
 					<listcell label="@load(each.code)" />
-					<listcell label="@load(each.name)" />
+					<listcell label="@load(each.nameSpecial)" />
 					<listcell label="@load(each.description)" />
 				</listitem>
 			</template>

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

@@ -82,6 +82,90 @@
 					onClick="@command('addItem')"
 					sclass="nicebutton" />
 			</hbox>
+			<listbox
+				height="180px"
+				model="@load(vm.dataBean.items)"
+				selectedItem="@bind(vm.item)"
+				selectedIndex="@bind(vm.selItemIndex)">
+				<listhead>
+					<listheader
+						hflex="1"
+						Label="${labels.RequirementItemCode}" />
+					<listheader
+						hflex="3"
+						label="${labels.RequirementItemName}" />
+					<listheader
+						hflex="1"
+						label="${labels.RequirementItemQuantity}" />
+					<listheader
+						hflex="1"
+						label="${labels.RequirementItemMUnit}" />
+					<listheader
+						hflex="2"
+						label="${labels.RequirementItemUnitPrice}" />
+					<listheader
+						hflex="2"
+						label="${labels.RequirementItemTotal}" />
+					<listheader
+						width="120px"
+						label="${labels.RequirementItemDescription}" />
+					<listheader hflex="2" />
+				</listhead>
+				<template name="model">
+					<listitem>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.code)" />
+						</listcell>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.name)" />
+						</listcell>
+						<listcell>
+							<spinner
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								__onChange="@command('recalculate', zeroPrice=false)"
+								value="@bind(each.quantity)" />
+						</listcell>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.mUnit)" />
+						</listcell>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.unitPrice) @converter(vm.numConverter)" />
+						</listcell>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.total) @converter(vm.numConverter)" />
+						</listcell>
+						<listcell>
+							<textbox
+								inplace="true"
+								onFocus="@command('selectItem', item=each)"
+								value="@bind(each.description)" />
+						</listcell>
+						<listcell>
+							<button
+								image="/img/item-remove.png"
+								label="${labels.RemoveItem}"
+								onClick="@command('removeItem', item=each)"
+								sclass="nicebutton" />
+						</listcell>
+					</listitem>
+				</template>
+			</listbox>
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>

src/main/webapp/requirements/selectitems/selectItems.zul

@@ -0,0 +1,108 @@
+<?page title="${labels.AddItem}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<window
+		id="selectItemsWnd"
+		closable="true"
+		border="normal"
+		position="center"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirements.SelectItems')">
+		<caption
+			src="/img/item-add.png"
+			zclass="form-caption"
+			label="${labels.AddItem}" />
+		<vlayout>
+			<tabbox
+				id="tabboxItems"
+				hflex="1">
+				<tabs>
+					<tab
+						id="tabMaterial"
+						label="${labels.AgendaMaterial}"
+						image="/img/material.png" />
+					<tab
+						id="tabService"
+						label="${labels.AgendaServices}"
+						image="/img/service.png" />
+				</tabs>
+				<tabpanels>
+					<tabpanel>
+						<listbox
+							model="@load(vm.materialList)"
+							selectedItem="@bind(vm.selectedMaterial)">
+							<listhead menupopup="auto">
+								<listheader
+									label="${labels.code}"
+									sort="czech(code)"
+									width="10%" />
+								<listheader
+									label="${labels.name}"
+									sort="czech(name)"
+									width="25%" />
+								<listheader
+									label="${labels.description}"
+									sort="czech(description)"
+									width="55%" />
+								<listheader
+									label="${labels.munit}"
+									width="10%" />
+							</listhead>
+							<template name="model">
+								<listitem>
+									<listcell label="@load(each.code)" />
+									<listcell label="@load(each.name)" />
+									<listcell label="@load(each.description)" />
+									<listcell label="@load(each.munit.code)" />
+								</listitem>
+							</template>
+						</listbox>
+					</tabpanel>
+					<tabpanel>
+						<listbox
+							model="@load(vm.serviceItemList)"
+							selectedItem="@bind(vm.selectedServiceItem)">
+							<listhead menupopup="auto">
+								<listheader
+									label="${labels.code}"
+									sort="czech(code)"
+									width="10%" />
+								<listheader
+									label="${labels.name}"
+									sort="czech(name)"
+									width="30%" />
+								<listheader
+									label="${labels.description}"
+									sort="czech(description)"
+									width="60%" />
+							</listhead>
+							<template name="model">
+								<listitem>
+									<listcell label="@load(each.code)" />
+									<listcell label="@load(each.name)" />
+									<listcell label="@load(each.description)" />
+								</listitem>
+							</template>
+						</listbox>
+					</tabpanel>
+				</tabpanels>
+			</tabbox>
+		</vlayout>
+		<vlayout>
+			<div
+				hflex="max"
+				align="right">
+				<button
+					image="~./zul/img/misc/drag-disallow.png"
+					label="${labels.ButtonStorno}"
+					onClick="selectItemsWnd.detach()"
+					sclass="nicebutton" />
+				<button
+					image="/img/item-add.png"
+					label="${labels.AddItem}"
+					onClick="@command('addItem', window=selectItemsWnd)"
+					disabled="false"
+					sclass="nicebutton" />
+			</div>
+		</vlayout>
+	</window>
+</zk>