From c0b4a51c449f4be9763960824e746a50cbf0619f Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Tue, 26 Aug 2014 14:59:54 +0200 Subject: [PATCH] =?UTF-8?q?K=20po=C5=BEadavku=20na=20slu=C5=BEebn=C3=AD=20?= =?UTF-8?q?cestu=20byla=20p=C5=99id=C3=A1na=20mo=C5=BEnost=20"Po=C5=BEadov?= =?UTF-8?q?at=20z=C3=A1lohu".=20Upraven=20v=C3=BDpo=C4=8Det=20vy=C3=BA?= =?UTF-8?q?=C4=8Dtov=C3=A1n=C3=AD-=20ode=C4=8D=C3=ADt=C3=A1=20se=20po?= =?UTF-8?q?=C5=BEadovan=C3=A1=20z=C3=A1loha.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukova/isspst/data/TripRequirement.java | 21 +++++++++++ .../tripbill/TripBillServiceImpl.java | 4 +++ .../webapp/WEB-INF/reports/tripBill.jasper | Bin 38871 -> 39514 bytes .../webapp/WEB-INF/reports/tripBill.jrxml | 14 +++++--- .../WEB-INF/reports/tripRequirement.jasper | Bin 48331 -> 50596 bytes .../WEB-INF/reports/tripRequirement.jrxml | 33 ++++++++++++++---- .../webapp/main/trips/bill/tripBillForm.zul | 12 +++++-- .../trips/requirements/requirementsForm.zul | 33 ++++++++++++------ 8 files changed, 95 insertions(+), 22 deletions(-) diff --git a/src/main/java/info/bukova/isspst/data/TripRequirement.java b/src/main/java/info/bukova/isspst/data/TripRequirement.java index b82db0e7..e180571f 100644 --- a/src/main/java/info/bukova/isspst/data/TripRequirement.java +++ b/src/main/java/info/bukova/isspst/data/TripRequirement.java @@ -1,5 +1,6 @@ package info.bukova.isspst.data; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -35,6 +36,10 @@ public class TripRequirement extends RequirementBase { private List passengers; @Embedded private Vehicle vehicle; + @Column(name = "REQUIRE_DOWN_PAYMENT") + private Boolean requireDownPayment; + @Column(name = "DOWN_PAYMENT", precision = 15, scale = 4) + private BigDecimal downPayment; public TripRequirement() { this.setOwnedBy(new User()); @@ -97,4 +102,20 @@ public class TripRequirement extends RequirementBase { this.vehicle = vehicle; } + public Boolean getRequireDownPayment() { + return requireDownPayment; + } + + public void setRequireDownPayment(Boolean requireDownPayment) { + this.requireDownPayment = requireDownPayment; + } + + public BigDecimal getDownPayment() { + return downPayment; + } + + public void setDownPayment(BigDecimal downPayment) { + this.downPayment = downPayment; + } + } diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java index 91c2e662..1c6bcca2 100644 --- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java @@ -92,6 +92,10 @@ public class TripBillServiceImpl extends AbstractOwnedService implemen calculateItem(item); bill.setTotal(bill.getTotal().add(item.getTotal())); } + + if (bill.getRequirement().getDownPayment() != null) { + bill.setTotal(bill.getTotal().subtract(bill.getRequirement().getDownPayment())); + } } private void calculateItem(TripBillItem item) { diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper index b58fe220183cadf527c7b57fa9c27160551b0db3..ddf3e5131ac9495411de70650e893ae334d321a2 100644 GIT binary patch literal 39514 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 g3LXX)#E>Oem(A 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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 70cb63c0..5c39e24a 100644 --- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml @@ -1,8 +1,8 @@ - - + + @@ -39,6 +39,7 @@ + @@ -328,8 +329,8 @@ tuzemské pracovní cesty]]> - - + + @@ -354,6 +355,11 @@ tuzemské pracovní cesty]]> + + + + + diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper index 6dbf85eb536ff0a0f9025002f9800dfa65f3d763..2362b89f77e6da7b15c2dbf7457272418c2a195f 100644 GIT binary patch delta 10469 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 delta 8885 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 J=;D{7{sWu2sz?9; diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml index 4b1a9ffc..4a5d74e4 100644 --- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml @@ -1,8 +1,8 @@ - + - +