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

[Bug #851] fix bug

Browse source 
set type BigDecimal to units property in the
report TimeLineRequiredMaterial.

FEA : ItEr70S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-02-15 19:15:26 +01:00
parent 64c0e70642
commit 33281715ee
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
View file

@ -11,7 +11,7 @@
<field name="code" class="java.lang.String"/>
<field name="name" class="java.lang.String"/>
<field name="category" class="java.lang.String"/>
<field name="units" class="java.lang.Double"/>
<field name="units" class="java.math.BigDecimal"/>
<field name="unitPrice" class="java.math.BigDecimal"/>
<field name="totalPrice" class="java.math.BigDecimal"/>
<field name="estimatedAvailability" class="java.util.Date"/>
@ -299,18 +299,6 @@
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{unitPrice}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="340" y="0" width="50" height="73"/>
<box>
<pen lineWidth="1.0"/>
<topPen lineWidth="1.0"/>
<leftPen lineWidth="1.0"/>
<bottomPen lineWidth="1.0"/>
<rightPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.Double"><![CDATA[$F{units}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="520" y="0" width="60" height="73">
<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
@ -347,6 +335,18 @@
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{order}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="340" y="0" width="50" height="73"/>
<box>
<pen lineWidth="1.0"/>
<topPen lineWidth="1.0"/>
<leftPen lineWidth="1.0"/>
<bottomPen lineWidth="1.0"/>
<rightPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{units}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>

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

@ -124,8 +124,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
@Override
@Transactional(readOnly = true)
public JRDataSource getCompletedEstimatedHoursReportPerTask(
Order order,
public JRDataSource getCompletedEstimatedHoursReportPerTask(Order order,
Date deadline, List<Label> labels, List<Criterion> criterions) {
reattachmentOrder(order);
order.useSchedulingDataFor(scenarioManager.getCurrent());