RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1022] Include filtering criteria information in the hearders of the reports.

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-05-23 13:44:23 +02:00
parent 5eca63869d
commit b528c0abc9
41 changed files with 582 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
View file

@ -4,6 +4,8 @@
<parameter name="referenceDate" class="java.util.Date"/>
<parameter name="orderName" 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="taskName" class="java.lang.String"/>
<field name="estimatedHours" class="java.lang.Integer"/>
<field name="totalPlannedHours" class="java.lang.Integer"/>
@ -16,7 +18,7 @@
<band splitType="Stretch"/>
</background>
<title>
<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>
</title>
<pageHeader>

2
navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties
View file

@ -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

40
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
View file

@ -5,6 +5,8 @@
<parameter name="endingDate" class="java.util.Date"/>
<parameter name="showNote" class="java.lang.Boolean"/>
<parameter name="logo" class="java.lang.String"/>
<parameter name="criteria" class="java.lang.String"/>
<parameter name="labels" class="java.lang.String"/>
<field name="workerName" class="java.lang.String"/>
<field name="date" class="java.util.Date"/>
<field name="clockStart" class="java.util.Date"/>
@ -184,7 +186,7 @@
<band splitType="Stretch"/>
</background>
<title>
<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>
</title>
<pageHeader>

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
View file

@ -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

36
navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
View file

@ -5,6 +5,8 @@
<parameter name="startingDate" class="java.util.Date"/>
<parameter name="endingDate" class="java.util.Date"/>
<parameter name="logo" class="java.lang.String"/>
<parameter name="criteria" class="java.lang.String"/>
<parameter name="labels" class="java.lang.String"/>
<field name="workerName" class="java.lang.String"/>
<field name="date" class="java.util.Date"/>
<field name="clockStart" class="java.util.Date"/>
@ -296,7 +298,7 @@
<band splitType="Stretch"/>
</background>
<title>
<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>
</title>
<pageHeader>

2
navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
View file

@ -41,7 +41,7 @@
<band splitType="Stretch"/>
</background>
<title>
<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>

36
navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
View file

@ -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>
</title>
<pageHeader>

2
navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties
View file

@ -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

36
navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
View file

@ -4,6 +4,8 @@
<parameter name="referenceDate" class="java.util.Date"/>
<parameter name="orderName" 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="taskName" class="java.lang.String"/>
<field name="estimatedHours" class="java.lang.Integer"/>
<field name="totalPlannedHours" class="java.lang.Integer"/>
@ -23,7 +25,7 @@
<band splitType="Stretch"/>
</background>
<title>
<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>
</title>
<pageHeader>

2
navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties
View file

@ -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

2
navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties
View file

@ -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

10
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java
View file

@ -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();
}
}

57
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
View file

@ -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<Label> allLabels = new ArrayList<Label>();
private String selectedCriteria;
private String selectedLabel;
private boolean hasChangeCriteria = false;
private boolean hasChangeLabels = false;
private static List<ResourceEnum> applicableResources = new ArrayList<ResourceEnum>();
static {
@ -172,6 +181,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
@Override
public void removeSelectedLabel(Label label) {
this.selectedLabels.remove(label);
this.hasChangeLabels = true;
}
@Override
@ -180,6 +190,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
return false;
}
this.selectedLabels.add(label);
this.hasChangeLabels = true;
return true;
}
@ -232,6 +243,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
@Override
public void removeSelectedCriterion(Criterion criterion) {
this.selectedCriterions.remove(criterion);
this.hasChangeCriteria = true;
}
@Override
@ -240,6 +252,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
return false;
}
this.selectedCriterions.add(criterion);
this.hasChangeCriteria = true;
return true;
}
@ -248,4 +261,48 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
return selectedCriterions;
}
public void setSelectedLabel(String selectedLabel) {
this.selectedLabel = selectedLabel;
}
public String getSelectedLabel() {
if (hasChangeLabels) {
this.selectedLabel = null;
Iterator<Label> iterator = this.selectedLabels.iterator();
if (iterator.hasNext()) {
this.selectedLabel = new String();
this.selectedLabel = this.selectedLabel.concat(iterator.next()
.getName());
}
while (iterator.hasNext()) {
this.selectedLabel = this.selectedLabel.concat(", "
+ iterator.next().getName());
}
hasChangeLabels = false;
}
return selectedLabel;
}
public void setSelectedCriteria(String selectedCriteria) {
this.selectedCriteria = selectedCriteria;
}
public String getSelectedCriteria() {
if (hasChangeCriteria) {
this.selectedCriteria = null;
Iterator<Criterion> iterator = this.selectedCriterions.iterator();
if (iterator.hasNext()) {
this.selectedCriteria = new String();
this.selectedCriteria = this.selectedCriteria.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedCriteria = this.selectedCriteria.concat(", "
+ iterator.next().getName());
}
hasChangeCriteria = false;
}
return selectedCriteria;
}
}

10
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
View file

@ -25,7 +25,6 @@ import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -129,6 +128,8 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
result.put("startingDate", getStartingDate());
result.put("endingDate", getEndingDate());
result.put("criteria", getParameterCriterions());
result.put("labels", getParameterLabels());
result.put("showNote", hoursWorkedPerWorkerModel.isShowReportMessage());
return result;
}
@ -317,4 +318,11 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
return hoursWorkedPerWorkerModel.getSelectedCriterions();
}
private String getParameterCriterions() {
return hoursWorkedPerWorkerModel.getSelectedCriteria();
}
private String getParameterLabels() {
return hoursWorkedPerWorkerModel.getSelectedLabel();
}
}

56
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
View file

@ -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;
@ -71,6 +72,14 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
private List<Criterion> allCriterions = new ArrayList<Criterion>();
private String selectedCriteria;
private String selectedLabel;
private boolean hasChangeCriteria = false;
private boolean hasChangeLabels = false;
private static List<ResourceEnum> applicableResources = new ArrayList<ResourceEnum>();
static {
@ -158,6 +167,7 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
return false;
}
this.selectedLabels.add(label);
hasChangeLabels = true;
return true;
}
@ -210,6 +220,7 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
@Override
public void removeSelectedCriterion(Criterion criterion) {
this.selectedCriterions.remove(criterion);
hasChangeCriteria = true;
}
@Override
@ -218,6 +229,7 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
return false;
}
this.selectedCriterions.add(criterion);
hasChangeCriteria = true;
return true;
}
@ -226,4 +238,48 @@ public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
return selectedCriterions;
}
public void setSelectedLabel(String selectedLabel) {
this.selectedLabel = selectedLabel;
}
public String getSelectedLabel() {
if (hasChangeLabels) {
this.selectedLabel = null;
Iterator<Label> iterator = this.selectedLabels.iterator();
if (iterator.hasNext()) {
this.selectedLabel = new String();
this.selectedLabel = this.selectedLabel.concat(iterator.next()
.getName());
}
while (iterator.hasNext()) {
this.selectedLabel = this.selectedLabel.concat(", "
+ iterator.next().getName());
}
hasChangeLabels = false;
}
return selectedLabel;
}
public void setSelectedCriteria(String selectedCriteria) {
this.selectedCriteria = selectedCriteria;
}
public String getSelectedCriteria() {
if (hasChangeCriteria) {
this.selectedCriteria = null;
Iterator<Criterion> iterator = this.selectedCriterions.iterator();
if (iterator.hasNext()) {
this.selectedCriteria = new String();
this.selectedCriteria = this.selectedCriteria.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedCriteria = this.selectedCriteria.concat(", "
+ iterator.next().getName());
}
hasChangeCriteria = false;
}
return selectedCriteria;
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ICompletedEstimatedHoursPerTaskModel.java
View file

@ -59,4 +59,8 @@ public interface ICompletedEstimatedHoursPerTaskModel {
boolean addSelectedCriterion(Criterion criterion);
List<Criterion> getSelectedCriterions();
String getSelectedCriteria();
String getSelectedLabel();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IHoursWorkedPerWorkerModel.java
View file

@ -67,4 +67,8 @@ public interface IHoursWorkedPerWorkerModel {
boolean addSelectedCriterion(Criterion criterion);
List<Criterion> getCriterions();
String getSelectedCriteria();
String getSelectedLabel();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IOrderCostsPerResourceModel.java
View file

@ -64,4 +64,8 @@ public interface IOrderCostsPerResourceModel {
boolean addSelectedCriterion(Criterion criterion);
List<Criterion> getSelectedCriterions();
String getSelectedCriteria();
String getSelectedLabel();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IWorkingArrangementsPerOrderModel.java
View file

@ -59,4 +59,8 @@ public interface IWorkingArrangementsPerOrderModel {
boolean addSelectedCriterion(Criterion criterion);
List<Criterion> getSelectedCriterions();
String getSelectedCriteria();
String getSelectedLabel();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IWorkingProgressPerTaskModel.java
View file

@ -59,4 +59,8 @@ public interface IWorkingProgressPerTaskModel {
List<Criterion> getSelectedCriterions();
String getSelectedLabel();
String getSelectedCriteria();
}

9
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java
View file

@ -86,6 +86,8 @@ public class OrderCostsPerResourceController extends NavalplannerReportControlle
result.put("startingDate", getStartingDate());
result.put("endingDate", getEndingDate());
result.put("criteria", getParameterCriterions());
result.put("labels", getParameterLabels());
return result;
}
@ -220,4 +222,11 @@ public class OrderCostsPerResourceController extends NavalplannerReportControlle
return REPORT_NAME;
}
private String getParameterCriterions() {
return orderCostsPerResourceModel.getSelectedCriteria();
}
private String getParameterLabels() {
return orderCostsPerResourceModel.getSelectedLabel();
}
}

57
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java
View file

@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -88,6 +89,14 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
private List<Label> allLabels = new ArrayList<Label>();
private String selectedCriteria;
private String selectedLabel;
private boolean hasChangeCriteria = false;
private boolean hasChangeLabels = false;
private static List<ResourceEnum> applicableResources = new ArrayList<ResourceEnum>();
static {
@ -275,6 +284,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
@Override
public void removeSelectedLabel(Label label) {
this.selectedLabels.remove(label);
this.hasChangeLabels = true;
}
@Override
@ -283,6 +293,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
return false;
}
this.selectedLabels.add(label);
this.hasChangeLabels = true;
return true;
}
@ -335,6 +346,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
@Override
public void removeSelectedCriterion(Criterion criterion) {
this.selectedCriterions.remove(criterion);
this.hasChangeCriteria = true;
}
@Override
@ -343,6 +355,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
return false;
}
this.selectedCriterions.add(criterion);
this.hasChangeCriteria = true;
return true;
}
@ -351,4 +364,48 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
return selectedCriterions;
}
public void setSelectedLabel(String selectedLabel) {
this.selectedLabel = selectedLabel;
}
public String getSelectedLabel() {
if (hasChangeLabels) {
this.selectedLabel = null;
Iterator<Label> iterator = this.selectedLabels.iterator();
if (iterator.hasNext()) {
this.selectedLabel = new String();
this.selectedLabel = this.selectedLabel.concat(iterator.next()
.getName());
}
while (iterator.hasNext()) {
this.selectedLabel = this.selectedLabel.concat(", "
+ iterator.next().getName());
}
hasChangeLabels = false;
}
return selectedLabel;
}
public void setSelectedCriteria(String selectedCriteria) {
this.selectedCriteria = selectedCriteria;
}
public String getSelectedCriteria() {
if (hasChangeCriteria) {
this.selectedCriteria = null;
Iterator<Criterion> iterator = this.selectedCriterions.iterator();
if (iterator.hasNext()) {
this.selectedCriteria = new String();
this.selectedCriteria = this.selectedCriteria.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedCriteria = this.selectedCriteria.concat(", "
+ iterator.next().getName());
}
hasChangeCriteria = false;
}
return selectedCriteria;
}
}

11
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
View file

@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -124,6 +123,8 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
Map<String, Object> result = super.getParameters();
result.put("orderName", getSelectedOrder().getName());
result.put("criteria", getParameterCriterions());
result.put("labels", getParameterLabels());
// Task status
final TaskStatusEnum taskStatus = getSelectedTaskStatus();
@ -213,4 +214,12 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
Util.reloadBindings(lbCriterions);
}
private String getParameterCriterions() {
return workingArrangementsPerOrderModel.getSelectedCriteria();
}
private String getParameterLabels() {
return workingArrangementsPerOrderModel.getSelectedLabel();
}
}

59
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java
View file

@ -27,6 +27,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -41,10 +42,10 @@ import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.entities.Dependency;
import org.navalplanner.business.planner.entities.Dependency.Type;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskStatusEnum;
import org.navalplanner.business.planner.entities.Dependency.Type;
import org.navalplanner.business.reports.dtos.WorkingArrangementPerOrderDTO;
import org.navalplanner.business.reports.dtos.WorkingArrangementPerOrderDTO.DependencyWorkingArrangementDTO;
import org.navalplanner.business.resources.daos.ICriterionTypeDAO;
@ -99,6 +100,14 @@ public class WorkingArrangementsPerOrderModel implements
private List<Label> allLabels = new ArrayList<Label>();
private String selectedCriteria;
private String selectedLabel;
private boolean hasChangeCriteria = false;
private boolean hasChangeLabels = false;
private static List<ResourceEnum> applicableResources = new ArrayList<ResourceEnum>();
static {
@ -387,6 +396,7 @@ Order order,
@Override
public void removeSelectedLabel(Label label) {
this.selectedLabels.remove(label);
this.hasChangeLabels = true;
}
@Override
@ -395,6 +405,7 @@ Order order,
return false;
}
this.selectedLabels.add(label);
this.hasChangeLabels = true;
return true;
}
@ -447,6 +458,7 @@ Order order,
@Override
public void removeSelectedCriterion(Criterion criterion) {
this.selectedCriterions.remove(criterion);
this.hasChangeCriteria = true;
}
@Override
@ -455,6 +467,7 @@ Order order,
return false;
}
this.selectedCriterions.add(criterion);
this.hasChangeCriteria = true;
return true;
}
@ -463,4 +476,48 @@ Order order,
return selectedCriterions;
}
public void setSelectedLabel(String selectedLabel) {
this.selectedLabel = selectedLabel;
}
public String getSelectedLabel() {
if (hasChangeLabels) {
Iterator<Label> iterator = this.selectedLabels.iterator();
this.selectedLabel = null;
if (iterator.hasNext()) {
this.selectedLabel = new String();
this.selectedLabel = this.selectedLabel.concat(iterator.next()
.getName());
}
while (iterator.hasNext()) {
this.selectedLabel = this.selectedLabel.concat(", "
+ iterator.next().getName());
}
hasChangeLabels = false;
}
return selectedLabel;
}
public void setSelectedCriteria(String selectedCriteria) {
this.selectedCriteria = selectedCriteria;
}
public String getSelectedCriteria() {
if (hasChangeCriteria) {
this.selectedCriteria = null;
Iterator<Criterion> iterator = this.selectedCriterions.iterator();
if (iterator.hasNext()) {
this.selectedCriteria = new String();
this.selectedCriteria = this.selectedCriteria.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedCriteria = this.selectedCriteria.concat(", "
+ iterator.next().getName());
}
hasChangeCriteria = false;
}
return selectedCriteria;
}
}

12
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
View file

@ -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;
@ -101,7 +100,8 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
result.put("orderName", getSelectedOrder().getName());
result.put("referenceDate", getDeadlineDate());
result.put("criteria", getParameterCriterions());
result.put("labels", getParameterLabels());
return result;
}
@ -171,4 +171,12 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
workingProgressPerTaskModel.removeSelectedCriterion(criterion);
Util.reloadBindings(lbCriterions);
}
private String getParameterCriterions() {
return workingProgressPerTaskModel.getSelectedCriteria();
}
private String getParameterLabels() {
return workingProgressPerTaskModel.getSelectedLabel();
}
}

57
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
View file

@ -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;
@ -85,6 +86,14 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
private List<Label> allLabels = new ArrayList<Label>();
private String selectedCriteria;
private String selectedLabel;
private boolean hasChangeCriteria = false;
private boolean hasChangeLabels = false;
private static List<ResourceEnum> applicableResources = new ArrayList<ResourceEnum>();
static {
@ -184,6 +193,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
@Override
public void removeSelectedLabel(Label label) {
this.selectedLabels.remove(label);
this.hasChangeLabels = true;
}
@Override
@ -192,6 +202,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
return false;
}
this.selectedLabels.add(label);
this.hasChangeLabels = true;
return true;
}
@ -244,6 +255,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
@Override
public void removeSelectedCriterion(Criterion criterion) {
this.selectedCriterions.remove(criterion);
this.hasChangeCriteria = true;
}
@Override
@ -252,6 +264,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
return false;
}
this.selectedCriterions.add(criterion);
this.hasChangeCriteria = true;
return true;
}
@ -260,4 +273,48 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
return selectedCriterions;
}
public void setSelectedLabel(String selectedLabel) {
this.selectedLabel = selectedLabel;
}
public String getSelectedLabel() {
if (hasChangeLabels) {
Iterator<Label> iterator = this.selectedLabels.iterator();
this.selectedLabel = null;
if (iterator.hasNext()) {
this.selectedLabel = new String();
this.selectedLabel = this.selectedLabel.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedLabel = this.selectedLabel.concat(", "
+ iterator.next().getName());
}
hasChangeLabels = false;
}
return selectedLabel;
}
public void setSelectedCriteria(String selectedCriteria) {
this.selectedCriteria = selectedCriteria;
}
public String getSelectedCriteria() {
if (hasChangeCriteria) {
this.selectedCriteria = null;
Iterator<Criterion> iterator = this.selectedCriterions.iterator();
if (iterator.hasNext()) {
this.selectedCriteria = new String();
this.selectedCriteria = this.selectedCriteria.concat(iterator
.next().getName());
}
while (iterator.hasNext()) {
this.selectedCriteria = this.selectedCriteria.concat(", "
+ iterator.next().getName());
}
hasChangeCriteria = false;
}
return selectedCriteria;
}
}