Changeset 1343

Timestamp:

02/07/09 13:27:03 (8 months ago)

Author:

paul

Message:

Add the performances that were booked on the project to the consumed time.
Make sure that we count the consumed time properly using floats
Update the reslet version to match the latest one used in kauri

Files:

• tupper/trunk/pom.xml (modified) (1 diff)
• tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectResource.java (modified) (1 diff)
• tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectsResource.java (modified) (2 diffs)

tupper/trunk/pom.xml

@@ -6 +6 @@
-    <version.spring>2.5.6</version.spring>
-    <version.jaxrs>1.0</version.jaxrs>
-4318
+5141
-  </properties>
-

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectResource.java

@@ -86 +86 @@
-            int completedTasks = tupper.getTaskManager().findAllDone().size();
-            List<Task> tasks = tupper.getTaskManager().findByProject(proj);
-
+
+
+
+
-            for (Task t : tasks) {
-                List<Performance> performances = tupper.getPerformanceManager().findByTask(t);

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectsResource.java

@@ -117 +117 @@
-                int completedTasks = tupper.getTaskManager().findAllDoneByProject(proj).size();
-                List<Task> tasks = tupper.getTaskManager().findByProject(proj);
+                // Since a project is also a task add the current project to the list of tasks that
+                // will be considered for counting performances
+                tasks.add(proj);
-                ArrayList<Performance> performancesByProject = new ArrayList<Performance>();
-                for (Task t : tasks) {
@@ -124 +127 @@
-                tupper.commit();
-
-in
+floa
-                for (Performance perf : performancesByProject) {
-                    consumedTime += perf.getMon() + perf.getTue() + perf.getWed() +