diff --git a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml index 2ffa0e39a..3d9befc3c 100644 --- a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml +++ b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml @@ -21,16 +21,28 @@ + + + + + + + + + + + + - <band height="45" splitType="Stretch"> + <band height="57" splitType="Stretch"> <textField> <reportElement uuid="283b2e5a-b1fc-4fff-bdef-6d342b537b72" x="0" y="0" width="622" height="14"/> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> @@ -98,6 +110,62 @@ </textElement> <textFieldExpression><![CDATA[$P{imputedHours}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="0" y="41" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_budget}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="100" y="41" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{budget}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="200" y="41" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_hours_cost}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="300" y="41" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{hoursCost}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="400" y="41" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_expenses_cost}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="500" y="41" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{expensesCost}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="600" y="41" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_total_cost}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="700" y="41" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{totalCost}]]></textFieldExpression> + </textField> </band> @@ -117,7 +185,7 @@ - + @@ -128,7 +196,7 @@ - + @@ -139,7 +207,7 @@ - + @@ -150,7 +218,7 @@ - + @@ -160,6 +228,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -170,25 +282,65 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties index 7fa85e649..b4522a390 100644 --- a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties +++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties @@ -9,3 +9,11 @@ name = Name estimated_hours = Estimated planned_hours = Planned imputed_hours = Imputed +project_budget = Budget: +project_hours_cost = Hours cost: +project_expenses_cost = Expenses cost: +project_total_cost = Total cost: +budget = Budget +hours_cost = Hours cost +expenses_cost = Expenses cost +total_cost = Total cost \ No newline at end of file