diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java index 80e295e2..c32d04da 100644 --- a/src/main/java/info/bukova/isspst/Constants.java +++ b/src/main/java/info/bukova/isspst/Constants.java @@ -156,6 +156,9 @@ public class Constants { new ReportMapping(MOD_TRIPREQUIREMENTS, new Report(10, true, "Přehled o protokolech předběžné kontroly", "tripRequirementProtocol")) }; + public final static long TRIB_BILLS_REP_ID = 100; + public final static long TRIB_BILLS_NP_REP_ID = 101; + // pokud je v agnde vic nez jedena podepisovaci sestava, musi se definovat ktera sestava nalezi jake entite public final static Map, Integer> SIGN_REPORT_MAP = Collections.unmodifiableMap(new HashMap, Integer>() {{ put(TripBillApproval.class, 4); diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java index 18e29174..0f0631fc 100644 --- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java @@ -8,6 +8,7 @@ import info.bukova.isspst.data.DataModel; import info.bukova.isspst.data.RequirementState; import info.bukova.isspst.data.TripBill; import info.bukova.isspst.data.TripBillApproval; +import info.bukova.isspst.reporting.Report; import info.bukova.isspst.services.IsspstException; import info.bukova.isspst.services.requirement.RequirementBaseServiceImpl; import info.bukova.isspst.services.requirement.RequirementTypeService; @@ -20,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @author Pepa Rokos @@ -121,4 +124,14 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl getReports() { + List reports = new ArrayList(); + + reports.add(new Report(Constants.TRIB_BILLS_REP_ID, false, "Přehled vyúčtovaných CP", "tripBills")); + reports.add(new Report(Constants.TRIB_BILLS_NP_REP_ID, false, "Přehled nevyúčtovaných CP", "tripBillsNP")); + + return reports; + } } diff --git a/src/main/webapp/WEB-INF/reports/tripBills.jasper b/src/main/webapp/WEB-INF/reports/tripBills.jasper new file mode 100644 index 00000000..2497cc65 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripBills.jasper differ diff --git a/src/main/webapp/WEB-INF/reports/tripBills.jrxml b/src/main/webapp/WEB-INF/reports/tripBills.jrxml new file mode 100644 index 00000000..0a9517dc --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/tripBills.jrxml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + <band height="23" splitType="Stretch"> + <staticText> + <reportElement x="203" y="0" width="212" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/> + <textElement textAlignment="Center"> + <font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/> + </textElement> + <text><![CDATA[Přehled vyúčtovaných CP]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/reports/tripBillsNP.jasper b/src/main/webapp/WEB-INF/reports/tripBillsNP.jasper new file mode 100644 index 00000000..a58c2c5d Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripBillsNP.jasper differ diff --git a/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml b/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml new file mode 100644 index 00000000..0265782c --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/tripBillsNP.jrxml @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + <band height="23" splitType="Stretch"> + <staticText> + <reportElement x="203" y="0" width="237" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/> + <textElement textAlignment="Center"> + <font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/> + </textElement> + <text><![CDATA[Přehled nevyúčtovaných CP]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +