From f76e93815aaaa7df2dcb1fda98ac9ab2fa3d4784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 23 Aug 2010 22:15:36 +0200
Subject: [PATCH] Show duration instead of hours below calendar

FEA: ItEr60S19TimeUnitDataType
---
 .../business/calendars/entities/BaseCalendar.java        | 6 +++---
 .../web/calendars/BaseCalendarEditionController.java     | 4 ++--
 .../navalplanner/web/calendars/BaseCalendarModel.java    | 9 +++++++++
 .../navalplanner/web/calendars/IBaseCalendarModel.java   | 2 ++
 .../src/main/webapp/calendars/_edition.zul               | 4 ++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
index b8abbeb28..6244454ac 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
@@ -300,10 +300,10 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
      * calendar restrictions.
      */
     public Integer getCapacityAt(LocalDate date) {
-        return roundToHours(getWorkableHours(date));
+        return roundToHours(getWorkableTimeAt(date));
     }
 
-    private EffortDuration getWorkableHours(LocalDate date) {
+    public EffortDuration getWorkableTimeAt(LocalDate date) {
         if (!isActive(date)) {
             return EffortDuration.zero();
         }
@@ -908,7 +908,7 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
 
     @Override
     public Integer toHours(LocalDate day, ResourcesPerDay resourcesPerDay) {
-        final EffortDuration workableHours = getWorkableHours(day);
+        final EffortDuration workableHours = getWorkableTimeAt(day);
         return roundToHours(limitOverAssignability(day,
                 resourcesPerDay.asDurationGivenWorkingDayOf(workableHours),
                 workableHours));
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 bb9344e06..0917a98a8 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
@@ -452,8 +452,8 @@ public abstract class BaseCalendarEditionController extends
         }
     }
 
-    public Integer getHoursOfDay() {
-        return baseCalendarModel.getHoursOfDay();
+    public String getWorkableTime() {
+        return asString(baseCalendarModel.getWorkableTime());
     }
 
     public void createException() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index 8eb20d4a9..c869ab991 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -237,6 +237,15 @@ public class BaseCalendarModel implements IBaseCalendarModel {
         return getBaseCalendar().getWorkableHours(selectedDate);
     }
 
+    @Override
+    public EffortDuration getWorkableTime() {
+        if (getBaseCalendar() == null) {
+            return null;
+        }
+        return getBaseCalendar().getWorkableTimeAt(
+                LocalDate.fromDateFields(selectedDate));
+    }
+
     @Override
     public DayType getTypeOfDay() {
         if (getBaseCalendar() == null) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
index 092b22a9f..05f294042 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
@@ -110,6 +110,8 @@ public interface IBaseCalendarModel {
 
     Integer getHoursOfDay();
 
+    EffortDuration getWorkableTime();
+
     void createException(CalendarExceptionType type, Date startDate,
             Date endDate, Integer hours);
 
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index 69da11c21..93701152b 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -64,8 +64,8 @@
             </hbox>
 
             <hbox>
-                <label value="${i18n:_('Hours of day')}" />
-                <label value="@{calendarController.editionController.hoursOfDay}" />
+                <label value="${i18n:_('Workable time')}" />
+                <label value="@{calendarController.editionController.workableTime}" />
             </hbox>
 
         </vbox>