Changeset 17841

Timestamp:

08/07/08 03:12:59 (3 weeks ago)

Author:

sjmittal

Message:

fix for 5794
update the schedule work based on the work for assigned resource of summary tasks too

Files:

• trunk/core/src/net/project/schedule/TaskList.java (modified) (3 diffs)

trunk/core/src/net/project/schedule/TaskList.java

@@ -27 +27 @@
-import java.util.Map;
-
+import net.project.resource.Assignment;
+import net.project.resource.AssignmentList;
+import net.project.resource.ScheduleEntryAssignment;
-import net.project.util.TimeQuantity;
-import net.project.util.TimeQuantityUnit;
@@ -73 +76 @@
-            totalWork = totalWork.add(ScheduleTimeQuantity.convertToHour(entry.getWorkTQ()));
-            totalWorkComplete = totalWorkComplete.add(ScheduleTimeQuantity.convertToHour(entry.getWorkCompleteTQ()));
-
+
+
+
+
+
+
+
+
+
-
-        if (entry.getStartTime() != null && (earliestStartDate == null || entry.getStartTime().before(earliestStartDate))) {
@@ -100 +111 @@
-                totalWork = totalWork.subtract(ScheduleTimeQuantity.convertToHour(entry.getWorkTQ()));
-                totalWorkComplete = totalWorkComplete.subtract(entry.getWorkCompleteTQ());
+            } else {
+                //sjmittal: just remove the work for the resource assigned
+                for (Iterator it = entry.getAssignments().iterator(); it.hasNext();) {
+                    ScheduleEntryAssignment nextAssignment = (ScheduleEntryAssignment) it.next();
+                    totalWork = totalWork.subtract(nextAssignment.getWork());
+                    totalWorkComplete = totalWorkComplete.subtract(nextAssignment.getWorkComplete());
+                }
-            }
-