From 48bd9983fcd374faf9bdf693e91fd581ff95b935 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Wed, 28 Nov 2018 13:25:58 +0100
Subject: [PATCH] =?UTF-8?q?Optimalizace=20na=C4=8D=C3=ADt=C3=A1n=C3=AD=20g?=
 =?UTF-8?q?rid=C5=AF=20cestovn=C3=ADch=20p=C5=99=C3=ADkaz=C5=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/info/bukova/isspst/Constants.java    |   2 +-
 .../bukova/isspst/data/RequirementBase.java   |  10 +++++
 .../bukova/isspst/data/TripBillApproval.java  |  10 -----
 .../filters/TripBillApprovalFilter.java       |   2 +-
 .../services/dbinfo/DbInfoServiceImpl.java    |  41 ++++++++++++++++++
 .../RequirementBaseServiceImpl.java           |   1 +
 .../isspst/ui/tripbill/TripBillListAll.java   |   7 +--
 .../ui/tripbill/TripBillListCentre.java       |   7 +--
 .../ui/tripbill/TripBillListWorkgroup.java    |   7 +--
 .../webapp/WEB-INF/reports/tripBills.jasper   | Bin 28698 -> 28739 bytes
 .../webapp/WEB-INF/reports/tripBills.jrxml    |  14 +++---
 .../webapp/WEB-INF/reports/tripBillsNP.jasper | Bin 27641 -> 27658 bytes
 .../webapp/WEB-INF/reports/tripBillsNP.jrxml  |   6 ++-
 .../main/trips/bill/tripBillGridInt.zul       |   2 +-
 14 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java
index c32d04da..52224642 100644
--- a/src/main/java/info/bukova/isspst/Constants.java
+++ b/src/main/java/info/bukova/isspst/Constants.java
@@ -36,7 +36,7 @@ import java.util.Map;
 
 public class Constants {
 
-	public final static long DB_VERSION = 6;
+	public final static long DB_VERSION = 7;
 
 	public final static String DEF_ADMIN = "admin";
 	public final static String DEF_ADMIN_PASSWD = "admin";
diff --git a/src/main/java/info/bukova/isspst/data/RequirementBase.java b/src/main/java/info/bukova/isspst/data/RequirementBase.java
index 6451f5d4..ee4c799f 100644
--- a/src/main/java/info/bukova/isspst/data/RequirementBase.java
+++ b/src/main/java/info/bukova/isspst/data/RequirementBase.java
@@ -63,6 +63,8 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
 	@JoinColumn(name = "SEASON_ID")
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 	private Season season;
+	@Column(name = "APPROVE_DATE")
+	private Date approveDate;
 	
 	public RequirementBase() {
 		authorization = new ArrayList<AuthItem>();
@@ -166,4 +168,12 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
 	public void setSeason(Season season) {
 		this.season = season;
 	}
+
+	public Date getApproveDate() {
+		return approveDate;
+	}
+
+	public void setApproveDate(Date approveDate) {
+		this.approveDate = approveDate;
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/data/TripBillApproval.java b/src/main/java/info/bukova/isspst/data/TripBillApproval.java
index 9733627d..c94d1942 100644
--- a/src/main/java/info/bukova/isspst/data/TripBillApproval.java
+++ b/src/main/java/info/bukova/isspst/data/TripBillApproval.java
@@ -22,8 +22,6 @@ public class TripBillApproval extends RequirementBase {
 	@Transient
 	private boolean billForPassenger;
 	@Transient
-	private Date approveDate;
-	@Transient
 	private Date tripDate;
 
 	public boolean isBillForPassenger() {
@@ -42,14 +40,6 @@ public class TripBillApproval extends RequirementBase {
 		this.tripDate = tripDate;
 	}
 
-	public Date getApproveDate() {
-		return approveDate;
-	}
-
-	public void setApproveDate(Date approveDate) {
-		this.approveDate = approveDate;
-	}
-
 	@Override
 	public String getNumser() {
 
diff --git a/src/main/java/info/bukova/isspst/filters/TripBillApprovalFilter.java b/src/main/java/info/bukova/isspst/filters/TripBillApprovalFilter.java
index ea9b4e54..0775ae8e 100644
--- a/src/main/java/info/bukova/isspst/filters/TripBillApprovalFilter.java
+++ b/src/main/java/info/bukova/isspst/filters/TripBillApprovalFilter.java
@@ -54,7 +54,7 @@ public class TripBillApprovalFilter implements Filter<TripBillApproval>
 			boolean foundPaid = BooleanUtils.isEqualByBooleanValue(item.getBill().getPaid(), condition.getBill().getPaid());
 			boolean foundPaidDate = DateTimeUtils.isEqualByDateForFilter(item.getBill().getPaidDate(), condition.getBill().getPaidDate());
 			boolean foundPassenger = (item.getBill().getOwnedBy() != item.getBill().getRequirement().getOwnedBy()) == condition.isBillForPassenger();
-			boolean foundApproveDate = DateTimeUtils.isEqualByDateForFilter(item.getLastApproveDate(), condition.getApproveDate());
+			boolean foundApproveDate = DateTimeUtils.isEqualByDateForFilter(item.getApproveDate(), condition.getApproveDate());
 			boolean foundTripDate = DateTimeUtils.isEqualByDateForFilter(item.getBill().getRequirement().getTripDate(), condition.getTripDate());
 			return foundNumser && foundReqDate && foundDescription && foundFrom && foundTo && foundWorkgroup && foundCentre && foundOwner && foundPaid
 					&& foundPaidDate && foundPassenger && foundApproveDate && foundTripDate;
diff --git a/src/main/java/info/bukova/isspst/services/dbinfo/DbInfoServiceImpl.java b/src/main/java/info/bukova/isspst/services/dbinfo/DbInfoServiceImpl.java
index c757edac..38ca8c06 100644
--- a/src/main/java/info/bukova/isspst/services/dbinfo/DbInfoServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/dbinfo/DbInfoServiceImpl.java
@@ -1,9 +1,20 @@
 package info.bukova.isspst.services.dbinfo;
 
 import info.bukova.isspst.Constants;
+import info.bukova.isspst.dao.BaseDao;
+import info.bukova.isspst.dao.RequirementDao;
+import info.bukova.isspst.dao.TripBillApprovalDao;
+import info.bukova.isspst.dao.TripRequirementDao;
 import info.bukova.isspst.data.DbInfo;
+import info.bukova.isspst.data.RequirementBase;
+import info.bukova.isspst.data.RequirementState;
 import info.bukova.isspst.services.AbstractService;
+import info.bukova.isspst.services.requirement.RequirementBaseService;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.requirement.TripRequirementService;
+import info.bukova.isspst.services.tripbill.TripBillApprovalService;
 import org.hibernate.SQLQuery;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -11,6 +22,20 @@ import java.util.List;
 
 public class DbInfoServiceImpl extends AbstractService<DbInfo> implements DbInfoService
 {
+	@Autowired
+	private TripBillApprovalService tripBillApprovalService;
+	@Autowired
+	private TripBillApprovalDao tripBillApprovalDao;
+	@Autowired
+	private TripRequirementService tripRequirement;
+	@Autowired
+	private TripRequirementDao tripRequirementDao;
+	@Autowired
+	private RequirementService requirementService;
+	@Autowired
+	private RequirementDao requirementDao;
+
+
 	private DbInfo getDbInfo()
 	{
 		DbInfo dbInfo = null;
@@ -211,10 +236,26 @@ public class DbInfoServiceImpl extends AbstractService<DbInfo> implements DbInfo
 				sq.executeUpdate();
 			}
 
+			if (dbVersion < 7) {
+				setApproveDate((RequirementBaseService)tripBillApprovalService, (BaseDao)tripBillApprovalDao);
+				setApproveDate((RequirementBaseService)tripRequirement, (BaseDao)tripRequirementDao);
+				setApproveDate((RequirementBaseService)requirementService, (BaseDao)requirementDao);
+			}
+
 			this.updateDatabaseVersion();
 		}
 	}
 
+	private void setApproveDate(RequirementBaseService<RequirementBase> service, BaseDao<RequirementBase> daoReq) {
+		for (RequirementBase req : service.getAll()) {
+			if (req.getState() == RequirementState.APPROVED) {
+				service.loadAuthItems(req);
+				req.setApproveDate(req.getLastApproveDate());
+				daoReq.modify(req);
+			}
+		}
+	}
+
 	@Override
 	@Transactional
 	public void updateDatabaseVersion()
diff --git a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java
index 08cb7b04..2dd12d69 100644
--- a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java
@@ -289,6 +289,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 
 		if (getNextWorkflow(e) == null) {
 			e.setState(RequirementState.APPROVED);
+			e.setApproveDate(approveDate);
 		} else {
 			e.setState(RequirementState.PARTIALLY);
 		}
diff --git a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListAll.java b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListAll.java
index 19219a17..946f4767 100644
--- a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListAll.java
+++ b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListAll.java
@@ -20,12 +20,7 @@ public class TripBillListAll extends TripBillListBase {
 	@Override
 	protected List<TripBillApproval> getListFromService() {
 		try {
-			List<TripBillApproval> list = getReqService().getAll();
-			for (TripBillApproval item : list)
-			{
-				getReqService().loadAuthItems(item);
-			}
-			return list;
+			return getReqService().getAll();
 		} catch (AccessDeniedException e) {
 			BindUtils.postGlobalCommand(null, null, "disableAll", null);
 			return new ArrayList<TripBillApproval>();
diff --git a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListCentre.java b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListCentre.java
index 1ede9888..9a6f868a 100644
--- a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListCentre.java
+++ b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListCentre.java
@@ -20,12 +20,7 @@ public class TripBillListCentre extends TripBillListBase {
 	@Override
 	protected List<TripBillApproval> getListFromService() {
 		try {
-			List<TripBillApproval> list = getReqService().getCentreReq();
-			for (TripBillApproval item : list)
-			{
-				getReqService().loadAuthItems(item);
-			}
-			return list;
+			return getReqService().getCentreReq();
 		} catch (AccessDeniedException e) {
 			BindUtils.postGlobalCommand(null, null, "disableCentre", null);
 			return new ArrayList<TripBillApproval>();
diff --git a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListWorkgroup.java b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListWorkgroup.java
index 02660a73..aee340bd 100644
--- a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListWorkgroup.java
+++ b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillListWorkgroup.java
@@ -20,12 +20,7 @@ public class TripBillListWorkgroup extends TripBillListBase {
 	@Override
 	protected List<TripBillApproval> getListFromService() {
 		try {
-			List<TripBillApproval> list = getReqService().getWorkgroupReq();
-			for (TripBillApproval item : list)
-			{
-				getReqService().loadAuthItems(item);
-			}
-			return list;
+			return getReqService().getWorkgroupReq();
 		} catch (AccessDeniedException e) {
 			BindUtils.postGlobalCommand(null, null, "disableWorkgroup", null);
 			return new ArrayList<TripBillApproval>();
diff --git a/src/main/webapp/WEB-INF/reports/tripBills.jasper b/src/main/webapp/WEB-INF/reports/tripBills.jasper
index 2497cc6500a9fb1199ca2ba3918a99eeb813ef72..37b667c463fc1b6848e2c2002f20802f939fcc32 100644
GIT binary patch
literal 28739
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
M0OBrTwRDmGf67BXVgLXD

literal 28698
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
Nk^xNBqG~lG`=5D(LVExJ

diff --git a/src/main/webapp/WEB-INF/reports/tripBills.jrxml b/src/main/webapp/WEB-INF/reports/tripBills.jrxml
index 0a9517dc..afc324a9 100644
--- a/src/main/webapp/WEB-INF/reports/tripBills.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripBills.jrxml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="TripBills" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b63eddc4-7326-45c4-99b4-fc35d6e98179">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<property name="ireport.zoom" value="1.9487171000000014"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -19,7 +21,7 @@
 	<title>
 		<band height="23" splitType="Stretch">
 			<staticText>
-				<reportElement x="203" y="0" width="212" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
+				<reportElement x="0" y="0" width="550" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
 				<textElement textAlignment="Center">
 					<font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
 				</textElement>
@@ -75,7 +77,7 @@
 				<text><![CDATA[Cíl]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="358" y="0" width="100" height="24" uuid="9eddb29b-3024-4f0d-90f5-e8e896add7c0">
+				<reportElement x="358" y="0" width="97" height="24" uuid="9eddb29b-3024-4f0d-90f5-e8e896add7c0">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -84,7 +86,7 @@
 				<text><![CDATA[Žadatel]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="460" y="0" width="40" height="24" uuid="783dc31a-7f32-44d1-b455-6e8d25d5a943">
+				<reportElement x="451" y="0" width="45" height="24" uuid="783dc31a-7f32-44d1-b455-6e8d25d5a943">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -155,7 +157,7 @@
 				<textFieldExpression><![CDATA[$F{bill.requirement.to}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="358" y="1" width="100" height="12" uuid="3a197226-28d7-4384-b74a-12e748bd0967">
+				<reportElement x="358" y="1" width="97" height="12" uuid="3a197226-28d7-4384-b74a-12e748bd0967">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
 				</reportElement>
 				<textElement>
@@ -164,7 +166,7 @@
 				<textFieldExpression><![CDATA[$F{bill.ownedBy}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement x="460" y="1" width="40" height="12" uuid="02a5e327-b7ab-4841-a895-0d285770e3c8">
+				<reportElement x="451" y="1" width="45" height="12" uuid="02a5e327-b7ab-4841-a895-0d285770e3c8">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
 				</reportElement>
 				<textElement textAlignment="Right">
diff --git a/src/main/webapp/WEB-INF/reports/tripBillsNP.jasper b/src/main/webapp/WEB-INF/reports/tripBillsNP.jasper
index a58c2c5d75ef859e97c7c5cd1c9fb56baedc51b0..32d8b93d983c69e7c9a415ff6777e11c0efef86d 100644
GIT binary patch
literal 27658
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

literal 27641
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
at;y@i$7P#^RtK$xjXq4RqH6ge^Zx-qT`Kbc

diff --git a/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml b/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml
index 0265782c..6dc9f0cc 100644
--- a/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="TripBills" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b63eddc4-7326-45c4-99b4-fc35d6e98179">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<property name="ireport.zoom" value="1.4641000000000006"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -19,7 +21,7 @@
 	<title>
 		<band height="23" splitType="Stretch">
 			<staticText>
-				<reportElement x="203" y="0" width="237" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
+				<reportElement x="0" y="0" width="552" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
 				<textElement textAlignment="Center">
 					<font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
 				</textElement>
diff --git a/src/main/webapp/main/trips/bill/tripBillGridInt.zul b/src/main/webapp/main/trips/bill/tripBillGridInt.zul
index af96a821..320691f2 100644
--- a/src/main/webapp/main/trips/bill/tripBillGridInt.zul
+++ b/src/main/webapp/main/trips/bill/tripBillGridInt.zul
@@ -247,7 +247,7 @@
 					<listcell label="@load(each.bill.total) @converter(vm.standardBigDecimalConverter)"/>
 					<listcell label="@load(each.bill.ownedBy)"/>
 					<listcell label="@load(each.bill.ownedBy ne each.bill.requirement.ownedBy) @converter(vm.standardBoolConverter)"/>
-					<listcell label="@load(each.lastApproveDate) @converter('formatedDate', format=labels.DateFormat)"/>
+					<listcell label="@load(each.approveDate) @converter('formatedDate', format=labels.DateFormat)"/>
 					<listcell label="@load(each.bill.paid) @converter(vm.standardBoolConverter)"/>
 					<listcell label="@load(each.bill.paidDate) @converter('formatedDate', format=labels.DateFormat)"/>
 				</listitem>