From ecd065eb514450cb90f660bb48cd9de4f8823ea2 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Sun, 24 Aug 2014 09:55:59 +0200 Subject: [PATCH 1/2] =?UTF-8?q?P=C5=99id=C3=A1na=20sestava=20vy=C3=BA?= =?UTF-8?q?=C4=8Dtov=C3=A1n=C3=AD=20slu=C5=BEebn=C3=AD=20cesty.=20closes?= =?UTF-8?q?=20#122?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/info/bukova/isspst/Constants.java | 3 +- .../webapp/WEB-INF/reports/tripBill.jasper | Bin 0 -> 38871 bytes .../webapp/WEB-INF/reports/tripBill.jrxml | 359 +++++++++++ .../WEB-INF/reports/tripBillFreeMeals.jasper | Bin 0 -> 18022 bytes .../WEB-INF/reports/tripBillFreeMeals.jrxml | 36 ++ .../WEB-INF/reports/tripBillItems.jasper | Bin 0 -> 47113 bytes .../WEB-INF/reports/tripBillItems.jrxml | 593 ++++++++++++++++++ src/main/webapp/app/template.zhtml | 2 +- 8 files changed, 991 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/WEB-INF/reports/tripBill.jasper create mode 100644 src/main/webapp/WEB-INF/reports/tripBill.jrxml create mode 100644 src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper create mode 100644 src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jrxml create mode 100644 src/main/webapp/WEB-INF/reports/tripBillItems.jasper create mode 100644 src/main/webapp/WEB-INF/reports/tripBillItems.jrxml diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java index 78ec2a99..92e28a19 100644 --- a/src/main/java/info/bukova/isspst/Constants.java +++ b/src/main/java/info/bukova/isspst/Constants.java @@ -95,7 +95,8 @@ public class Constants { public final static ReportMapping REPORTS[] = { new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresní karty", "address")), new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresa", "address", false, true)), - new ReportMapping(MOD_TRIPBILL, new Report("Žádost", "tripRequirement", false, true)) + new ReportMapping(MOD_TRIPBILL, new Report("Žádost", "tripRequirement", false, true)), + new ReportMapping(MOD_TRIPBILL, new Report("Vyúčtování", "tripBill", false, true)) }; public final static String REQTYPE_ORDER = "ORDER"; diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper new file mode 100644 index 0000000000000000000000000000000000000000..b58fe220183cadf527c7b57fa9c27160551b0db3 GIT binary patch literal 38871 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jrxml b/src/main/webapp/WEB-INF/reports/tripBill.jrxml new file mode 100644 index 00000000..70cb63c0 --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper b/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper new file mode 100644 index 0000000000000000000000000000000000000000..2683be74911323ee0eaf7526ed26380dce7d7673 GIT binary patch literal 18022 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 PlSG?BFq2oQF7y8Z=Qx-% literal 0 HcmV?d00001 diff --git a/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jrxml b/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jrxml new file mode 100644 index 00000000..e433d924 --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jrxml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/reports/tripBillItems.jasper b/src/main/webapp/WEB-INF/reports/tripBillItems.jasper new file mode 100644 index 0000000000000000000000000000000000000000..a5f52472cfa7ebc98cade4fe26cd7f2d3104356e GIT binary patch literal 47113 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/WEB-INF/reports/tripBillItems.jrxml b/src/main/webapp/WEB-INF/reports/tripBillItems.jrxml new file mode 100644 index 00000000..dd856994 --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/tripBillItems.jrxml @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml index 007390a8..af89128c 100644 --- a/src/main/webapp/app/template.zhtml +++ b/src/main/webapp/app/template.zhtml @@ -52,7 +52,7 @@ \ No newline at end of file From 882e2d71c82a70bfe664e355d77458687aa4b431 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Sun, 24 Aug 2014 11:09:47 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Refactor=20v=C3=BDpo=C4=8Dtu=20vy=C3=BA?= =?UTF-8?q?=C4=8Dtov=C3=A1n=C3=AD=20slu=C5=BEebn=C3=AD=20cesty.=20closes?= =?UTF-8?q?=20#126?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++ .../tripbill/TripBillServiceImpl.java | 62 ++++++++----------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 43dde998..215a470a 100644 --- a/pom.xml +++ b/pom.xml @@ -326,6 +326,13 @@ mail 1.4.3 + + + + joda-time + joda-time + 2.4 + 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 2e9f171d..91c2e662 100644 --- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java @@ -12,12 +12,14 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; import org.hibernate.LazyInitializationException; import org.hibernate.Query; +import org.joda.time.DateTime; +import org.joda.time.Days; +import org.joda.time.Hours; +import org.joda.time.LocalTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -33,7 +35,9 @@ public class TripBillServiceImpl extends AbstractOwnedService implemen TripBill bill = new TripBill(); bill.setRequirement(requirement); - long daysCount = TimeUnit.DAYS.convert(requirement.getEndDate().getTime() - requirement.getTripDate().getTime(), TimeUnit.MILLISECONDS) + 1; + + int daysCount = Days.daysBetween((new DateTime(requirement.getTripDate())).withTimeAtStartOfDay(), + (new DateTime(requirement.getEndDate())).withTimeAtStartOfDay()).getDays() + 1; for (int i = 0 ; i < daysCount ; i++) { TripBillItem item = new TripBillItem(); @@ -91,49 +95,35 @@ public class TripBillServiceImpl extends AbstractOwnedService implemen } private void calculateItem(TripBillItem item) { - Calendar cal = Calendar.getInstance(); - Date to = item.getToArrival(); - - if (to == null) { - to = new Date(); - cal.setTime(to); - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.MINUTE, 0); + LocalTime timeTo; + LocalTime timeBack; + boolean allDay = false; + + if (item.getToArrival() == null) { + timeTo = (new LocalTime()).withHourOfDay(0).withMinuteOfHour(0); } else { - cal.setTime(to); + timeTo = new LocalTime(item.getToArrival()); } - - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 1); - cal.set(Calendar.YEAR, 2000); - - to.setTime(cal.getTimeInMillis()); - - Date back = item.getBackDeparture(); - if (back == null) { - back = new Date(to.getTime()); - } - - cal.setTime(back); - - if (back.equals(to)) { - cal.set(Calendar.HOUR_OF_DAY, 23); - cal.set(Calendar.MINUTE, 59); + if (item.getBackDeparture() == null) { + timeBack = (new LocalTime()).withHourOfDay(23).withMinuteOfHour(59); + allDay = true; + } else { + timeBack = new LocalTime(item.getBackDeparture()); } - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 1); - cal.set(Calendar.YEAR, 2000); - back.setTime(cal.getTimeInMillis()); - - if (to.getTime() > back.getTime()) { + if (timeTo.isAfter(timeBack)) { item.setTotal(BigDecimal.ZERO); return; } SettingsData settings = globalSettings.getSettings(); - long hours = TimeUnit.HOURS.convert(back.getTime() - to.getTime(), TimeUnit.MILLISECONDS); + int hours = Hours.hoursBetween(timeTo, timeBack).getHours(); + + if (allDay) { + ++hours; + } + int refundHour = 0; List refundHours = new ArrayList(settings.getRefunds().keySet()); Collections.sort(refundHours);