Changeset 433 for trunk

Timestamp:

Mar 7, 2010, 4:45:10 PM (15 years ago)

Author:

gav

Message:

Add create unsheduled task feature.
Refactor task priorities.
Limit task types and priorites during task creation.
Add work around for show and edit navigation links in task views.

Location:

trunk/grails-app

Files:

• conf/Config.groovy (modified) (1 diff)
• controllers/TaskDetailedController.groovy (modified) (7 diffs)
• services/CreateDataService.groovy (modified) (1 diff)
• services/TaskService.groovy (modified) (3 diffs)
• views/taskDetailed/create.gsp (modified) (2 diffs)
• views/taskDetailed/createUnscheduled.gsp (added)

trunk/grails-app/conf/Config.groovy

@@ -148 +148 @@
             [order:11, controller:'taskDetailed', title:'Calendar', action:'searchCalendar', isVisible: { true }],
             [order:20, controller:'taskDetailed', title:'+Scheduled', action:'create', isVisible: { true }],
-            [order:30, controller:'taskDetailed', title:'+Callout', action:'createImmediateCallout', isVisible: { true }],
-            [order:90, controller:'taskDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
-            [order:91, controller:'taskDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+            [order:30, controller:'taskDetailed', title:'+Unsheduled', action:'createUnscheduled', isVisible: { true }],
+            [order:40, controller:'taskDetailed', title:'+Callout', action:'createImmediateCallout', isVisible: { true }],
+            [order:90, controller:'taskDetailed', title:'Show', action:'show', id:'nav', isVisible: { params.action == 'show' }],
+            [order:91, controller:'taskDetailed', title:'Edit', action:'edit', id:'nav', isVisible: { params.action == 'edit' }]
         ]
     ],

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -219 +219 @@
         if(params._action_Show)
             params.action='show'
+
+        // Used by navigation.
+        if(params.id == 'nav') {
+            params.id = session.currentTaskId ?: null
+            redirect(action: show, id: params.id)
+            return
+        }
 
         def showTab = [:]
@@ -245 +252 @@
         }
         else {
+            // Remember the current task id for use with navigation.
+            session.currentTaskId = params.id
+
             params.max = 10
             params.order = "desc"
@@ -477 +487 @@
             params.action='edit'
 
+        // Used by navigation.
+        if(params.id == 'nav') {
+            params.id = session.currentTaskId ?: null
+            redirect(action: edit, id: params.id)
+            return
+        }
+
         def taskInstance = Task.get( params.id )
 
@@ -484 +501 @@
         }
         else {
+            // Remember the current task id for use with navigation.
+            session.currentTaskId = params.id
+
             if(taskInstance.trash) {
                 flash.message = "You may not edit tasks that are in the trash."
@@ -524 +544 @@
         taskInstance.leadPerson = authService.currentUser
         taskInstance.properties = params
-        return ['taskInstance': taskInstance]
+
+        def scheduledTaskTypes = taskService.scheduledTaskTypes
+        def scheduledTaskPriorities = taskService.scheduledTaskPriorities
+        taskInstance.taskPriority = scheduledTaskPriorities.default
+        return ['taskInstance': taskInstance,
+                    'scheduledTaskTypes': scheduledTaskTypes,
+                    'scheduledTaskPriorities': scheduledTaskPriorities.list]
     }
 
@@ -540 +566 @@
             flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
 
-        render(view:'create', model:[taskInstance:result.taskInstance])
+
+        def scheduledTaskTypes = taskService.scheduledTaskTypes
+        def scheduledTaskPriorities = taskService.scheduledTaskPriorities
+        render(view:'create', model:[taskInstance:result.taskInstance,
+                                                    'scheduledTaskTypes': scheduledTaskTypes,
+                                                    'scheduledTaskPriorities': scheduledTaskPriorities.list])
     }
 
@@ -591 +622 @@
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
+    def createUnscheduled = {
+        def taskInstance = new Task()
+
+        // Default leadPerson to current user, unless supplied in params.
+        taskInstance.leadPerson = authService.currentUser
+        taskInstance.properties = params
+
+        // Always for Unscheduled task.
+        taskInstance.taskType = TaskType.get(2) // Unscheduled Breakin.
+        def unscheduledTaskPriorities = taskService.unscheduledTaskPriorities
+        taskInstance.taskPriority = unscheduledTaskPriorities.default
+
+        return ['taskInstance': taskInstance, 'unscheduledTaskPriorities': unscheduledTaskPriorities.list]
+    }
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
+    def saveUnscheduled = {
+        def result = taskService.saveUnscheduled(params)
+
+        if(!result.error) {
+            flash.message = "Task ${result.taskInstance.id} created."
+            redirect(action: 'show', id: result.taskInstance.id)
+            return
+        }
+
+        if(result.error.code == "task.modifications.failedToSave")
+            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+
+        def unscheduledTaskPriorities = taskService.unscheduledTaskPriorities
+
+        render(view:'createUnscheduled',
+                    model: ['taskInstance': result.taskInstance, 'unscheduledTaskPriorities': unscheduledTaskPriorities.list])
+    }
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
     def createImmediateCallout = {
         def taskInstance = new Task()

trunk/grails-app/services/CreateDataService.groovy

@@ -702 +702 @@
         def taskPriorityInstance
 
-        taskPriorityInstance = new TaskPriority(name:"Normal") // #1
+        taskPriorityInstance = new TaskPriority(name:"0 - Immediate") // #1
         saveAndTest(taskPriorityInstance)
 
-        taskPriorityInstance = new TaskPriority(name:"Low") // #2
+        taskPriorityInstance = new TaskPriority(name:"1 - Very High") // #2
         saveAndTest(taskPriorityInstance)
 
-        taskPriorityInstance = new TaskPriority(name:"High") // #3
+        taskPriorityInstance = new TaskPriority(name:"2 - High") // #3
         saveAndTest(taskPriorityInstance)
 
-        taskPriorityInstance = new TaskPriority(name:"Immediate") // #4
+        taskPriorityInstance = new TaskPriority(name:"3 - Normal") // #4
+        saveAndTest(taskPriorityInstance)
+
+        taskPriorityInstance = new TaskPriority(name:"4 - Low") // #5
+        saveAndTest(taskPriorityInstance)
+
+        taskPriorityInstance = new TaskPriority(name:"5 - Minor") //  #6
         saveAndTest(taskPriorityInstance)
     }

trunk/grails-app/services/TaskService.groovy

@@ -29 +29 @@
 
     /**
+    * Determines and returns a list of possible task types for scheduled tasks.
+    * @returns A list of the possible task types.
+    */
+    def getScheduledTaskTypes() {
+        def criteria = TaskType.createCriteria()
+        def scheduledTaskTypes = criteria {
+            and {
+                eq('isActive', true)
+                gt('id', 2L)
+                }
+        }
+    }
+
+    /**
+    * Determines and returns a list of possible task priorites for Scheduled tasks.
+    * @returns A list of the possible task priorites.
+    */
+    def getScheduledTaskPriorities() {
+        def criteria = TaskPriority.createCriteria()
+        def scheduledTaskPriorities = [:]
+        scheduledTaskPriorities.list = criteria {
+            and {
+                eq('isActive', true)
+                gt('id', 1L)
+                }
+        }
+        scheduledTaskPriorities.default = scheduledTaskPriorities.list.find { it.id == 4L } //  1-Normal.
+        return scheduledTaskPriorities
+    }
+
+    /**
+    * Determines and returns a list of possible task priorites for Unscheduled tasks.
+    * @returns A map containing a list of the possible task priorites and the default priority.
+    */
+    def getUnscheduledTaskPriorities() {
+        def criteria = TaskPriority.createCriteria()
+        def unscheduledTaskPriorities = [:]
+        unscheduledTaskPriorities.list = criteria {
+            and {
+                eq('isActive', true)
+                lt('id', 5L)
+                ne('id', 1L)
+            }
+        }
+        unscheduledTaskPriorities.default = unscheduledTaskPriorities.list.find { it.id == 3L } // 2-High.
+        return unscheduledTaskPriorities
+    }
+
+    /**
     * Creates a new task with the given params.
     * @param params The params to use when creating the new task.
@@ -646 +695 @@
 
     /**
+    * Creates a new unscheduled breakin task with the given params.
+    * @param params The params to use when creating the new task.
+    * @returns A map containing result.error (if any error) and result.taskInstance.
+    */
+    def saveUnscheduled(params) {
+        Task.withTransaction { status ->
+            def result = [:]
+
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                if(result.taskInstance && m.field)
+                    result.taskInstance.errors.rejectValue(m.field, m.code)
+                result.error = [ code: m.code, args: ["Task", params.id] ]
+                return result
+            }
+
+            // If not supplied.
+            if(!params.taskStatus)
+                params.taskStatus = TaskStatus.get(1) // Not Started.
+
+            result.taskInstance = new Task(params)
+
+            // Always for an unscheduled breakin..
+            result.taskInstance.taskType = TaskType.get(2) // Unscheduled Breakin.
+            result.taskInstance.taskBudgetStatus = TaskBudgetStatus.get(1) // Unplanned.
+
+            if(result.taskInstance.hasErrors() || !result.taskInstance.save())
+                fail(code:"default.create.failure")
+
+            if(!result.error) {
+                def taskModification = new TaskModification(person: authService.currentUser,
+                                                                taskModificationType: TaskModificationType.get(1), // Created.
+                                                                task: result.taskInstance)
+
+                if(taskModification.hasErrors() || !taskModification.save())
+                    fail(field:"taskModifications", code:"task.modifications.failedToSave")
+            }
+
+            // Success.
+            return result
+
+        } //end withTransaction
+    } // end saveUnscheduled()
+
+    /**
     * Creates a new immediate callout task with the given params.
     * @param params The params to use when creating the new task.
@@ -671 +765 @@
             result.taskInstance.taskType = TaskType.get(1) // Immediate Callout.
             result.taskInstance.taskBudgetStatus = TaskBudgetStatus.get(1) // Unplanned.
-            result.taskInstance.taskPriority = TaskPriority.get(4) // Immediate.
+            result.taskInstance.taskPriority = TaskPriority.get(1) // Immediate.
             result.taskInstance.taskGroup = TaskGroup.get(1) // Engineering Activites.
             result.taskInstance.approved = true

trunk/grails-app/views/taskDetailed/create.gsp

@@ -104 +104 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                    <g:select optionKey="id" from="${scheduledTaskPriorities}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
                                 </td>
                             </tr>
@@ -140 +140 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
-                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                    <g:select optionKey="id" from="${scheduledTaskTypes}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
                                 </td>
                             </tr>