Added grouping headers to new report with all columns
FEA: ItEr77S17AutomaticBudgeting
This commit is contained in:
Lorenzo Tilve Álvaro
parent
728b87d2bf
commit
6bc887739d
5 changed files with 145 additions and 136 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="resourcesList" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="projectStatus" uuid="17a95f07-ce2e-43c0-8da8-bfe1b9d826c2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="766"/>
|
||||
<property name="ireport.x" value="492"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="dejavu-sans" isDefault="true" fontName="DejaVu Sans" fontSize="8"/>
|
||||
<style name="row-grey" style="dejavu-sans">
|
||||
|
|
@ -67,10 +67,6 @@
|
|||
<field name="totalCostIntegerPart" class="java.math.BigDecimal"/>
|
||||
<field name="totalCostFractionalPart" class="java.math.BigDecimal"/>
|
||||
<field name="costMark" class="java.lang.String"/>
|
||||
<field name="resourcesBudgetIntegerPart" class="java.math.BigDecimal"/>
|
||||
<field name="expensesBudgetIntegerPart" class="java.math.BigDecimal"/>
|
||||
<field name="resourcesBudgetFractionalPart" class="java.math.BigDecimal"/>
|
||||
<field name="expensesBudgetFractionalPart" class="java.math.BigDecimal"/>
|
||||
<background>
|
||||
<band splitType="Stretch"/>
|
||||
</background>
|
||||
|
|
@ -254,7 +250,7 @@
|
|||
<textFieldExpression><![CDATA[$R{code}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="82352929-5e6a-4feb-9f54-fd2c97eb7cea" x="100" y="0" width="247" height="15"/>
|
||||
<reportElement uuid="82352929-5e6a-4feb-9f54-fd2c97eb7cea" x="100" y="0" width="322" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -265,7 +261,7 @@
|
|||
<textFieldExpression><![CDATA[$R{name}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="347" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="422" y="0" width="50" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -276,7 +272,7 @@
|
|||
<textFieldExpression><![CDATA[$R{estimated_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="397" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="472" y="0" width="50" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -287,7 +283,7 @@
|
|||
<textFieldExpression><![CDATA[$R{planned_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="447" y="0" width="55" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="522" y="0" width="55" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -298,7 +294,7 @@
|
|||
<textFieldExpression><![CDATA[$R{imputed_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="584" y="0" width="48" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="577" y="0" width="55" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -341,28 +337,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{total_cost}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="9c1fc16f-f844-4506-a2cb-def34c039d1e" x="502" y="0" width="41" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{budget}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="fa84e2c6-ce40-4e3b-aac5-15258e0dc0bb" x="543" y="0" width="41" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{budget}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
|
|
@ -373,34 +347,34 @@
|
|||
<textFieldExpression><![CDATA[$F{code}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="04220d70-bab8-480f-b0db-8e3efd43965a" style="row-grey" x="100" y="0" width="247" height="15"/>
|
||||
<reportElement uuid="04220d70-bab8-480f-b0db-8e3efd43965a" style="row-grey" x="100" y="0" width="322" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{name}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="347" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="422" y="0" width="50" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{estimatedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="397" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="472" y="0" width="50" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{plannedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="hours-red" x="447" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="hours-red" x="522" y="0" width="50" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{imputedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="hours-red" x="497" y="0" width="5" height="15"/>
|
||||
<reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="hours-red" x="572" y="0" width="5" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{hoursMark}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="584" y="0" width="33" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="577" y="0" width="40" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{budgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -446,26 +420,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{costMark}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="f485f699-6551-45f4-ac1b-5d4b8973646b" style="row-grey" x="502" y="0" width="30" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{resourcesBudgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="801fb4c5-e191-402c-a6c3-bfb9ffaaaf9a" style="row-grey" x="532" y="0" width="11" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{resourcesBudgetFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="d6f1af93-e3f3-4793-ad8f-4a7e9d5afd9b" style="row-grey" x="543" y="0" width="30" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesBudgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="bdad83d7-df4a-49c6-b655-7cce935b4a53" style="row-grey" x="573" y="0" width="11" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesBudgetFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<columnFooter>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="resourcesList" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="projectStatus" uuid="17a95f07-ce2e-43c0-8da8-bfe1b9d826c2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="766"/>
|
||||
<property name="ireport.x" value="624"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="dejavu-sans" isDefault="true" fontName="DejaVu Sans" fontSize="8"/>
|
||||
<style name="row-grey" style="dejavu-sans">
|
||||
|
|
@ -241,9 +241,9 @@
|
|||
<band splitType="Stretch"/>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
<band height="15" splitType="Stretch">
|
||||
<band height="32" splitType="Stretch">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="02635b95-c7c7-48aa-bfd8-bfdf35b9332f" x="0" y="0" width="100" height="15"/>
|
||||
<reportElement uuid="02635b95-c7c7-48aa-bfd8-bfdf35b9332f" x="0" y="17" width="100" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
<textFieldExpression><![CDATA[$R{code}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="82352929-5e6a-4feb-9f54-fd2c97eb7cea" x="100" y="0" width="247" height="15"/>
|
||||
<reportElement uuid="82352929-5e6a-4feb-9f54-fd2c97eb7cea" x="100" y="17" width="300" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -265,9 +265,10 @@
|
|||
<textFieldExpression><![CDATA[$R{name}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="347" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="400" y="17" width="33" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.25"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
|
|
@ -276,7 +277,7 @@
|
|||
<textFieldExpression><![CDATA[$R{estimated_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="397" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="433" y="17" width="32" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -287,7 +288,7 @@
|
|||
<textFieldExpression><![CDATA[$R{planned_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="447" y="0" width="55" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="465" y="17" width="37" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -298,7 +299,7 @@
|
|||
<textFieldExpression><![CDATA[$R{imputed_hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="584" y="0" width="48" height="15"/>
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="597" y="17" width="50" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
|
|
@ -306,62 +307,98 @@
|
|||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="647" y="17" width="50" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.25"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="697" y="17" width="50" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{expenses}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="747" y="17" width="55" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="9c1fc16f-f844-4506-a2cb-def34c039d1e" x="551" y="17" width="46" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{expenses}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="fa84e2c6-ce40-4e3b-aac5-15258e0dc0bb" x="502" y="17" width="49" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.25"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="cbc9f7bf-3f4e-431d-9448-64db5c896033" x="400" y="2" width="102" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{hours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="7332931d-1315-42be-bd72-36c7ba06c3b7" x="502" y="2" width="145" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{budget}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="632" y="0" width="55" height="15"/>
|
||||
<reportElement uuid="d31937c3-04d7-4e91-8eaf-1eeefdc109df" x="647" y="2" width="155" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{hours_cost}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="687" y="0" width="55" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{expenses_cost}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="faae6657-606f-49ed-b11f-1085bc10a38a" x="742" y="0" width="58" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{total_cost}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="9c1fc16f-f844-4506-a2cb-def34c039d1e" x="502" y="0" width="41" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{budget}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="fa84e2c6-ce40-4e3b-aac5-15258e0dc0bb" x="543" y="0" width="41" height="15"/>
|
||||
<box>
|
||||
<pen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.25"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{budget}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$R{cost}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnHeader>
|
||||
|
|
@ -373,22 +410,22 @@
|
|||
<textFieldExpression><![CDATA[$F{code}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="04220d70-bab8-480f-b0db-8e3efd43965a" style="row-grey" x="100" y="0" width="247" height="15"/>
|
||||
<reportElement uuid="04220d70-bab8-480f-b0db-8e3efd43965a" style="row-grey" x="100" y="0" width="300" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{name}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="347" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="400" y="0" width="33" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{estimatedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="397" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="433" y="0" width="32" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{plannedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="hours-red" x="447" y="0" width="50" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="hours-red" x="465" y="0" width="32" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{imputedHours}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -400,37 +437,37 @@
|
|||
<textFieldExpression><![CDATA[$F{hoursMark}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="584" y="0" width="33" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="597" y="0" width="35" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{budgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="617" y="0" width="15" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="632" y="0" width="15" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{budgetFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="632" y="0" width="40" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="647" y="0" width="35" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{hoursCostIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="672" y="0" width="15" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="682" y="0" width="15" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{hoursCostFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="687" y="0" width="40" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="697" y="0" width="35" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesCostIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="727" y="0" width="15" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="row-grey" x="732" y="0" width="15" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesCostFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="cost-red" x="742" y="0" width="40" height="15"/>
|
||||
<reportElement uuid="1fe3ef4c-0cfe-45d2-96b1-c7f58d835509" style="cost-red" x="747" y="0" width="35" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{totalCostIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -447,22 +484,22 @@
|
|||
<textFieldExpression><![CDATA[$F{costMark}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="f485f699-6551-45f4-ac1b-5d4b8973646b" style="row-grey" x="502" y="0" width="30" height="15"/>
|
||||
<reportElement uuid="f485f699-6551-45f4-ac1b-5d4b8973646b" style="row-grey" x="502" y="0" width="38" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{resourcesBudgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="801fb4c5-e191-402c-a6c3-bfb9ffaaaf9a" style="row-grey" x="532" y="0" width="11" height="15"/>
|
||||
<reportElement uuid="801fb4c5-e191-402c-a6c3-bfb9ffaaaf9a" style="row-grey" x="540" y="0" width="11" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{resourcesBudgetFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#" isBlankWhenNull="true">
|
||||
<reportElement uuid="d6f1af93-e3f3-4793-ad8f-4a7e9d5afd9b" style="row-grey" x="543" y="0" width="30" height="15"/>
|
||||
<reportElement uuid="d6f1af93-e3f3-4793-ad8f-4a7e9d5afd9b" style="row-grey" x="551" y="0" width="35" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesBudgetIntegerPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=".##" isBlankWhenNull="true">
|
||||
<reportElement uuid="bdad83d7-df4a-49c6-b655-7cce935b4a53" style="row-grey" x="573" y="0" width="11" height="15"/>
|
||||
<reportElement uuid="bdad83d7-df4a-49c6-b655-7cce935b4a53" style="row-grey" x="586" y="0" width="11" height="15"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{expensesBudgetFractionalPart}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ project_planned_hours = Planned hours:
|
|||
project_imputed_hours = Imputed hours:
|
||||
code = Code
|
||||
name = Name
|
||||
estimated_hours = Estimated
|
||||
planned_hours = Planned
|
||||
imputed_hours = Imputed
|
||||
estimated_hours = Est.
|
||||
planned_hours = Plan.
|
||||
imputed_hours = Done
|
||||
project_budget = Budget:
|
||||
project_hours_cost = Hours cost:
|
||||
project_expenses_cost = Expenses cost:
|
||||
|
|
@ -18,3 +18,7 @@ budget = Budget
|
|||
hours_cost = Hours cost
|
||||
expenses_cost = Expenses cost
|
||||
total_cost = Total cost
|
||||
hours = Hours
|
||||
expenses = Expenses
|
||||
cost = Cost
|
||||
total = Total
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ project_planned_hours = Horas planificadas\:
|
|||
project_imputed_hours = Horas imputadas\:
|
||||
code = Código
|
||||
name = Nombre
|
||||
estimated_hours = Estimadas
|
||||
planned_hours = Planificadas
|
||||
imputed_hours = Imputadas
|
||||
estimated_hours = Est.
|
||||
planned_hours = Planif.
|
||||
imputed_hours = Hechas
|
||||
project_budget = Presupuesto\:
|
||||
project_hours_cost = Coste horas\:
|
||||
project_expenses_cost = Coste gastos\:
|
||||
|
|
@ -18,3 +18,7 @@ budget = Presupuesto
|
|||
hours_cost = Coste horas
|
||||
expenses_cost = Coste gastos
|
||||
total_cost = Coste total
|
||||
hours = Horas
|
||||
expenses = Gastos
|
||||
cost = Coste
|
||||
total = Total
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@ import net.sf.jasperreports.engine.JREmptyDataSource;
|
|||
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
||||
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
import org.libreplan.business.common.entities.Configuration;
|
||||
import org.libreplan.business.common.Registry;
|
||||
import org.libreplan.business.common.daos.ConfigurationDAO;
|
||||
import org.libreplan.business.labels.entities.Label;
|
||||
import org.libreplan.business.orders.entities.Order;
|
||||
import org.libreplan.business.reports.dtos.ProjectStatusReportDTO;
|
||||
|
|
@ -40,6 +43,7 @@ import org.libreplan.web.common.Level;
|
|||
import org.libreplan.web.common.MessagesForUser;
|
||||
import org.libreplan.web.common.Util;
|
||||
import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.zkoss.zk.ui.Component;
|
||||
import org.zkoss.zk.ui.WrongValueException;
|
||||
import org.zkoss.zul.Listbox;
|
||||
|
|
@ -84,7 +88,13 @@ public class ProjectStatusReportController extends LibrePlanReportController {
|
|||
|
||||
@Override
|
||||
protected String getReportName() {
|
||||
return REPORT_NAME;
|
||||
Configuration configuration = Registry.getConfigurationDAO()
|
||||
.getConfigurationWithReadOnlyTransaction();
|
||||
if (configuration != null && configuration.isEnabledAutomaticBudget()) {
|
||||
return REPORT_WITH_HOURS_BUDGET_NAME;
|
||||
} else {
|
||||
return REPORT_NAME;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue