From 4e6af2ceed9291fad520bd01fc6f46950aa32eb9 Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Thu, 9 Apr 2015 12:14:37 +0200 Subject: [PATCH] =?UTF-8?q?Upraveny=20data=20a=20raz=C3=ADtka=20na=20sesta?= =?UTF-8?q?v=C3=A1ch=20slu=C5=BEebn=C3=AD=20cesty.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #205 --- .../info/bukova/isspst/data/UsersAddress.java | 23 +++++++++ .../bukova/isspst/reporting/ParamFiller.java | 19 ++++++-- .../webapp/WEB-INF/reports/tripBill.jasper | Bin 51569 -> 54254 bytes .../webapp/WEB-INF/reports/tripBill.jrxml | 44 ++++++++++++++---- .../WEB-INF/reports/tripRequirement.jasper | Bin 57146 -> 56903 bytes .../WEB-INF/reports/tripRequirement.jrxml | 12 +++-- 6 files changed, 80 insertions(+), 18 deletions(-) diff --git a/src/main/java/info/bukova/isspst/data/UsersAddress.java b/src/main/java/info/bukova/isspst/data/UsersAddress.java index d5aeb44b..f3f761ba 100644 --- a/src/main/java/info/bukova/isspst/data/UsersAddress.java +++ b/src/main/java/info/bukova/isspst/data/UsersAddress.java @@ -1,5 +1,10 @@ package info.bukova.isspst.data; +import info.bukova.isspst.StringUtils; + +import java.util.ArrayList; +import java.util.List; + import javax.persistence.Column; import javax.persistence.Embeddable; @@ -47,4 +52,22 @@ public class UsersAddress { this.city = city; } + public String toString() { + List list = new ArrayList(); + list.add(this.street); + list.add(this.houseNumber); + final String s1 = StringUtils.joinNotEmpty(list, " "); + + list.clear(); + list.add(this.zipCode); + list.add(this.city); + final String s2 = StringUtils.joinNotEmpty(list, " "); + + list.clear(); + list.add(s1); + list.add(s2); + final String s = StringUtils.joinNotEmpty(list, ", "); + + return s; + } } diff --git a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java index b1bbddda..24b6e544 100644 --- a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java +++ b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java @@ -48,6 +48,7 @@ public class ParamFiller { if ((definition.getDataSet().get(0) instanceof TripBill) && definition.getReport().isSingleRecord()) { + if (userService.getUserSettings().getSignatureFile() != null && !userService.getUserSettings().getSignatureFile().isEmpty()) { definition.setParam("P_USER_SIGNATURE", storage.serverPath(userService.getUserSettings().getSignatureFile())); @@ -55,17 +56,25 @@ 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()); + + 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); - definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate()); User u = lastAuth.getApprover(); - UserSettingsData approverSettings = userService.getUserSettings(u); - if (approverSettings != null - && approverSettings.getSignatureFile() != null - && !approverSettings.getSignatureFile().isEmpty()) { + 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 c0abfc27c4fb57364b3984184ad61a2cd81744d7..d324b8cdd784c93c9b127615639290ed9af1c9d0 100644 GIT binary patch delta 15469 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 G+W!U5_nlb) delta 13971 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 a&PiKj`h@C)4nBW9ck*R@y7D*Ab^LD)A{ur8 diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jrxml b/src/main/webapp/WEB-INF/reports/tripBill.jrxml index b4c83281..6fb9ddf4 100644 --- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml @@ -2,13 +2,17 @@ - + + + + + @@ -48,11 +52,18 @@ + + + + + + + @@ -166,9 +177,9 @@ tuzemské pracovní cesty]]> - - - + + + @@ -203,14 +214,14 @@ tuzemské pracovní cesty]]> - + - + @@ -225,6 +236,11 @@ tuzemské pracovní cesty]]> + + + + + @@ -254,12 +270,12 @@ tuzemské pracovní cesty]]> - + - + @@ -405,6 +421,18 @@ tuzemské pracovní cesty]]> + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper index 7625b9fc175c53f055fe091d49043f71a685d477..4e5a43a68bb1a304573d104b97c8b5912e144478 100644 GIT binary patch delta 7244 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 G?f-vXRpE#L delta 7535 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 ZGvru|y8>kCq@a6#O&}6R$etgM`a2=Q8qNR! diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml index 4d234455..f8a88eba 100644 --- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml @@ -2,7 +2,7 @@ - +