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

ItEr36S11CUCreacionUnidadesPlanificacionItEr35S12: getWorkHours is calculated from the TaskSource

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-22 21:31:29 +01:00
parent fc3d58f168
commit 93a3624c88
6 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/TaskSource.java
View file

@ -265,4 +265,12 @@ public class TaskSource extends BaseEntity {
public void reloadTask(ITaskElementDAO taskElementDAO) {
taskElementDAO.save(task);
}
public int getTotalHours() {
int result = 0;
for (HoursGroup each : hoursGroups) {
result += each.getWorkingHours();
}
return result;
}
}

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -184,11 +184,6 @@ public class Task extends TaskElement {
return true;
}
@Override
public Integer defaultWorkHours() {
return hoursGroup.getWorkingHours();
}
public Set<GenericResourceAllocation> getGenericResourceAllocations() {
return new HashSet<GenericResourceAllocation>(ResourceAllocation
.getOfType(GenericResourceAllocation.class,

10
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
View file

@ -66,8 +66,6 @@ public abstract class TaskElement extends BaseEntity {
private TaskGroup parent;
protected Integer shareOfHours;
private Set<Dependency> dependenciesWithThisOrigin = new HashSet<Dependency>();
private Set<Dependency> dependenciesWithThisDestination = new HashSet<Dependency>();
@ -77,14 +75,12 @@ public abstract class TaskElement extends BaseEntity {
private TaskSource taskSource;
public Integer getWorkHours() {
if (shareOfHours != null) {
return shareOfHours;
if (taskSource == null) {
return 0;
}
return defaultWorkHours();
return taskSource.getTotalHours();
}
protected abstract Integer defaultWorkHours();
protected void copyPropertiesFrom(TaskElement task) {
this.name = task.getName();
this.notes = task.getNotes();

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java
View file

@ -75,11 +75,6 @@ public class TaskGroup extends TaskElement {
return false;
}
@Override
public Integer defaultWorkHours() {
return getOrderElement().getWorkHours();
}
public void remove(TaskElement taskElement) {
taskElements.remove(taskElement);
}

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java
View file

@ -96,11 +96,6 @@ public class TaskMilestone extends TaskElement {
return new DateTime(startDate.getTime());
}
@Override
public Integer defaultWorkHours() {
return Integer.valueOf(0);
}
@SuppressWarnings("unused")
@AssertTrue(message = "order element associated to a milestone must be null")
private boolean theOrderElementMustBeNull() {

1
navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
View file

@ -9,7 +9,6 @@
</generator>
</id>
<version name="version" access="property" type="long" />
<property name="shareOfHours"></property>
<property name="name" />
<property name="notes"/>
<property name="startDate" type="timestamp" />