Changeset 833 for trunk/grails-app/controllers

Timestamp:

Mar 3, 2011, 12:24:01 PM (13 years ago)

Author:

gav

Message:

AJAX Work Done and PM Entry, second draft.

Location:

trunk/grails-app/controllers

Files:

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

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -31 +31 @@
         if(entryInstance) {
             if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) {
-                def taskID = entryInstance.task.id
+                def taskId = entryInstance.task.id
                 entryInstance.delete(flush:true)
                 flash.message = "Entry ${params.id} deleted"
-                redirect(controller: 'taskDetailed', action: 'show', id: taskID)
+                redirect(controller: 'taskDetailed', action: 'show', id: taskId)
             }
             else {
@@ -94 +94 @@
     def ajaxCreate = {
         if(!params.taskId || !params.entryTypeId) {
-            flash.message = g.message(code:"entry.create.no.params")
-            redirect(controller:"taskDetailed", action:"search")
+            response.status = 403
+            params.errorMessage = g.message(code: "entry.create.no.params.ajax")
+            render(template: "/shared/messages")
             return
         }
@@ -102 +103 @@
 
         if(!taskInstance) {
-            flash.message = g.message(code:"task.notFound")
-            redirect(controller:"taskDetailed", action:"search")
+            response.status = 403
+            params.errorMessage = g.message(code:"default.not.found", args:['Task',params.taskId])
+            render(template: "/shared/messages")
             return
         }
@@ -109 +111 @@
         // Check for Complete task.
         if(taskInstance.taskStatus.id == 3) {
-            flash.errorMessage = g.message(code:"task.operationNotPermittedOnCompleteTask")
-            redirect(controller:"taskDetailed", action:"show", id: taskInstance.id)
+            response.status = 403
+            params.errorMessage = g.message(code:"task.operationNotPermittedOnCompleteTask")
+            render(template: "/shared/messages")
             return
         }
 
+        // Success.
         def entryInstance = new Entry()
         entryInstance.task = taskInstance
@@ -119 +123 @@
         render(template: "create", model: ['entryInstance': entryInstance])
     }
+
+    def ajaxSave = {
+        def result = taskService.saveEntry(params)
+
+        // Success.
+        if(!result.error) {
+            def entryList = Entry.withCriteria {
+                                                                eq("entryType", result.entryInstance.entryType)
+                                                                task {
+                                                                    idEq(result.taskId)
+                                                                }
+                                                        }
+            render(template: "list", model: ['entryList': entryList])
+            return
+        }
+
+        if(result.error.code != "default.create.failure") {
+            response.status = 403
+            params.errorMessage = g.message(code: result.error.code)
+            render(template: "/shared/messages")
+            return
+        }
+
+        response.status = 403
+        render(template: "create", model: ['entryInstance': result.entryInstance])
+    } // ajaxSave
 
     def create = {

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -424 +424 @@
                                                         }
 
+            def entryPMList = Entry.withCriteria {
+                                                                eq("entryType", EntryType.get(6))
+                                                                eq("task", taskInstance)
+                                                        }
+
             def subTaskInstanceList = Task.findAllByParentTaskAndTrash(taskInstance, false, params)
             def subTaskInstanceTotal = Task.countByParentTaskAndTrash(taskInstance, false)
@@ -450 +455 @@
                             entryCauseList: entryCauseList,
                             entryWorkDoneList: entryWorkDoneList,
+                            entryPMList: entryPMList,
                             taskProcedureRevision: taskProcedureRevision,
                             taskProcedureExits: taskProcedureExits,