From 17d43e7f40b460345e000ead408a78cf74f42fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 13 Aug 2010 15:39:06 +0200
Subject: [PATCH] ItEr60S19TimeUnitDataType: Switch day assignment hours to
 EffortDuration.

This changes must be applied to the database:

ALTER TABLE day_assignment RENAME COLUMN hours to duration;
update day_assignment SET duration = duration * 3600;
---
 .../business/planner/entities/DayAssignment.java     | 12 ++++++------
 .../planner/entities/ResourceAllocations.hbm.xml     |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
index 0a256b3f3..d1c3e0810 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
@@ -29,12 +29,11 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.Validate;
-import org.hibernate.validator.Min;
 import org.hibernate.validator.NotNull;
 import org.joda.time.LocalDate;
 import org.navalplanner.business.common.BaseEntity;
@@ -43,6 +42,8 @@ import org.navalplanner.business.scenarios.entities.Scenario;
 import org.navalplanner.business.util.deepcopy.AfterCopy;
 import org.navalplanner.business.util.deepcopy.OnCopy;
 import org.navalplanner.business.util.deepcopy.Strategy;
+import org.navalplanner.business.workingday.EffortDuration;
+import org.navalplanner.business.workingday.EffortDuration.Granularity;
 
 public abstract class DayAssignment extends BaseEntity {
 
@@ -158,8 +159,7 @@ public abstract class DayAssignment extends BaseEntity {
         return result;
     }
 
-    @Min(0)
-    private int hours;
+    private EffortDuration duration;
 
     @NotNull
     private LocalDate day;
@@ -179,12 +179,12 @@ public abstract class DayAssignment extends BaseEntity {
         Validate.isTrue(hours >= 0);
         Validate.notNull(resource);
         this.day = day;
-        this.hours = hours;
+        this.duration = EffortDuration.elapsing(hours, Granularity.HOURS);
         this.resource = resource;
     }
 
     public int getHours() {
-        return hours;
+        return duration.getHours();
     }
 
     public Resource getResource() {
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
index 5deeff1f3..2d4f0f577 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
@@ -222,7 +222,8 @@
 
         <version name="version" access="property" type="long" />
 
-        <property name="hours" not-null="true"/>
+        <property name="duration" not-null="true"
+            type="org.navalplanner.business.workingday.hibernate.EffortDurationType"/>
 
         <property name="consolidated" access="field"/>