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 00000000..b58fe220 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripBill.jasper differ 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 00000000..2683be74 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper differ 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 00000000..a5f52472 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripBillItems.jasper differ 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