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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #558] Fix bug.

Browse source 
it adds to the identification of each order element its name.
This commit is contained in:
Susana Montes Pedreira 2010-07-12 11:39:40 +02:00 • committed by Javier Moran Rua
parent a659c671fb
commit b68cc0b12e
2 changed files with 23 additions and 4 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/OrderCostsPerResourceDTO.java
View file

@ -44,6 +44,8 @@ public class OrderCostsPerResourceDTO implements
private Integer numHours;
private String orderElementName;
private String orderElementCode;
private String descriptionValues;
@ -81,6 +83,7 @@ public class OrderCostsPerResourceDTO implements
this.hoursTypeCode = workReportLine.getTypeOfWorkHours().getCode();
this.orderElement = workReportLine.getOrderElement();
this.orderElementCode = workReportLine.getOrderElement().getCode();
this.orderElementName = workReportLine.getOrderElement().getName();
this.worker = worker;
}
@ -226,4 +229,12 @@ public class OrderCostsPerResourceDTO implements
return hoursTypeCode;
}
public void setOrderElementName(String orderElementName) {
this.orderElementName = orderElementName;
}
public String getOrderElementName() {
return orderElementName;
}
}

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

@ -19,6 +19,7 @@
<field name="cost" class="java.math.BigDecimal"/>
<field name="hoursType" class="java.lang.String"/>
<field name="costPerHour" class="java.math.BigDecimal"/>
<field name="orderElementName" class="java.lang.String"/>
<variable name="sumHoursPerTask" class="java.lang.Integer" resetType="Group" resetGroup="Task" calculation="Sum">
<variableExpression><![CDATA[$F{numHours}]]></variableExpression>
<initialValueExpression><![CDATA[new Integer(0)]]></initialValueExpression>
@ -52,7 +53,7 @@
<group name="OrderName">
<groupExpression><![CDATA[$F{orderName}]]></groupExpression>
<groupHeader>
<band height="36">
<band height="44">
<textField evaluationTime="Group" evaluationGroup="OrderName" isBlankWhenNull="true">
<reportElement x="2" y="0" width="551" height="26"/>
<textElement verticalAlignment="Middle">
@ -94,17 +95,24 @@
<group name="Task">
<groupExpression><![CDATA[$F{orderElementCode}]]></groupExpression>
<groupHeader>
<band height="23">
<band height="25">
<textField evaluationTime="Group" evaluationGroup="Task" isBlankWhenNull="true">
<reportElement x="34" y="0" width="505" height="20"/>
<reportElement x="2" y="0" width="175" height="20"/>
<textElement>
<font size="12"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementCode}]]></textFieldExpression>
</textField>
<line>
<reportElement x="34" y="20" width="504" height="1"/>
<reportElement x="5" y="20" width="548" height="1"/>
</line>
<textField isBlankWhenNull="true">
<reportElement x="177" y="0" width="376" height="20"/>
<textElement>
<font size="12"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementName}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>