From 4cd2f5b5e668ccaa02319c8fe2f290ce355edf5d Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Thu, 15 Jan 2015 10:40:46 +0100
Subject: [PATCH] =?UTF-8?q?V=20agnd=C4=9B=20Fakturace=20po=C5=BEadavk?=
 =?UTF-8?q?=C5=AF=20p=C5=99id=C3=A1n=20sloupec=20s=20=C5=BEadatelem.=20V?=
 =?UTF-8?q?=C3=BDchoz=C3=AD=20t=C5=99=C3=ADd=C4=9Bn=C3=AD=20gridu=20je=20n?=
 =?UTF-8?q?yn=C3=AD=20podle=20=C4=8D=C3=ADsla=20po=C5=BEadavku.=20closes?=
 =?UTF-8?q?=20#182=20refs=20#189?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/invoicing/InvoicingServiceImpl.java      | 11 +++++++++++
 src/main/webapp/WEB-INF/locales/zk-label.properties   |  1 +
 src/main/webapp/main/invoicing/invoicingGrid.zul      |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java b/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java
index 001fb6b1..9fb504b9 100644
--- a/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java
@@ -7,9 +7,11 @@ import info.bukova.isspst.services.AbstractOwnedService;
 import info.bukova.isspst.services.LazyLoader;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
 public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implements
@@ -54,4 +56,13 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
 		invoicing.setTotalInvoiced(total);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_READ')")
+	public List<Invoicing> getAll() {
+		Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy order by rq.numser");
+		return q.list();
+	}
+
 }
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index 93457367..116bb1a8 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -346,6 +346,7 @@ InvoicingInvoiceNumber=Číslo faktury
 InvoicingAmount=Částka
 InvoicingDescription=Popis
 InvoicingInvoiced=Fakturováno
+InvoicingApplicant=Žadatel
 
 HandleComboKeyFilter=#del
 HandleComboKey=$#del
diff --git a/src/main/webapp/main/invoicing/invoicingGrid.zul b/src/main/webapp/main/invoicing/invoicingGrid.zul
index 7daee89e..57737c84 100644
--- a/src/main/webapp/main/invoicing/invoicingGrid.zul
+++ b/src/main/webapp/main/invoicing/invoicingGrid.zul
@@ -29,6 +29,9 @@
 					label="${labels.RequirementsGridWorkgroup}"
 					width="180px"/>
 				<listheader
+          label="${labels.InvoicingApplicant}"
+          width="180px"/>
+				<listheader
 					label="${labels.InvoicingDescription}" 
 					width=""/>
 				<listheader
@@ -161,6 +164,7 @@
 					<listcell label="@load(each.requirement.reqDate)  @converter('formatedDate', format=labels.DateFormat)" />
 					<listcell label="@load(each.requirement.centre)" />
 					<listcell label="@load(each.requirement.workgroup)" />
+					<listcell label="@load(each.requirement.ownedBy)" />
 					<listcell label="@load(each.requirement.description)" />
 					<listcell label="@load(each.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" />
 					<listcell label="@load(each.totalInvoiced) @converter(vm.standardBigDecimalConverter)"