Changeset 252 for trunk/grails-app/services

Timestamp:

Dec 28, 2009, 5:00:59 AM (16 years ago)

Author:

gav

Message:

Added TaskBudgetStatus as per ticket #49.

Location:

trunk/grails-app/services

Files:

• CreateDataService.groovy (modified) (2 diffs)
• TaskSearchService.groovy (modified) (2 diffs)
• TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/CreateDataService.groovy

@@ -64 +64 @@
         createBaseTaskStatus()
         createBaseTaskPriorities()
+        createBaseTaskBudgetStatus()
         createBaseTaskTypes()
         createBaseTaskModificationTypes()
@@ -499 +500 @@
     }
 
+    def createBaseTaskBudgetStatus() {
+
+        //TaskBudgetStatus
+        def taskBudgetStatusInstance
+
+        taskBudgetStatusInstance = new TaskBudgetStatus(name:"Unplanned") // #1
+        saveAndTest(taskBudgetStatusInstance)
+
+        taskBudgetStatusInstance = new TaskBudgetStatus(name:"Planned") // #2
+        saveAndTest(taskBudgetStatusInstance)
+    }
+
     def createBaseTaskTypes() {
 

trunk/grails-app/services/TaskSearchService.groovy

@@ -87 +87 @@
             sort: params.sort,
             order: params.order) {
-                ne("taskType", TaskType.findByName("Unscheduled Breakin"))
+                eq("taskBudgetStatus", TaskBudgetStatus.get(2))
                 ge("targetStartDate", dateUtilService.oneWeekAgo)
-                lt("targetStartDate", dateUtilService.getTomorrow())
+                lt("targetStartDate", dateUtilService.tomorrow)
                 eq("trash", false)
             }
@@ -105 +105 @@
             sort: params.sort,
             order: params.order) {
-                eq("taskType", TaskType.findByName("Unscheduled Breakin"))
+                eq("taskBudgetStatus", TaskBudgetStatus.get(1))
                 ge("targetStartDate", dateUtilService.oneWeekAgo)
                 lt("targetStartDate", dateUtilService.getTomorrow())

trunk/grails-app/services/TaskService.groovy

@@ -38 +38 @@
             // Default status to "not started" if not supplied.
             params.taskStatus = params.taskStatus ?: TaskStatus.get(1)
+
+            // Set budgetStatus.
+            if(params.taskType?.id?.toLong() == 1) // Unscheduled Breakin.
+                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(1) // Unplanned.
+            else
+                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(2) // Planned.
+
             def taskInstance = new Task(params)
             result.taskInstance = taskInstance