From 568354718941b90eabc4f1118e3009a78350136f Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 3 Feb 2010 20:05:15 +0100 Subject: [PATCH] ItEr46S18RFComportamentoGraficoPlanificadorItEr31S05: Added information of order scheduling state next to name in breadcrumbs --- .../orders/entities/SchedulingState.java | 22 +++++++++++++++++++ .../web/orders/SchedulingStateToggler.java | 18 ++------------- .../web/planner/tabs/PlanningTabCreator.java | 17 ++++++++++++-- .../main/webapp/common/css/navalpro_v01.css | 2 +- .../main/webapp/common/css/navalpro_zk.css | 17 ++++++++++++++ 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java index 784b51e14..892b57aab 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java @@ -82,6 +82,7 @@ public class SchedulingState { public boolean isPartiallyScheduled() { return true; } + }, COMPLETELY_SCHEDULED_SUPERELEMENT { @Override @@ -98,6 +99,7 @@ public class SchedulingState { public boolean isPartiallyScheduled() { return false; } + }, NO_SCHEDULED { @Override @@ -350,4 +352,24 @@ public class SchedulingState { return children.size(); } + public String getStateName() { + if (isCompletelyScheduled()) { + return _("Completely scheduled"); + } else if (isPartiallyScheduled()) { + return _("Partially scheduled"); + } else { + return _("Unscheduled"); + } + } + + public String getStateAbbreviation() { + if (isCompletelyScheduled()) { + return _("C"); + } else if (isPartiallyScheduled()) { + return _("P"); + } else { + return _("U"); + } + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java index d3ae1e8d9..c7c61c441 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java @@ -18,8 +18,6 @@ * along with this program. If not, see . */ package org.navalplanner.web.orders; -import static org.navalplanner.web.I18nHelper._; - import org.apache.commons.lang.Validate; import org.navalplanner.business.orders.entities.SchedulingState; import org.navalplanner.business.orders.entities.SchedulingState.ITypeChangedListener; @@ -62,23 +60,11 @@ public class SchedulingStateToggler extends HtmlMacroComponent { } public String getButtonLabel() { - if (state.isCompletelyScheduled()) { - return _("C"); - } else if (state.isPartiallyScheduled()) { - return _("P"); - } else { - return _("U"); - } + return state.getStateAbbreviation(); } public String getButtonTextTooltip() { - if (state.isCompletelyScheduled()) { - return _("Completely scheduled"); - } else if (state.isPartiallyScheduled()) { - return _("Partially scheduled"); - } else { - return _("Unscheduled"); - } + return state.getStateName(); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java index 96e0c18ab..c22927c43 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java @@ -54,6 +54,7 @@ public class PlanningTabCreator { public static final String ENTERPRISE_VIEW = _("Company Scheduling"); public static final String ORDER_ENTERPRISE_VIEW = _("Order Scheduling"); + public static final int MAX_ORDERNAME_LENGHT = 90; private final Mode mode; private final CompanyPlanningController companyPlanningController; @@ -196,9 +197,21 @@ public class PlanningTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(ORDER_ENTERPRISE_VIEW)); if (mode.isOf(ModeType.ORDER)) { + + Label nameLabel = new Label(mode.getOrder().getName()); + nameLabel.setTooltiptext(mode.getOrder().getName() + "." + + mode.getOrder().getDescription()); + nameLabel.setMaxlength(MAX_ORDERNAME_LENGHT); + + Label schedulingStateLabel = new Label(mode.getOrder() + .getSchedulingState().getStateAbbreviation()); + schedulingStateLabel.setSclass("scheduling-state"); + schedulingStateLabel.setTooltiptext(mode.getOrder() + .getSchedulingState().getStateName()); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs - .appendChild(new Label(mode.getOrder().getName())); + breadcrumbs.appendChild(nameLabel); + breadcrumbs.appendChild(schedulingStateLabel); } } diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css index cae77ed57..186100579 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css @@ -165,7 +165,7 @@ a.sub_menu:hover { } .help-link { - width: 180px; + width: 80px; } .help-link a { diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index 61bac3a2a..d3723f912 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -1137,3 +1137,20 @@ tr.z-tree-row-seld, tr.z-list-item-seld, .function { min-width: 90px; } + +.migas_linea .scheduling-state { + -moz-border-radius-bottomleft: 6px; + -moz-border-radius-bottomright: 1px; + -moz-border-radius-topleft: 1px; + -moz-border-radius-topright: 6px; + -webkit-borderbottom-left-radius: 3px; + -webkit-border-bottomright-radius: 1px; + -webkit-border-radius-top-left-radius: 1px; + -webkit-border-topright-radius: 6px; + border: 1px solid #888888; + color: #888888; + font-weight: bold; + margin: 4px 3px 2px 5px; + padding: 1px 5px; + cursor: default; +}