From 3b3e4b38e6a6dffd3805668c85d13a0224f9d715 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sun, 14 Jun 2015 20:45:36 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Vy=C3=BA=C4=8Dtov=C3=A1n=C3=AD=20slu=C5=BEe?=
 =?UTF-8?q?bn=C3=AD=20cesty=20nelze=20odeslat=20ke=20schv=C3=A1len=C3=AD,?=
 =?UTF-8?q?=20pokud=20nejsou=20vypln=C4=9Bn=C3=A9=20=C4=8Dasy=20odjezdu=20?=
 =?UTF-8?q?a=20p=C5=99=C3=ADjezdu.=20closes=20#230?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isspst/ui/tripbill/TripBillForm.java      | 25 ++++++++++++++++---
 .../WEB-INF/locales/zk-label.properties       |  2 ++
 src/main/webapp/settings/global/email.zul     |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java
index 286269a6..1f2cfdbe 100644
--- a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java
+++ b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java
@@ -3,6 +3,7 @@ package info.bukova.isspst.ui.tripbill;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripBillApproval;
+import info.bukova.isspst.data.TripBillItem;
 import info.bukova.isspst.data.Vehicle;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.services.tripbill.TripBillApprovalService;
@@ -66,9 +67,7 @@ public class TripBillForm extends FormWithUpload<TripBill> {
 	@NotifyChange("errMessages")
 	public void saveForApproval(@BindingParam("window") Window win)
 	{
-		if (StringUtils.isNullOrTrimmedEmpty(this.getDataBean().getResultMessage()))
-		{
-			Messagebox.show(StringUtils.localize("ErrFillTripBillResultMessageText"), StringUtils.localize("Error"), Messagebox.OK, Messagebox.ERROR);
+		if (!canSaveForApproval()) {
 			return;
 		}
 
@@ -94,6 +93,26 @@ public class TripBillForm extends FormWithUpload<TripBill> {
 
 	}
 
+	private boolean canSaveForApproval() {
+		if (StringUtils.isNullOrTrimmedEmpty(this.getDataBean().getResultMessage())) {
+			Messagebox.show(StringUtils.localize("ErrFillTripBillResultMessageText"), StringUtils.localize("Error"), Messagebox.OK, Messagebox.ERROR);
+			return false;
+		}
+
+		if (getDataBean().getBillItems() != null && !getDataBean().getBillItems().isEmpty()) {
+			TripBillItem first = getDataBean().getBillItems().get(0);
+			TripBillItem last = getDataBean().getBillItems().get(getDataBean().getBillItems().size() - 1);
+
+			if (first.getToArrival() == null || first.getToDeparture() == null
+					|| last.getBackArrival() == null || last.getBackDeparture() == null) {
+				Messagebox.show(StringUtils.localize("ErrFillTripBillResultTimes"), StringUtils.localize("Error"), Messagebox.OK, Messagebox.ERROR);
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	@Override
 	protected void doSave() {
 		maintainAttachment();
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index a6754a1e..eaed015c 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -167,6 +167,7 @@ EMails=E-maily
 NewRequirement=Nový požadavek
 AuthRequirement=Dílčí schválení
 ConfirmRequirement=Schválení
+ConfirmTripPassengers=Schválení SC - spolucestující
 InsertField=Vložit pole
 EnableRequirements=Povolit zadávání požadavků
 ShippingAddresses=Dodací adresy:
@@ -403,3 +404,4 @@ TransportMode = Způsob dopravy
 ForeignPersons = Cizí osoby
 TripBillResultMessageText = Zpráva z pracovní cesty
 ErrFillTripBillResultMessageText = Vyplňte zprávu z pracovní cesty.
+ErrFillTripBillResultTimes = Zadejte časy odjezdu a příjezdu.
diff --git a/src/main/webapp/settings/global/email.zul b/src/main/webapp/settings/global/email.zul
index e8ac7caf..73c2afed 100644
--- a/src/main/webapp/settings/global/email.zul
+++ b/src/main/webapp/settings/global/email.zul
@@ -7,7 +7,7 @@
 						<tab label="${labels.NewRequirement}"/>
 						<tab label="${labels.AuthRequirement}"/>
 						<tab label="${labels.ConfirmRequirement}"/>
-						<tab label="Scvaleni SC - spolucestujici"/>
+						<tab label="${labels.ConfirmTripPassengers}"/>
 					</tabs>
 					<tabpanels>
 						<tabpanel>

From 4d74b0a3fe9c0879ff66347415e051e07c9407ba Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 15 Jun 2015 21:17:17 +0200
Subject: [PATCH 2/4] =?UTF-8?q?Opraven=20binding=20formul=C3=A1=C5=99e=20v?=
 =?UTF-8?q?y=C3=BA=C4=8Dtov=C3=A1n=C3=AD=20slu=C5=BEebn=C3=AD=20cesty.=20c?=
 =?UTF-8?q?loses=20#231?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/main/trips/tripBillInterior.zul | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/main/trips/tripBillInterior.zul b/src/main/webapp/main/trips/tripBillInterior.zul
index 676747a0..f9d29037 100644
--- a/src/main/webapp/main/trips/tripBillInterior.zul
+++ b/src/main/webapp/main/trips/tripBillInterior.zul
@@ -341,13 +341,13 @@
 					<vbox hflex="max">
 						<textbox
 							inplace="true"
-							value="@load(each.to)"
+							value="@bind(each.to)"
 							maxlength="@load(vm.lengthText)"
 							sclass="grid-textbox-max-left"
 							readonly="@load(vm.billDisabled or disabled)" />
 						<textbox
 							inplace="true"
-							value="@load(each.back)"
+							value="@bind(each.back)"
 							maxlength="@load(vm.lengthText)"
 							sclass="grid-textbox-max-left"
 							readonly="@load(vm.billDisabled or disabled)" />

From dc0607c072ea2ceb9d7c5be5ea67eb9b7baa7c5e Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sat, 20 Jun 2015 23:49:49 +0200
Subject: [PATCH 3/4] =?UTF-8?q?Vytvo=C5=99en=C3=ADm=20po=C5=BEadavku=20na?=
 =?UTF-8?q?=20slu=C5=BEebn=C3=AD=20cestu=20se=20ode=C5=A1le=20e-mail=20spo?=
 =?UTF-8?q?lucestuj=C3=ADc=C3=ADm.=20closes=20#235?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/bukova/isspst/data/SettingsData.java | 10 ++++++
 .../TripRequirementServiceImpl.java           | 22 +++++++++----
 .../WEB-INF/locales/zk-label.properties       |  1 +
 src/main/webapp/settings/global/email.zul     | 31 +++++++++++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/data/SettingsData.java b/src/main/java/info/bukova/isspst/data/SettingsData.java
index b068c08b..9272a483 100644
--- a/src/main/java/info/bukova/isspst/data/SettingsData.java
+++ b/src/main/java/info/bukova/isspst/data/SettingsData.java
@@ -15,6 +15,7 @@ public class SettingsData {
 	private MailMessage authReqTemplate;
 	private MailMessage confReqTemplate;
 	private MailMessage confReqTripPassenger;
+	private MailMessage reqPassenger;
 	private Address mainAddress;
 	private List<Address> shippingAddrs;
 	private String bankName;
@@ -30,6 +31,7 @@ public class SettingsData {
 		authReqTemplate = new MailMessage();
 		confReqTemplate = new MailMessage();
 		confReqTripPassenger = new MailMessage();
+		reqPassenger = new MailMessage();
 		mainAddress = new Address();
 		shippingAddrs = new ArrayList<Address>();
 		vehicles = new ArrayList<Vehicle>();
@@ -160,4 +162,12 @@ public class SettingsData {
 	public void setConfReqTripPassenger(MailMessage confReqTripPassenger) {
 		this.confReqTripPassenger = confReqTripPassenger;
 	}
+
+	public MailMessage getReqPassenger() {
+		return reqPassenger;
+	}
+
+	public void setReqPassenger(MailMessage reqPassenger) {
+		this.reqPassenger = reqPassenger;
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
index 0a2c823c..52f7e8da 100644
--- a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
@@ -77,6 +77,21 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 		}
 	}
 
+	@Override
+	protected void postAdd(TripRequirement entity) {
+		super.postAdd(entity);
+		sendMailToPassengers(entity, settingsService.getSettings().getReqPassenger());
+	}
+
+	private void sendMailToPassengers(TripRequirement entity, MailMessage messageTemplate) {
+		if (entity.getBillForPassengers() != null && !entity.getPassengers().isEmpty() && messageTemplate != null) {
+			MailMessage message = messageBuilder.buildMessage(messageTemplate, entity);
+			message.setFrom(userService.getCurrent().getEmail());
+			message.setTo(userService.getEmailsForSend(entity.getPassengers()));
+			mailer.send(message);
+		}
+	}
+
 	@Override
 	@Transactional
 	@LazyLoader("form")
@@ -142,12 +157,7 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 					}
 				}
 
-				if (!entity.getPassengers().isEmpty() && settingsService.getSettings().getConfReqTripPassenger() != null) {
-					MailMessage message = messageBuilder.buildMessage(settingsService.getSettings().getConfReqTripPassenger(), entity);
-					message.setFrom(userService.getCurrent().getEmail());
-					message.setTo(userService.getEmailsForSend(entity.getPassengers()));
-					mailer.send(message);
-				}
+				sendMailToPassengers(entity, settingsService.getSettings().getConfReqTripPassenger());
 			}
 		}
 	}
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index eaed015c..6d8ec59e 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -168,6 +168,7 @@ NewRequirement=Nový požadavek
 AuthRequirement=Dílčí schválení
 ConfirmRequirement=Schválení
 ConfirmTripPassengers=Schválení SC - spolucestující
+ReqTripPassengers=SC - spolucestujici
 InsertField=Vložit pole
 EnableRequirements=Povolit zadávání požadavků
 ShippingAddresses=Dodací adresy:
diff --git a/src/main/webapp/settings/global/email.zul b/src/main/webapp/settings/global/email.zul
index 73c2afed..4bfc4e4d 100644
--- a/src/main/webapp/settings/global/email.zul
+++ b/src/main/webapp/settings/global/email.zul
@@ -7,6 +7,7 @@
 						<tab label="${labels.NewRequirement}"/>
 						<tab label="${labels.AuthRequirement}"/>
 						<tab label="${labels.ConfirmRequirement}"/>
+						<tab label="${labels.ReqTripPassengers}"/>
 						<tab label="${labels.ConfirmTripPassengers}"/>
 					</tabs>
 					<tabpanels>
@@ -91,6 +92,31 @@
 								</rows>
 							</grid>
 						</tabpanel>
+						<tabpanel>
+							<grid>
+								<columns>
+									<column hflex="min"/>
+									<column/>
+								</columns>
+								<rows>
+									<row>
+										<label value="${labels.MailSubject}" />
+										<textbox
+												value="@bind(vm.settings.reqPassenger.subject)"
+												width="100%"
+												maxlength="@load(vm.lengthText)"
+												readonly="@load(not vm.canSave)" />
+									</row>
+									<row spans="2">
+										<vbox>
+											<ckeditor toolbar="Basic" value="@bind(vm.settings.reqPassenger.text)" width="460px" height="180px" if="${vm.canSave}" />
+											<html content="@load(vm.settings.confReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
+											<button label="${labels.InsertField}" popup="fieldsPassenger, position=after_start" disabled="@load(not vm.canSave)"/>
+										</vbox>
+									</row>
+								</rows>
+							</grid>
+						</tabpanel>
 						<tabpanel>
 							<grid>
 								<columns>
@@ -138,4 +164,9 @@
 						<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.confReqTripPassenger)"/>
 					</template>
 				</menupopup>
+				<menupopup id="fieldsPassenger" children="@load(vm.requirementFields)">
+					<template name="children">
+						<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.reqPassenger)"/>
+					</template>
+				</menupopup>
 </zk>
\ No newline at end of file

From b0fedfa3f3640aec45d305c5f665d5a1e34a12b5 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sun, 21 Jun 2015 00:31:33 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Opraveny=20datumy=20na=20vy=C3=BA=C4=8Dtov?=
 =?UTF-8?q?=C3=A1n=C3=AD=20slu=C5=BEebn=C3=AD=20cesty.=20closes=20#232?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bukova/isspst/reporting/ParamFiller.java  |  45 ++++++++++--------
 .../webapp/WEB-INF/reports/tripBill.jasper    | Bin 54342 -> 55261 bytes
 .../webapp/WEB-INF/reports/tripBill.jrxml     |  16 ++++++-
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
index 24b6e544..41aec3b7 100644
--- a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
+++ b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
@@ -1,5 +1,6 @@
 package info.bukova.isspst.reporting;
 
+import com.mysql.jdbc.StringUtils;
 import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.AuthItem;
 import info.bukova.isspst.data.Order;
@@ -8,16 +9,14 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.UserSettingsData;
 import info.bukova.isspst.services.requirement.TripRequirementService;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
+import info.bukova.isspst.services.tripbill.TripBillApprovalService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.storage.FileStorage;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.mysql.jdbc.StringUtils;
-
 public class ParamFiller {
 	
 	@Autowired
@@ -30,6 +29,8 @@ public class ParamFiller {
 	private TripRequirementService tripReqService;
 	@Autowired
 	private GlobalSettingsService settingService;
+	@Autowired
+	private TripBillApprovalService tripBillApprovalService;
 	
 	public void fill() {
 		if (definition.getDataSet() == null || definition.getDataSet().isEmpty()) {
@@ -57,25 +58,31 @@ public class ParamFiller {
 			TripBill tb = (TripBill)definition.getDataSet().get(0);
 			tripReqService.loadAuthItems(tb.getRequirement());
 
-			AuthItem lastButOneAuth = tb.getRequirement().getAuthorization().get(0);
-			definition.setParam("P_PREV_APPROVE_DATE", lastButOneAuth.getAuthDate());
+			if (tb.getApproval() != null) {
+				tripBillApprovalService.loadAuthItems(tb.getApproval());
+			}
 
-			User lastButOneUser = lastButOneAuth.getApprover();
-			UserSettingsData prevApproverSettings = userService.getUserSettings(lastButOneUser);
+			if (tb.getApproval() != null && tb.getApproval().getAuthorization() != null && !tb.getApproval().getAuthorization().isEmpty()) {
 
-			if (prevApproverSettings != null && !StringUtils.isNullOrEmpty(prevApproverSettings.getSignatureFile())) {
-				definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
-			}
+				AuthItem lastButOneAuth = tb.getApproval().getAuthorization().get(0);
+				definition.setParam("P_PREV_APPROVE_DATE", lastButOneAuth.getAuthDate());
 
+				User lastButOneUser = lastButOneAuth.getApprover();
+				UserSettingsData prevApproverSettings = userService.getUserSettings(lastButOneUser);
 
-			AuthItem lastAuth = tb.getRequirement().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
-			definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
-			
-			User u = lastAuth.getApprover();
-			UserSettingsData approverSettings = userService.getUserSettings(u);
-			
-			if (approverSettings != null && !StringUtils.isNullOrEmpty(approverSettings.getSignatureFile())) {
-				definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+				if (prevApproverSettings != null && !StringUtils.isNullOrEmpty(prevApproverSettings.getSignatureFile())) {
+					definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
+				}
+
+				AuthItem lastAuth = tb.getApproval().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
+				definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
+
+				User u = lastAuth.getApprover();
+				UserSettingsData approverSettings = userService.getUserSettings(u);
+
+				if (approverSettings != null && !StringUtils.isNullOrEmpty(approverSettings.getSignatureFile())) {
+					definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+				}
 			}
 		}
 		
diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper
index 2d1911c6815ad5018c594b7f9a72d310e387d7fc..11f966a10d864a154cd14e100cca8e456686346d 100644
GIT binary patch
delta 4305
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

delta 3637
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

diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jrxml b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
index 6fb9ddf4..c51d0ef8 100644
--- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
@@ -2,7 +2,7 @@
 <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="tripBill" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="10" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="378"/>
+	<property name="ireport.y" value="511"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
 	</parameter>
@@ -571,6 +571,20 @@ tuzemské pracovní cesty]]></text>
 			<line>
 				<reportElement uuid="5e5a7c99-962e-4c99-b3ba-dbed5315f5aa" x="-1" y="-2" width="1" height="195"/>
 			</line>
+			<textField pattern="dd. MM. yyyy">
+				<reportElement uuid="7bbd89ae-f9e7-4359-b2df-5020b7a57456" x="292" y="135" width="100" height="13"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{P_APPROVE_DATE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd. MM. yyyy">
+				<reportElement uuid="8f8ad8d2-dc49-46cc-8732-914951931569" x="440" y="135" width="100" height="15"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{P_PREV_APPROVE_DATE}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>