From 128979defb3576ea5944585ab8f81cea89cc08b1 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 30 Nov 2010 11:14:55 +0100 Subject: [PATCH] adds an option for adding the reported hours to the printout. FEA : ItEr64S04AdvancesVisualization --- .../FunctionalityExposedForExtensions.java | 8 ++++++++ .../main/java/org/zkoss/ganttz/Planner.java | 20 +++++++++++++++++++ .../company/CompanyPlanningController.java | 3 +++ .../order/OrderPlanningController.java | 3 +++ .../org/navalplanner/web/print/CutyPrint.java | 9 +++++++-- .../webapp/planner/print_configuration.zul | 2 ++ 6 files changed, 43 insertions(+), 2 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index cc84cb61c..f4a3d56a7 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -235,6 +235,9 @@ public class FunctionalityExposedForExtensions implements IContext { } result = container; } + result + .setShowingReportedHours(planner + .areShownReportedHoursByDefault()); result.setShowingAdvances(planner.areShownAdvancesByDefault()); mapper.register(topInsertionPosition, result, data, parent); return result; @@ -479,6 +482,8 @@ public class FunctionalityExposedForExtensions implements IContext { Checkbox resources = (Checkbox) parent.getFellow("print_resources"); Checkbox labels = (Checkbox) parent.getFellow("print_labels"); Checkbox advances = (Checkbox) parent.getFellow("print_advances"); + Checkbox reportedHours = (Checkbox) parent + .getFellow("print_reported_hours"); if (layout.getSelectedIndex() == 2) { parameters.put("extension", ".png"); @@ -492,6 +497,9 @@ public class FunctionalityExposedForExtensions implements IContext { if (advances.isChecked() == true) { parameters.put("advances", "all"); } + if (reportedHours.isChecked() == true) { + parameters.put("reportedHours", "all"); + } if (resources.isChecked() == true) { parameters.put("resources", "all"); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index f2d0f5369..6b4a3ff67 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -114,6 +114,15 @@ public class Planner extends HtmlMacroComponent { return toLowercaseSet(values).contains("all"); } + public static boolean guessShowReportedHoursByDefault( + Map queryURLParameters) { + String[] values = queryURLParameters.get("reportedHours"); + if (values == null) { + return false; + } + return toLowercaseSet(values).contains("all"); + } + private static Set toLowercaseSet(String[] values) { Set result = new HashSet(); for (String each : values) { @@ -525,6 +534,8 @@ public class Planner extends HtmlMacroComponent { private boolean shownAdvanceByDefault = false; + private boolean shownReportedHoursByDefault = false; + private FilterAndParentExpandedPredicates predicate; private boolean visibleChart; @@ -656,6 +667,15 @@ public class Planner extends HtmlMacroComponent { this.shownAdvanceByDefault = shownAdvanceByDefault; } + public void setAreShownReportedHoursByDefault( + boolean shownReportedHoursByDefault) { + this.shownReportedHoursByDefault = shownReportedHoursByDefault; + } + + public boolean areShownReportedHoursByDefault() { + return shownReportedHoursByDefault; + } + public void expandAll() { Button expandAllButton = (Button) getFellow("expandAll"); if (disabilityConfiguration.isExpandAllEnabled()) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java index 393851ed5..0eadc8499 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.Validate; +import org.navalplanner.business.common.entities.ProgressType; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.web.common.components.bandboxsearch.BandboxMultipleSearch; import org.navalplanner.web.common.components.finders.FilterPair; @@ -119,6 +120,8 @@ public class CompanyPlanningController implements Composer { planner.setAreShownAdvancesByDefault(Planner .guessShowAdvancesByDefault(parameters)); + planner.setAreShownReportedHoursByDefault(Planner + .guessShowReportedHoursByDefault(parameters)); orderFilter = (Vbox) planner.getFellow("orderFilter"); // Configuration of the order filter diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java index cc35c279b..d78655c1f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java @@ -172,6 +172,9 @@ public class OrderPlanningController implements Composer { planner.setAreShownAdvancesByDefault(Planner .guessShowAdvancesByDefault(parameters)); + planner.setAreShownReportedHoursByDefault(Planner + .guessShowReportedHoursByDefault(parameters)); + orderElementFilter = (Vbox) planner.getFellow("orderElementFilter"); // Configuration of the order filter org.zkoss.zk.ui.Component filterComponent = Executions diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java index 1ec433d80..013eae893 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java @@ -193,6 +193,7 @@ public class CutyPrint { plannerWidth, planner, parameters .get("advances"), + parameters.get("reportedHours"), parameters.get("labels"), parameters.get("resources"), expanded, @@ -300,7 +301,8 @@ public class CutyPrint { } private static String createCSSFile(String srFile, int width, - Planner planner, String advances, String labels, String resources, + Planner planner, String advances, String reportedHours, + String labels, String resources, boolean expanded, int minimumWidthForTaskNameColumn) { File generatedCSS = null; @@ -323,9 +325,12 @@ public class CutyPrint { includeCSSLines += " .task-labels { display: inline !important;} \n"; } if ((advances != null) && (advances.equals("all"))) { - includeCSSLines += " .completion { display: inline !important;} \n"; includeCSSLines += " .completion2 { display: inline !important;} \n"; } + if ((reportedHours != null) && (reportedHours.equals("all"))) { + includeCSSLines += " .completion { display: inline !important;} \n"; + } + if ((resources != null) && (resources.equals("all"))) { includeCSSLines += " .task-resources { display: inline !important;} \n"; diff --git a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul index cfae5f03e..bab52121a 100644 --- a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul +++ b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul @@ -73,6 +73,8 @@ label="${i18n:_('Shrink to fit page width')}" checked="true" disabled="true" visible="false"/> +