Changeset 254

Timestamp:

Dec 30, 2009, 4:33:42 AM (15 years ago)

Author:

gav

Message:

Add ajax feature to show persons in the group when creating and editing assignedGroup.
Remove the list and show detailed views since they are no longer used.

Location:

trunk/grails-app

Files:

• controllers/AssignedGroupDetailedController.groovy (modified) (6 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssignedGroupService.groovy (modified) (8 diffs)
• views/assignedGroupDetailed/_personsInGroup.gsp (added)
• views/assignedGroupDetailed/create.gsp (modified) (3 diffs)
• views/assignedGroupDetailed/edit.gsp (modified) (2 diffs)
• views/assignedGroupDetailed/list.gsp (deleted)
• views/assignedGroupDetailed/show.gsp (deleted)

trunk/grails-app/controllers/AssignedGroupDetailedController.groovy

@@ -12 +12 @@
     // the delete, save and update actions only accept POST requests
     static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-            def result = assignedGroupService.list(params)
-            if(!result.error) {
-                return [ assignedGroupInstanceList: result.assignedGroupInstanceList,
-                                assignedGroupInstanceTotal: result.assignedGroupInstanceTotal ]
-            }
-
-            flash.message = g.message(code: result.error.code, args: result.error.args)
-            redirect( controller: "appCore", action: "start" )
-    }
-
-    def show = {
-        def result = assignedGroupService.show(params)
-
-        if(!result.error)
-            return [ assignedGroupInstance: result.assignedGroupInstance ]
-
-        flash.message = g.message(code: result.error.code, args: result.error.args)
-
-        if(params.task?.id)
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
-
-        redirect(controller:"taskDetailed", action:"search")
-    }
 
     def delete = {
@@ -60 +35 @@
         def result = assignedGroupService.edit(params)
 
-        if(!result.error)
-            return [ assignedGroupInstance : result.assignedGroupInstance ]
+        if(!result.error) {
+            return [assignedGroupInstance: result.assignedGroupInstance,
+                            personGroup: result.personGroup,
+                            personsInGroup: result.personsInGroup]
+        }
 
         flash.message = g.message(code: result.error.code, args: result.error.args)
@@ -74 +52 @@
         if(!result.error) {
             flash.message = g.message(code: "default.update.success", args: ["AssignedGroup", params.id])
-            redirect(action:show, id: params.id)
+            redirect(controller:"taskDetailed", action:"show", id: result.assignedGroupInstance.task.id)
             return
         }
@@ -84 +62 @@
         }
 
-        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance.attach()])
+        if(result.error.code == "personGroup.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(action:"edit", id: params.id)
+            return
+        }
+
+        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance.attach(),
+                                                personGroup: result.personGroup.attach(),
+                                                personsInGroup: result.personsInGroup])
     }
 
@@ -90 +76 @@
         def result = assignedGroupService.create(params)
 
-        if(!result.error)
-            return [assignedGroupInstance: result.assignedGroupInstance]
+        if(!result.error) {
+            return [assignedGroupInstance: result.assignedGroupInstance,
+                            personGroup: result.personGroup,
+                            personsInGroup: result.personsInGroup]
+        }
 
         if(result.error.code == "assignedGroup.task.not.found") {
@@ -112 +101 @@
         }
 
-        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance])
+        if(result.error.code == "personGroup.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(action:"create", params:["task.id": params.task?.id])
+            return
+        }
+
+        render(view:'create', model:[assignedGroupInstance: result.assignedGroupInstance,
+                                                personGroup: result.personGroup.attach(),
+                                                personsInGroup: result.personsInGroup])
+    }
+
+    def personsInGroup = {
+        def result = assignedGroupService.personsInGroup(params)
+
+        if(!result.error) {
+            render ( template:"personsInGroup",
+                            model: [personGroup: result.personGroup, personsInGroup: result.personsInGroup] )
+            return
+        }
+
+        render {
+            div(id:"personsInGroup", g.message(code: result.error.code, args: result.error.args) )
+        }
+
     }
 

trunk/grails-app/i18n/messages.properties

@@ -52 +52 @@
 
 taskRecurringSchedule.notFound=Could not complete operation, recurring schedule not found.
+personGroup.not.found=Person Group not found, it may have been deleted.
 
 task.assignedGroups=Assigned Groups

trunk/grails-app/services/AssignedGroupService.groovy

@@ -4 +4 @@
 
     def personService
-
-    def list(params) {
-        def result = [:]
-        def fail = { Map m ->
-            result.error = [ code: m.code, args: ["AssignedGroup"] ]
-            return result
-        }
-
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        result.assignedGroupInstanceList = AssignedGroup.list(params)
-        result.assignedGroupInstanceTotal = AssignedGroup.count()
-
-        if(!result.assignedGroupInstanceList || !result.assignedGroupInstanceTotal)
-            return fail(code:"default.list.failure")
-
-        // Success.
-        return result
-    }
-
-    def show(params) {
-        def result = [:]
-        def fail = { Map m ->
-            result.error = [ code: m.code, args: ["AssignedGroup", params.id] ]
-            return result
-        }
-
-        result.assignedGroupInstance = AssignedGroup.get(params.id)
-
-        if(!result.assignedGroupInstance)
-            return fail(code:"default.not.found")
-
-        // Success.
-        return result
-    }
 
     def delete(params) {
@@ -86 +52 @@
             return fail(code:"default.not.found")
 
+        result.personGroup = result.assignedGroupInstance.personGroup
+        result.personsInGroup = result.personGroup.persons
+
         // Success.
         return result
@@ -101 +70 @@
                 return result
             }
+
+            result.personGroup = PersonGroup.get(params.personGroup.id)
+
+            // Prevent a null property reference.
+            if(!result.personGroup)
+                return fail(code:"personGroup.not.found")
+
+            result.personsInGroup = result.personGroup.persons
 
             result.assignedGroupInstance = AssignedGroup.get(params.id)
@@ -144 +121 @@
         result.assignedGroupInstance.properties = params
 
+        result.personGroup = PersonGroup.list().sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name)}[0] // Get the first result.
+        result.personsInGroup = result.personGroup.persons
+
         // success
         return result
@@ -153 +133 @@
 
             def fail = { Map m ->
+                status.setRollbackOnly()
                 if(result.assignedGroupInstance && m.field)
                     result.assignedGroupInstance.errors.rejectValue(m.field, m.code)
@@ -159 +140 @@
             }
 
-            result.assignedGroupInstance = new AssignedGroup(params)
+            result.personGroup = PersonGroup.get(params.personGroup.id)
+
+            // Prevent a null property reference.
+            if(!result.personGroup)
+                return fail(code:"personGroup.not.found")
+
+            result.personsInGroup = result.personGroup.persons
+
+            result.assignedGroupInstance = new AssignedGroup()
+            result.assignedGroupInstance.properties = params
 
             if(result.assignedGroupInstance.hasErrors() || !result.assignedGroupInstance.save())
                 return fail(code:"default.create.failure")
 
-            // Record a taskModification for every one except "system".
+            // Record a taskModification for everyone except "system".
             if(personService.currentUser.id != 1) {
                 def taskModification = new TaskModification(person: personService.currentUser,
@@ -174 +164 @@
             }
 
-            // success
+            // Success.
             return result
 
@@ -180 +170 @@
     } // end save()
 
+    def personsInGroup(params) {
+        def result = [:]
+
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: ["PersonGroup", params.personGroup?.id] ]
+            return result
+        }
+
+        result.personGroup = PersonGroup.get(params.personGroup?.id)
+
+        if(!result.personGroup)
+            return fail(code:"default.not.found")
+
+        result.personsInGroup = result.personGroup.persons
+
+        // Success.
+        return result
+    }
+
 } // end class

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

@@ -6 +6 @@
         <meta name="layout" content="main" />
         <title>Create Assigned Group</title>
+        <g:javascript src="overlayPane.js" />
     </head>
     <body>
@@ -42 +43 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assignedGroupInstance,field:'personGroup','errors')}">
-                                    <g:select optionKey="id" from="${PersonGroup.list()}" name="personGroup.id" value="${assignedGroupInstance?.personGroup?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${PersonGroup.list().sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="personGroup.id"
+                                                        value="${assignedGroupInstance?.personGroup?.id}"
+                                                        onchange="${remoteFunction(action:'personsInGroup', update:'personsInGroup', params: '\'personGroup.id=\' + this.value' )}">
+                                    </g:select>
                                 </td>
                             </tr> 
@@ -66 +72 @@
                     </table>
                 </div>
+
                 <div class="buttons">
                     <span class="button"><input class="save" type="submit" value="Create" /></span>
                 </div>
             </g:form>
+
+            <br />
+
+            <div id="personsInGroup" class="dialog">
+                <g:render template="personsInGroup" />
+            </div>
+
         </div>
     </body>

trunk/grails-app/views/assignedGroupDetailed/edit.gsp

@@ -44 +44 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assignedGroupInstance,field:'personGroup','errors')}">
-                                    <g:select optionKey="id" from="${PersonGroup.list()}" name="personGroup.id" value="${assignedGroupInstance?.personGroup?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${PersonGroup.list().sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="personGroup.id"
+                                                        value="${assignedGroupInstance?.personGroup?.id}"
+                                                        onchange="${remoteFunction(action:'personsInGroup', update:'personsInGroup', params: '\'personGroup.id=\' + this.value' )}">
+                                    </g:select>
                                 </td>
                             </tr>
@@ -72 +77 @@
                 </div>
             </g:form>
+
+            <br />
+
+            <div id="personsInGroup" class="dialog">
+                <g:render template="personsInGroup" />
+            </div>
+
         </div>
     </body>