Changeset 838 for trunk/grails-app/controllers

Timestamp:

Mar 3, 2011, 11:17:40 PM (14 years ago)

Author:

gav

Message:

Update service, controller and view logic to hand Task and Entry highestSeverity.
Also remove associatedAssets from task search panes.

Location:

trunk/grails-app/controllers

Files:

• EntryDetailedController.groovy (modified) (2 diffs)
• TaskDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -67 +67 @@
     }
 
+    /// @todo: Refactor to taskService and include moving task to "In Progress" when Entry.duration is updated.
     def update = {
         def entryInstance = Entry.get( params.id )
@@ -74 +75 @@
                 entryInstance.properties = params
                 if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
+                    // If PM Entry update task.highestSeverity
+                    if(entryInstance.entryType.id == 6) {
+                        def clist = []
+                        entryInstance.task.entries.each { entry ->
+                            if(entry.entryType.id == 6)
+                                clist << entry.highestSeverity
+                        }
+
+                        if(clist)
+                            entryInstance.task.highestSeverity = clist.sort{p1,p2 -> p2.id <=> p1.id}[0]
+                    }
                     flash.message = "Entry ${params.id} updated"
                     redirect(action:show,id:entryInstance.id)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -185 +185 @@
         associatedPropertyValues.taskGroupList = TaskGroup.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
         associatedPropertyValues.assetList = Asset.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        def highestSeverityCodeQuery = 'select distinct cs.code from ConditionSeverity cs where cs.isActive = ? order by cs.code'
+        associatedPropertyValues.highestSeverityList = ConditionSeverity.executeQuery(highestSeverityCodeQuery, [true], [max:associatedPropertyMax])
         associatedPropertyValues.taskStatusList = TaskStatus.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
         associatedPropertyValues.taskTypeList = TaskType.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
@@ -342 +344 @@
         associatedPropertyValues.taskGroupList = TaskGroup.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
         associatedPropertyValues.assetList = Asset.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        def highestSeverityCodeQuery = 'select distinct cs.code from ConditionSeverity cs where cs.isActive = ? order by cs.code'
+        associatedPropertyValues.highestSeverityList = ConditionSeverity.executeQuery(highestSeverityCodeQuery, [true], [max:associatedPropertyMax])
         associatedPropertyValues.taskStatusList = TaskStatus.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
         associatedPropertyValues.taskTypeList = TaskType.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])