RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr60S19TimeUnitDataType: Switch day assignment hours to EffortDuration.

Browse source 
This changes must be applied to the database:

ALTER TABLE day_assignment RENAME COLUMN hours to duration;
update day_assignment SET duration = duration * 3600;
This commit is contained in:
Óscar González Fernández 2010-08-13 15:39:06 +02:00
parent f035387573
commit 17d43e7f40
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
View file

@ -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() {

3
navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
View file

@ -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"/>