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

src/main/java/info/bukova/isspst/data/RequirementItem.java

@@ -30,7 +30,10 @@ public class RequirementItem
 	
 	@Column(name = "NAME")
 	private String name;
-	
+
+	@Column(name = "TEXTITEM")
+	private String textItem;
+
 	@Column(name = "QUANTITY", precision=15, scale=4)
 	private BigDecimal quantity;
 	
@@ -86,6 +89,16 @@ public class RequirementItem
 		this.name = name;
 	}
 
+	public String getTextItem()
+	{
+		return textItem;
+	}
+
+	public void setTextItem(String textItem)
+	{
+		this.textItem = textItem;
+	}
+
 	public BigDecimal getQuantity()
 	{
 		return quantity;

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

@@ -31,8 +31,9 @@ RequirementsGridMyCentres=Má střediska
 RequirementsGridMyWorkgroups=Mé komise
 RequirementsGridAll=Vše
 
-RequirementItemCode=Kód
+RequirementItemCode=Kód skupiny
-RequirementItemName=Text
+RequirementItemName=Název skupiny
+RequirementItemText=Text položky
 RequirementItemQuantity=Množství
 RequirementItemMUnit=MJ
 RequirementItemUnitPrice=Jedn. cena

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

@@ -93,30 +93,33 @@
 		selectedIndex="@bind(vm.selItemIndex)">
 		<listhead>
 			<listheader
-				hflex="1"
+				hflex="10"
 				label="${labels.RequirementItemCode}" />
 			<listheader
-				hflex="3"
+				hflex="15"
 				label="${labels.RequirementItemName}" />
 			<listheader
-				hflex="1"
+				hflex="30"
+				label="${labels.RequirementItemText}" />
+			<listheader
+				hflex="10"
 				align="right"
 				label="${labels.RequirementItemQuantity}" />
 			<listheader
-				hflex="1"
+				hflex="10"
 				label="${labels.RequirementItemMUnit}" />
 			<listheader
-				hflex="1"
+				hflex="10"
 				align="right"
 				label="${labels.RequirementItemUnitPrice}" />
 			<listheader
-				hflex="1"
+				hflex="10"
 				align="right"
 				label="${labels.RequirementItemTotal}" />
 			<listheader
-				hflex="3"
+				hflex="15"
 				label="${labels.RequirementItemDescription}" />
-			<listheader hflex="1" />
+			<listheader hflex="10" />
 		</listhead>
 		<template name="model">
 			<listitem>
@@ -135,6 +138,13 @@
 						onFocus="@command('onFocusItem', item=each, ctrl=self)"
 						value="@bind(each.name)" />
 				</listcell>
+				<listcell>
+					<textbox
+						inplace="true"
+						sclass="grid-textbox-max"
+						onFocus="@command('onFocusItem', item=each, ctrl=self)"
+						value="@bind(each.textItem)" />
+				</listcell>
 				<listcell>
 					<textbox
 						inplace="true"