diff --git a/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml new file mode 100644 index 000000000..bc5b6cb03 --- /dev/null +++ b/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml @@ -0,0 +1,509 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <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"> + <font size="12" isBold="true" isItalic="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{title}]]></textFieldExpression> + </textField> + <image scaleImage="RetainShape"> + <reportElement uuid="7e9a34ea-0ea1-44ae-bcd0-a253c75ebeea" x="622" y="0" width="180" height="40"/> + <imageExpression><![CDATA[$P{logo}]]></imageExpression> + </image> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="0" y="15" width="60" height="12"> + <printWhenExpression><![CDATA[$P{project} != null]]></printWhenExpression> + </reportElement> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="60" y="15" width="562" height="12"> + <printWhenExpression><![CDATA[$P{project} != null]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{project}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="96a4cd45-df8c-4c3e-b3e5-ba1bf959025f" x="0" y="15" width="60" height="12"> + <printWhenExpression><![CDATA[$P{project} == null]]></printWhenExpression> + </reportElement> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{filter}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="407b43e5-13d7-477e-a90c-34e0447610fc" x="60" y="15" width="562" height="12"> + <printWhenExpression><![CDATA[$P{project} == null]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="10" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{filter}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="0" y="28" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_estimated_hours}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="100" y="28" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{estimatedHours}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="200" y="28" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_planned_hours}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="300" y="28" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{plannedHours}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="400" y="28" width="100" height="12"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{project_imputed_hours}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" style="project-hours-red" x="500" y="28" width="100" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{imputedHours}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="project-hours-red" x="600" y="28" width="5" height="12"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{hoursMark}]]></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" style="project-cost-red" x="700" y="41" width="97" height="12"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{totalCost}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="project-cost-red" x="797" y="41" width="5" height="12"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{costMark}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java index 3b0dde6f8..300b43ea0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java @@ -56,6 +56,8 @@ public class ProjectStatusReportController extends LibrePlanReportController { private static final String REPORT_NAME = "projectStatusReport"; + private static final String REPORT_WITH_HOURS_BUDGET_NAME = "projectStatusReportWithHoursBudget"; + private IProjectStatusReportModel projectStatusReportModel; private BandboxSearch bandboxSelectOrder;