Opraveny datumy na vyúčtování služební cesty.

closes #232

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);
+			if (tb.getApproval() != null) {
-			definition.setParam("P_PREV_APPROVE_DATE", lastButOneAuth.getAuthDate());
+				tripBillApprovalService.loadAuthItems(tb.getApproval());
+			}
 
-			User lastButOneUser = lastButOneAuth.getApprover();
+			if (tb.getApproval() != null && tb.getApproval().getAuthorization() != null && !tb.getApproval().getAuthorization().isEmpty()) {
-			UserSettingsData prevApproverSettings = userService.getUserSettings(lastButOneUser);
 
-			if (prevApproverSettings != null && !StringUtils.isNullOrEmpty(prevApproverSettings.getSignatureFile())) {
+				AuthItem lastButOneAuth = tb.getApproval().getAuthorization().get(0);
-				definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
+				definition.setParam("P_PREV_APPROVE_DATE", lastButOneAuth.getAuthDate());
-			}
+
+				User lastButOneUser = lastButOneAuth.getApprover();
+				UserSettingsData prevApproverSettings = userService.getUserSettings(lastButOneUser);
 
+				if (prevApproverSettings != null && !StringUtils.isNullOrEmpty(prevApproverSettings.getSignatureFile())) {
+					definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
+				}
 
-			AuthItem lastAuth = tb.getRequirement().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
+				AuthItem lastAuth = tb.getApproval().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
-			definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
+				definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
 
-			User u = lastAuth.getApprover();
+				User u = lastAuth.getApprover();
-			UserSettingsData approverSettings = userService.getUserSettings(u);
+				UserSettingsData approverSettings = userService.getUserSettings(u);
 
-			if (approverSettings != null && !StringUtils.isNullOrEmpty(approverSettings.getSignatureFile())) {
+				if (approverSettings != null && !StringUtils.isNullOrEmpty(approverSettings.getSignatureFile())) {
-				definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+					definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+				}
 			}
 		}
 		

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>