From c521fc3c8738430cf65c24c0b2cf3218f1fd797c Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 17 Nov 2014 21:15:17 +0100
Subject: [PATCH] =?UTF-8?q?Byl=20p=C5=99id=C3=A1n=20checkbox=20"Fakturov?=
 =?UTF-8?q?=C3=A1no"=20k=20polo=C5=BEk=C3=A1m=20v=20agend=C4=9B=20Fakturac?=
 =?UTF-8?q?e.=20Bude=20ozna=C4=8Dovat=20polo=C5=BEky=20vykryt=C3=A9=20fakt?=
 =?UTF-8?q?urou.=20closes=20#170?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/info/bukova/isspst/data/Invoicing.java  |  2 +-
 .../java/info/bukova/isspst/data/RequirementItem.java | 11 +++++++++++
 src/main/webapp/WEB-INF/locales/zk-label.properties   |  1 +
 src/main/webapp/main/invoicing/invoicingForm.zul      |  7 +++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/info/bukova/isspst/data/Invoicing.java b/src/main/java/info/bukova/isspst/data/Invoicing.java
index 6f5666c1..4256e389 100644
--- a/src/main/java/info/bukova/isspst/data/Invoicing.java
+++ b/src/main/java/info/bukova/isspst/data/Invoicing.java
@@ -19,7 +19,7 @@ import org.hibernate.annotations.LazyCollectionOption;
 @Table(name = "INVOICING")
 public class Invoicing extends BaseData {
 	
-	@OneToOne(fetch = FetchType.EAGER)
+	@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@JoinColumn(name = "REQUIREMENT_ID")
 	private Requirement requirement;
 	
diff --git a/src/main/java/info/bukova/isspst/data/RequirementItem.java b/src/main/java/info/bukova/isspst/data/RequirementItem.java
index 1b708cc8..20c7e95a 100644
--- a/src/main/java/info/bukova/isspst/data/RequirementItem.java
+++ b/src/main/java/info/bukova/isspst/data/RequirementItem.java
@@ -58,6 +58,9 @@ public class RequirementItem
 
 	@Column(name = "ORDERNUM")
 	private String orderNum;
+	
+	@Column(name = "PAID")
+	private Boolean paid;
 
 	public int getId()
 	{
@@ -215,4 +218,12 @@ public class RequirementItem
 	{
 		this.orderNum = orderNum;
 	}
+
+	public Boolean getPaid() {
+		return paid;
+	}
+
+	public void setPaid(Boolean paid) {
+		this.paid = paid;
+	}
 }
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index 2cc2ee12..1d446c72 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -344,6 +344,7 @@ InvoicingDate=Datum
 InvoicingInvoiceNumber=Číslo faktury
 InvoicingAmount=Částka
 InvoicingDescription=Popis
+InvoicingInvoiced=Fakturováno
 
 HandleComboKeyFilter=#del
 HandleComboKey=$#del
diff --git a/src/main/webapp/main/invoicing/invoicingForm.zul b/src/main/webapp/main/invoicing/invoicingForm.zul
index 9e72aa3e..ebd67520 100644
--- a/src/main/webapp/main/invoicing/invoicingForm.zul
+++ b/src/main/webapp/main/invoicing/invoicingForm.zul
@@ -152,6 +152,10 @@
 						hflex="10"
 						align="right"
 						label="${labels.RequirementItemTotal}" />
+					<listheader
+						hflex="10"
+						align="right"
+						label="${labels.InvoicingInvoiced}" />
 					<listheader
 						hflex="15"
 						label="${labels.RequirementItemDescription}" />
@@ -179,6 +183,9 @@
 						<listcell>
 							<label value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
 						</listcell>
+						<listcell>
+							<checkbox checked="@bind(each.paid)"/>
+						</listcell>
 						<listcell>
 							<label value="@bind(each.description)" />
 						</listcell>