diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java index a26cf875..875514c2 100644 --- a/src/main/java/info/bukova/isspst/Constants.java +++ b/src/main/java/info/bukova/isspst/Constants.java @@ -123,7 +123,8 @@ public class Constants { 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("Vyúčtování", "tripBill", false, true)), - new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", true, true)) + new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", true, true)), + new ReportMapping(MOD_REQUIREMENTS, new Report("Požadavky", "requirements")) }; public final static String REQTYPE_ORDER = "ORDER"; diff --git a/src/main/java/info/bukova/isspst/data/RequirementBase.java b/src/main/java/info/bukova/isspst/data/RequirementBase.java index 14b4309c..a9a549a3 100644 --- a/src/main/java/info/bukova/isspst/data/RequirementBase.java +++ b/src/main/java/info/bukova/isspst/data/RequirementBase.java @@ -126,5 +126,21 @@ public class RequirementBase extends BaseData implements FilterableRequirement { public void setWorkflow(List workflow) { this.workflow = workflow; } + + public User getLastApprover() { + if (authorization.isEmpty()) { + return null; + } + + return authorization.get(authorization.size() - 1).getApprover(); + } + + public Date getLastApproveDate() { + if (authorization.isEmpty()) { + return null; + } + + return authorization.get(authorization.size() - 1).getAuthDate(); + } } diff --git a/src/main/webapp/WEB-INF/reports/requirementItems.jasper b/src/main/webapp/WEB-INF/reports/requirementItems.jasper new file mode 100644 index 00000000..37a6e2f6 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/requirementItems.jasper differ diff --git a/src/main/webapp/WEB-INF/reports/requirementItems.jrxml b/src/main/webapp/WEB-INF/reports/requirementItems.jrxml new file mode 100644 index 00000000..58ca3f90 --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/requirementItems.jrxml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/reports/requirements.jasper b/src/main/webapp/WEB-INF/reports/requirements.jasper new file mode 100644 index 00000000..42bc2872 Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/requirements.jasper differ diff --git a/src/main/webapp/WEB-INF/reports/requirements.jrxml b/src/main/webapp/WEB-INF/reports/requirements.jrxml new file mode 100644 index 00000000..41e1ff43 --- /dev/null +++ b/src/main/webapp/WEB-INF/reports/requirements.jrxml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="24" splitType="Stretch"> + <staticText> + <reportElement uuid="564e6b0f-e303-4761-b178-228b1852bf94" x="0" y="0" width="802" height="20"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/> + </textElement> + <text><![CDATA[Požadavky]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +