From 869191bc67f7bd919ea18901c4e63162f083e5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Sat, 7 May 2011 02:49:40 +0200 Subject: [PATCH] Revamped calendars administration FEA: ItEr74S06CalendarAdminInterfaceItEr73S06 --- .../BaseCalendarEditionController.java | 14 +- .../src/main/webapp/calendars/_edition.zul | 447 ++++++++++-------- .../main/webapp/common/css/navalplan_zk.css | 52 ++ 3 files changed, 306 insertions(+), 207 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 1c8e44148..86a7b7148 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -91,10 +91,12 @@ public abstract class BaseCalendarEditionController extends GenericForwardComposer { private static String asString(Capacity capacity) { - String extraEffortString = capacity.isOverAssignableWithoutLimit() ? _("unlimited") + String extraEffortString = capacity.isOverAssignableWithoutLimit() ? _("unl") : asString(capacity.getAllowedExtraEffort()); - return asString(capacity.getStandardEffort()) + " " + extraEffortString; + return asString(capacity.getStandardEffort()) + " [" + + extraEffortString + + "]"; } private static String asString(EffortDuration duration) { @@ -103,10 +105,9 @@ public abstract class BaseCalendarEditionController extends } EnumMap decomposed = duration.decompose(); - String result = _("{0}h", decomposed.get(Granularity.HOURS)); - if (decomposed.get(Granularity.MINUTES) > 0) { - result += _(" {0}m", decomposed.get(Granularity.MINUTES)); - } + String result = _("{0}:", decomposed.get(Granularity.HOURS)); + result += _("{0}", decomposed.get(Granularity.MINUTES)); + if (decomposed.get(Granularity.SECONDS) > 0) { result += _(" {0}s", decomposed.get(Granularity.SECONDS)); } @@ -423,6 +424,7 @@ public abstract class BaseCalendarEditionController extends EffortDurationPicker extraDurationPicker, Checkbox checkbox) { Listcell extraEffortCell = new Listcell(); Hbox hbox = new Hbox(); + hbox.setSclass("extra effort cell"); hbox.appendChild(extraDurationPicker); hbox.appendChild(checkbox); extraEffortCell.appendChild(hbox); diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul index 9003bb3b3..1db5569ea 100644 --- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul @@ -21,253 +21,298 @@ - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + + value="@{calendarController.editionController.selectedDay,access='both'}" + ancestorExceptionDays="@{calendarController.editionController.ancestorExceptionDays,access='both'}" + ownExceptionDays="@{calendarController.editionController.ownExceptionDays,access='both'}" + zeroHoursDays="@{calendarController.editionController.zeroHoursDays,access='both'}" /> - - + + + + + + + + + + + + + - - + + + + - + - + - - - + + + - + - + - - - - - - - - + + - - + + - - - - - - - - - - + + + + + + + - + + +