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

ItEr60S19TimeUnitDataType: Introduce EffortDuration in CalendarData.

Browse source 
This changes must be applied to the database:

ALTER TABLE hoursperday RENAME TO effortperday;
ALTER TABLE effortperday RENAME COLUMN hours TO effort;
update effortperday set effort = effort * 3600;
This commit is contained in:
Óscar González Fernández 2010-08-13 19:00:13 +02:00
parent 2d546c67b0
commit dbb45934e4
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java
View file

@ -23,11 +23,14 @@ package org.navalplanner.business.calendars.entities;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.daos.ICalendarDataDAO;
import org.navalplanner.business.common.IntegrationEntity;
import org.navalplanner.business.common.Registry;
import org.navalplanner.business.workingday.EffortDuration;
import org.navalplanner.business.workingday.EffortDuration.Granularity;
/**
* Represents the information about the calendar that can change through time.
@ -69,7 +72,7 @@ public class CalendarData extends IntegrationEntity {
}
}
private Map<Integer, Integer> hoursPerDay;
private Map<Integer, EffortDuration> effortPerDay;
private LocalDate expiringDate;
@ -83,14 +86,23 @@ public class CalendarData extends IntegrationEntity {
* Constructor for hibernate. Do not use!
*/
public CalendarData() {
hoursPerDay = new HashMap<Integer, Integer>();
effortPerDay = new HashMap<Integer, EffortDuration>();
for (Days each : Days.values()) {
setHoursForDay(each, null);
}
}
public Map<Integer, Integer> getHoursPerDay() {
return hoursPerDay;
return asHours(effortPerDay);
}
private Map<Integer, Integer> asHours(Map<Integer, EffortDuration> efforts) {
Map<Integer, Integer> result = new HashMap<Integer, Integer>();
for (Entry<Integer, EffortDuration> each : efforts.entrySet()) {
EffortDuration value = each.getValue();
result.put(each.getKey(), value == null ? null : value.getHours());
}
return result;
}
public Integer getHours(Days day) {
@ -108,11 +120,15 @@ public class CalendarData extends IntegrationEntity {
throw new IllegalArgumentException(
"The number of hours for a day can not be negative");
}
hoursPerDay.put(day.ordinal(), hours);
effortPerDay.put(
day.ordinal(),
hours == null ? null :
EffortDuration.elapsing(hours, Granularity.HOURS));
}
private Integer getHoursForDay(Days day) {
return hoursPerDay.get(day.ordinal());
EffortDuration effort = effortPerDay.get(day.ordinal());
return effort == null ? null : effort.getHours();
}
public boolean isDefault(Days day) {
@ -140,8 +156,8 @@ public class CalendarData extends IntegrationEntity {
public CalendarData copy() {
CalendarData copy = create();
copy.hoursPerDay = new HashMap<Integer, Integer>(this.hoursPerDay);
copy.effortPerDay = new HashMap<Integer, EffortDuration>(
this.effortPerDay);
copy.expiringDate = this.expiringDate;
copy.parent = this.parent;

5
navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
View file

@ -94,10 +94,11 @@
<property name="code" access="property" not-null="true" unique="true"/>
<map name="hoursPerDay">
<map name="effortPerDay">
<key column="BASE_CALENDAR_ID"/>
<index column="DAY_ID" type="integer" />
<element column="HOURS" type="integer" />
<element column="EFFORT"
type="org.navalplanner.business.workingday.hibernate.EffortDurationType" />
</map>
<!-- Not indexed -->