diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml index 323e2b6ce..f5b4f4297 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml @@ -4,6 +4,8 @@ + + @@ -16,7 +18,7 @@ - <band height="167" splitType="Stretch"> + <band height="203" splitType="Stretch"> <textField> <reportElement x="0" y="13" width="263" height="33"/> <textElement verticalAlignment="Middle" markup="none"> @@ -52,10 +54,10 @@ <textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression> </textField> <rectangle> - <reportElement mode="Opaque" x="24" y="137" width="473" height="15" forecolor="#000000" backcolor="#E0E4FB"/> + <reportElement mode="Opaque" x="24" y="173" width="473" height="15" forecolor="#000000" backcolor="#E0E4FB"/> </rectangle> <textField> - <reportElement x="252" y="137" width="122" height="15"/> + <reportElement x="252" y="173" width="122" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -69,7 +71,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression> </textField> <textField> - <reportElement x="374" y="137" width="122" height="15"/> + <reportElement x="374" y="173" width="122" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -83,7 +85,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression> </textField> <textField> - <reportElement mode="Opaque" x="252" y="152" width="57" height="15"/> + <reportElement mode="Opaque" x="252" y="188" width="57" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -97,7 +99,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression> </textField> <textField> - <reportElement x="309" y="152" width="65" height="15"/> + <reportElement x="309" y="188" width="65" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -111,7 +113,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression> </textField> <textField> - <reportElement x="374" y="152" width="57" height="15"/> + <reportElement x="374" y="188" width="57" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -125,7 +127,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression> </textField> <textField> - <reportElement x="431" y="152" width="65" height="15"/> + <reportElement x="431" y="188" width="65" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -139,7 +141,7 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression> </textField> <textField> - <reportElement x="24" y="152" width="228" height="15"/> + <reportElement x="24" y="188" width="228" height="15"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -166,6 +168,42 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression> </textField> + <textField> + <reportElement x="1" y="112" width="60" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="132" width="489" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{labels}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="112" width="488" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{criteria}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1" y="132" width="60" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{labels}]]></textFieldExpression> + </textField> </band> diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties index 03edec5db..733943e41 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties @@ -3,6 +3,8 @@ title = Hours Report subtitle = Completed estimated hours order = Project : reference = Reference date : +criteria = Criteria : +labels = Labels : headers.column1 = Name headers.column2 = Total hours headers.column2.column1 = Estimated diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties index 03edec5db..733943e41 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties @@ -3,6 +3,8 @@ title = Hours Report subtitle = Completed estimated hours order = Project : reference = Reference date : +criteria = Criteria : +labels = Labels : headers.column1 = Name headers.column2 = Total hours headers.column2.column1 = Estimated diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties index 56402ea94..1ce3e11de 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties @@ -3,6 +3,8 @@ title = Informe de Horas subtitle = Horas estimadas completas order = Proyecto : reference = Fecha de referencia : +criteria = Criterios : +labels = Etiquetas : headers.column1 = Nombre headers.column2 = Horas Totales headers.column2.column1 = Estimadas diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties index c02078da8..a507bab8c 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties @@ -3,6 +3,8 @@ title = Informe de Horas subtitle = Horas estimadas completas order = Proxecto : reference = Data de referencia : +criteria = Criterios : +labels = Etiquetas : headers.column1 = Nome headers.column2 = Horas Totais headers.column2.column1 = Estimadas diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml index f500affba..8817a37cd 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml @@ -5,6 +5,8 @@ + + @@ -184,7 +186,7 @@ - <band height="118" splitType="Stretch"> + <band height="160" splitType="Stretch"> <textField> <reportElement x="0" y="13" width="263" height="33"/> <textElement verticalAlignment="Middle" markup="none"> @@ -236,7 +238,7 @@ <textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression> </textField> <textField> - <reportElement x="13" y="102" width="540" height="15"> + <reportElement x="13" y="144" width="540" height="15"> <printWhenExpression><![CDATA[$P{showNote}.equals( java.lang.Boolean.TRUE )]]></printWhenExpression> </reportElement> <textElement markup="none"> @@ -245,12 +247,44 @@ <textFieldExpression class="java.lang.String"><![CDATA[$R{note1}]]></textFieldExpression> </textField> <staticText> - <reportElement x="5" y="102" width="8" height="15"> + <reportElement x="5" y="144" width="8" height="15"> <printWhenExpression><![CDATA[$P{showNote}.equals( java.lang.Boolean.TRUE )]]></printWhenExpression> </reportElement> <textElement/> <text><![CDATA[*]]></text> </staticText> + <textField> + <reportElement x="0" y="98" width="57" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{criteria}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="118" width="57" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{labels}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="57" y="98" width="494" height="20"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="57" y="118" width="494" height="20"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{labels}]]></textFieldExpression> + </textField> </band> diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties index b170bb000..0aabd0bac 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties @@ -3,6 +3,8 @@ title = Work report subtitle = Worked hours per worker date.start = Starting date : date.end = Ending date : +criteria = Criteria : +labels = Labels : headers.column1 = Hours start headers.column2 = Hours end headers.column3 = Hours diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties index c52ec805d..ef3385f24 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties @@ -3,6 +3,8 @@ title = Work report subtitle = Worked hours per worker date.start = Starting date: date.end = Ending date: +criteria = Criteria : +labels = Labels : headers.column1 = Hours start headers.column2 = Hours end headers.column3 = Hours diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties index a143a9aea..f41a597ac 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties @@ -3,6 +3,8 @@ title = Informe de Trabajo subtitle = Horas trabajadas por empleado date.start = Fecha de inicio: date.end = Fecha de fin: +criteria = Criterios : +labels = Etiquetas : headers.column1 = Horas inicio headers.column2 = Horas fin headers.column3 = Horas diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties index a1d16924c..e5296a410 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties @@ -3,6 +3,8 @@ title = Informe de Traballo subtitle = Horas traballadas por empregado date.start = Data de inicio: date.end = Data de fin: +criteria = Criterios : +labels = Etiquetas : headers.column1 = Horas inicio headers.column2 = Horas fin headers.column3 = Horas diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml index 103a612fb..962383e1c 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml @@ -5,6 +5,8 @@ + + @@ -296,7 +298,7 @@ - <band height="98" splitType="Stretch"> + <band height="126" splitType="Stretch"> <textField> <reportElement x="0" y="13" width="316" height="33"/> <textElement verticalAlignment="Middle" markup="none"> @@ -347,6 +349,38 @@ </textElement> <textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression> </textField> + <textField isBlankWhenNull="false"> + <reportElement x="2" y="92" width="60" height="15"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="false"> + <reportElement x="2" y="107" width="60" height="15"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{labels}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement x="62" y="92" width="480" height="15"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{criteria}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement x="62" y="107" width="480" height="15"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{labels}]]></textFieldExpression> + </textField> </band> diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties index 152b36cdc..3cb27315f 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties @@ -3,6 +3,8 @@ title = Project report subtitle = Costs by Resource date.start = Starting date: date.end = Ending date: +criteria = Criteria : +labels = Labels : headers.column1 = Type of hours headers.column2 = Date headers.column3 = Salary diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties index b40f43eaf..58467adeb 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties @@ -3,6 +3,8 @@ title = Project report subtitle = Costs by Resource date.start = Starting date: date.end = Ending date: +criteria = Criteria : +labels = Labels : headers.column1 = Type of hours headers.column2 = Date headers.column3 = Salary diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties index 28fb2e2dd..c3c8e73fa 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties @@ -3,6 +3,8 @@ title = Informe del proyecto subtitle = Costes por recurso date.start = Fecha de inicio: date.end = Fecha de fin: +criteria = Criterios: +labels = Etiquetas : headers.column1 = Tipo de horas headers.column2 = Fecha headers.column3 = Salario diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties index e9af3ed38..cdb6819b7 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties @@ -3,6 +3,8 @@ title = Informe do proxecto subtitle = Custos por recurso date.start = Data de inicio: date.end = Data de fin: +criteria = Criterios: +labels = Etiquetas : headers.column1 = Tipo de horas headers.column2 = Data headers.column3 = Salario diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml index 9bc7ff96f..5415f9887 100644 --- a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml @@ -41,7 +41,7 @@ - <band height="176" splitType="Stretch"> + <band height="159" splitType="Stretch"> <image scaleImage="RealHeight"> <reportElement x="316" y="3" width="180" height="53"/> <imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression> diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml index 73f3c18ab..44c07b5ce 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml @@ -4,6 +4,8 @@ <parameter name="orderName" class="java.lang.String"/> <parameter name="taskStatus" class="java.lang.String"/> <parameter name="logo" class="java.lang.String"/> + <parameter name="criteria" class="java.lang.String"/> + <parameter name="labels" class="java.lang.String"/> <field name="orderCode" class="java.lang.String"/> <field name="orderName" class="java.lang.String"/> <field name="estimatedStartingDate" class="java.util.Date"/> @@ -408,7 +410,7 @@ <band splitType="Stretch"/> </background> <title> - <band height="124" splitType="Stretch"> + <band height="162" splitType="Stretch"> <textField> <reportElement x="0" y="13" width="263" height="33"/> <textElement verticalAlignment="Middle" markup="none"> @@ -455,6 +457,38 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{taskStatus}]]></textFieldExpression> </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="113" width="450" height="15"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{criteria}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1" y="112" width="60" height="15"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="130" width="450" height="15"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{labels}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1" y="129" width="60" height="15"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{labels}]]></textFieldExpression> + </textField> </band> diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties index ae94dcd83..3fdbbd60a 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties @@ -5,6 +5,8 @@ order = Project: status = Status: name = Name. code = Code: +criteria = Criteria : +labels = Labels : headers1.column1 = Starting date headers1.column1.column1 = Estimated headers1.column1.column2 = First report diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties index 6b359d131..7abc354a7 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties @@ -5,6 +5,8 @@ order = Project: status = Status: name = Name: code = Code: +criteria = Criteria : +labels = Labels : headers1.column1 = Starting date headers1.column1.column1 = Estimated headers1.column1.column2 = First report diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties index aee9a7abb..57f456d60 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties @@ -5,6 +5,8 @@ order = Proyecto: status = Estado: name = Nombre: code = Código: +criteria = Criterios : +labels = Etiquetas : headers1.column1 = Fecha de inicio headers1.column1.column1 = Estimada headers1.column1.column2 = Primer informe diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties index 8dd9cf26e..e767fe69a 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties @@ -5,6 +5,8 @@ order = Proxecto: status = Estado: name = Nome: code = Código: +criteria = Criterios : +labels = Etiquetas : headers1.column1 = Data de inicio headers1.column1.column1 = Estimada headers1.column1.column2 = Informe Primeiro diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml index af0c723cd..129704bee 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml @@ -4,6 +4,8 @@ + + @@ -23,7 +25,7 @@ - <band height="131" splitType="Stretch"> + <band height="168" splitType="Stretch"> <image scaleImage="RealHeight"> <reportElement x="316" y="3" width="180" height="53"/> <imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression> @@ -72,6 +74,38 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression> </textField> + <textField> + <reportElement x="1" y="116" width="60" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{criteria} != null)]]></printWhenExpression> + </reportElement> + <textElement verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="116" width="491" height="20"/> + <textElement verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{criteria}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="61" y="136" width="491" height="20"/> + <textElement verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{labels}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1" y="136" width="60" height="20"> + <printWhenExpression><![CDATA[new java.lang.Boolean($P{labels} != null)]]></printWhenExpression> + </reportElement> + <textElement verticalAlignment="Middle" markup="none"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$R{labels}]]></textFieldExpression> + </textField> </band> diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties index 3724a797a..277b9a16b 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties @@ -3,6 +3,8 @@ title = Progress report subtitle = Working progress per task order = Project: reference = Reference date: +criteria = Criteria : +labels = Labels : headers.column1 = Total hours headers.column1.column1 = Estimated headers.column1.column2 = Planned diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties index 3724a797a..277b9a16b 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties @@ -3,6 +3,8 @@ title = Progress report subtitle = Working progress per task order = Project: reference = Reference date: +criteria = Criteria : +labels = Labels : headers.column1 = Total hours headers.column1.column1 = Estimated headers.column1.column2 = Planned diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties index 6f1ad2749..d763b58ef 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties @@ -3,6 +3,8 @@ title = Informe de Progreso subtitle = Progreso por tarea order = Proyecto: reference = Fecha de referencia: +criteria = Criterios : +labels = Etiquetas : headers.column1 = Horas Totales headers.column1.column1 = Estimadas headers.column1.column2 = Planificadas diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties index 49f1855e5..d858497bb 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties @@ -3,6 +3,8 @@ title = Informe de Progreso subtitle = Progreso por tarefa order = Proxecto: reference = Data de referencia: +criteria = Criterios : +labels = Etiquetas : headers.column1 = Horas Totais headers.column1.column1 = Estimadas headers.column1.column2 = Planificadas diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java index 4eaae4d97..77ab9de1b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java @@ -24,7 +24,6 @@ package org.navalplanner.web.reports; import static org.navalplanner.web.I18nHelper._; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,6 +104,8 @@ public class CompletedEstimatedHoursPerTaskController extends NavalplannerReport result.put("orderName", getSelectedOrder().getName()); result.put("referenceDate", getDeadlineDate()); + result.put("criteria", getParameterCriterions()); + result.put("labels", getParameterLabels()); return result; } @@ -176,4 +177,11 @@ public class CompletedEstimatedHoursPerTaskController extends NavalplannerReport Util.reloadBindings(lbCriterions); } + private String getParameterCriterions() { + return completedEstimatedHoursPerTaskModel.getSelectedCriteria(); + } + + private String getParameterLabels() { + return completedEstimatedHoursPerTaskModel.getSelectedLabel(); + } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java index ffde15ec8..5a5213f35 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java @@ -24,6 +24,7 @@ package org.navalplanner.web.reports; import java.util.ArrayList; import java.util.Date; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -86,6 +87,14 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH private List