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

[Bug #1014]

Browse source 
include the name of the assigned task to each report line, in the report
worked hours per each resource.

FEA: ItEr74S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-06-01 14:17:50 +02:00
parent d91a8a6831
commit 5e00405ec2
6 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerResourceDTO.java
View file

@ -45,6 +45,8 @@ public class HoursWorkedPerResourceDTO {
private String orderElementCode;
private String orderElementName;
private String descriptionValues;
private String labels;
@ -59,6 +61,7 @@ Resource resource,
this.clockFinish = workReportLine.getClockFinish();
this.numHours = workReportLine.getNumHours();
this.orderElementCode = workReportLine.getOrderElement().getCode();
this.orderElementName = workReportLine.getOrderElement().getName();
this.descriptionValues = descriptionValuesAsString(workReportLine.getDescriptionValues());
this.labels = labelsAsString(workReportLine.getLabels());
}
@ -127,6 +130,14 @@ Resource resource,
this.orderElementCode = orderElementCode;
}
public String getOrderElementName() {
return orderElementName;
}
public void setOrderElementName(String orderElementName) {
this.orderElementName = orderElementName;
}
public String getDescriptionValues() {
return descriptionValues;
}

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

@ -13,6 +13,7 @@
<field name="clockFinish" class="java.util.Date"/>
<field name="numHours" class="java.lang.Integer"/>
<field name="orderElementCode" class="java.lang.String"/>
<field name="orderElementName" class="java.lang.String"/>
<field name="descriptionValues" class="java.lang.String"/>
<field name="labels" class="java.lang.String"/>
<variable name="sumHoursPerDay" class="java.lang.Integer" resetType="Group" resetGroup="Date group" calculation="Sum">
@ -70,7 +71,7 @@
<groupHeader>
<band height="45">
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="13" y="4" width="178" height="20"/>
<reportElement x="2" y="4" width="178" height="20"/>
<textElement verticalAlignment="Middle">
<font size="11" isBold="false"/>
</textElement>
@ -105,7 +106,7 @@
<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column6}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="13" y="24" width="103" height="20" backcolor="#E0E4FB"/>
<reportElement mode="Opaque" x="0" y="24" width="116" height="20" backcolor="#E0E4FB"/>
<box>
<pen lineWidth="1.0"/>
<topPen lineWidth="1.0"/>
@ -294,37 +295,42 @@
<band splitType="Stretch"/>
</columnHeader>
<detail>
<band height="15" splitType="Stretch">
<band height="31" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="424" y="0" width="135" height="15"/>
<reportElement x="424" y="0" width="135" height="30"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{labels}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="294" y="0" width="130" height="15"/>
<reportElement x="294" y="0" width="130" height="30"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{descriptionValues}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="252" y="0" width="42" height="15"/>
<reportElement x="252" y="0" width="42" height="30"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.Integer"><![CDATA[$F{numHours}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="186" y="0" width="66" height="15"/>
<reportElement x="186" y="0" width="66" height="30"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.util.Date"><![CDATA[$F{clockFinish}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="116" y="0" width="70" height="15"/>
<reportElement x="116" y="0" width="70" height="30"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.util.Date"><![CDATA[$F{clockStart}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="13" y="0" width="103" height="15"/>
<reportElement x="0" y="0" width="116" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementCode}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="0" y="15" width="116" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementName}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>

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

@ -8,7 +8,7 @@ labels = Labels :
headers.column1 = Hours start
headers.column2 = Hours end
headers.column3 = Hours
headers.column4 = Project code
headers.column4 = Project code/name
headers.column5 = Text fields
headers.column6 = Labels
total.day = Total hours per day:

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

@ -8,7 +8,7 @@ labels = Labels :
headers.column1 = Hours start
headers.column2 = Hours end
headers.column3 = Hours
headers.column4 = Project code
headers.column4 = Project code/name
headers.column5 = Text fields
headers.column6 = Labels
total.day = Total hours per day:

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

@ -8,7 +8,7 @@ labels = Etiquetas :
headers.column1 = Horas inicio
headers.column2 = Horas fin
headers.column3 = Horas
headers.column4 = Código Pedido
headers.column4 = Código/Nombre Pedido
headers.column5 = Campos de texto
headers.column6 = Etiquetas
total.day = Horas totales por dia:

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

@ -8,7 +8,7 @@ labels = Etiquetas :
headers.column1 = Horas inicio
headers.column2 = Horas fin
headers.column3 = Horas
headers.column4 = Código orde
headers.column4 = Código/Nome orde
headers.column5 = Campos de texto
headers.column6 = Etiquetas
total.day = Horas totais por dia: