V agndě Fakturace požadavků přidán sloupec s žadatelem. Výchozí třídění

gridu je nyní podle čísla požadavku.
closes #182
refs #189

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();
+	}
+
 }

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

src/main/webapp/main/invoicing/invoicingGrid.zul

@@ -27,6 +27,9 @@
 					width="180px"/>
 				<listheader
 					label="${labels.RequirementsGridWorkgroup}"
+					width="180px"/>
+				<listheader
+          label="${labels.InvoicingApplicant}"
           width="180px"/>
 				<listheader
 					label="${labels.InvoicingDescription}" 
@@ -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)"