Changeset 255

Timestamp:

Jan 4, 2010, 8:13:03 AM (14 years ago)

Author:

gav

Message:

Add ajax feature to show groups for person when creating and editing assignedPerson.
Remove the list and show detailed views since they are no longer used.

Location:

trunk/grails-app

Files:

• controllers/AssignedPersonDetailedController.groovy (modified) (6 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssignedPersonService.groovy (modified) (7 diffs)
• views/assignedPersonDetailed/_groupsForPerson.gsp (added)
• views/assignedPersonDetailed/create.gsp (modified) (3 diffs)
• views/assignedPersonDetailed/edit.gsp (modified) (2 diffs)
• views/assignedPersonDetailed/list.gsp (deleted)
• views/assignedPersonDetailed/show.gsp (deleted)

trunk/grails-app/controllers/AssignedPersonDetailedController.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 = assignedPersonService.list(params)
-            if(!result.error) {
-                return [ assignedPersonInstanceList: result.assignedPersonInstanceList,
-                                assignedPersonInstanceTotal: result.assignedPersonInstanceTotal ]
-            }
-
-            flash.message = g.message(code: result.error.code, args: result.error.args)
-            redirect( controller: "appCore", action: "start" )
-    }
-
-    def show = {
-        def result = assignedPersonService.show(params)
-
-        if(!result.error)
-            return [ assignedPersonInstance: result.assignedPersonInstance ]
-
-        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 = assignedPersonService.edit(params)
 
-        if(!result.error)
-            return [ assignedPersonInstance : result.assignedPersonInstance ]
+        if(!result.error) {
+            return [assignedPersonInstance: result.assignedPersonInstance,
+                            person: result.person,
+                            groupsForPerson: result.groupsForPerson]
+        }
 
         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: ["AssignedPerson", params.id])
-            redirect(action:show, id: params.id)
+            redirect(controller:"taskDetailed", action:"show", id: result.assignedPersonInstance.task.id)
             return
         }
@@ -84 +62 @@
         }
 
-        render(view:'edit', model:[assignedPersonInstance: result.assignedPersonInstance.attach()])
+        if(result.error.code == "person.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:[assignedPersonInstance: result.assignedPersonInstance.attach(),
+                                                person: result.person.attach(),
+                                                groupsForPerson: result.groupsForPerson])
     }
 
@@ -90 +76 @@
         def result = assignedPersonService.create(params)
 
-        if(!result.error)
-            return [assignedPersonInstance: result.assignedPersonInstance]
+        if(!result.error) {
+            return [assignedPersonInstance: result.assignedPersonInstance,
+                            person: result.person,
+                            groupsForPerson: result.groupsForPerson]
+        }
 
         if(result.error.code == "assignedPerson.task.not.found") {
@@ -112 +101 @@
         }
 
-        render(view:'edit', model:[assignedPersonInstance: result.assignedPersonInstance])
+        if(result.error.code == "person.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:[assignedPersonInstance: result.assignedPersonInstance,
+                                                person: result.person.attach(),
+                                                groupsForPerson: result.groupsForPerson])
+    }
+
+    def groupsForPerson = {
+        def result = assignedPersonService.groupsForPerson(params)
+
+        if(!result.error) {
+            render ( template:"groupsForPerson",
+                            model: [person: result.person, groupsForPerson: result.groupsForPerson] )
+            return
+        }
+
+        render {
+            div(id:"groupsForPerson", g.message(code: result.error.code, args: result.error.args) )
+        }
+
     }
 

trunk/grails-app/i18n/messages.properties

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

trunk/grails-app/services/AssignedPersonService.groovy

@@ -4 +4 @@
 
     def personService
-
-    def list(params) {
-        def result = [:]
-        def fail = { Map m ->
-            result.error = [ code: m.code, args: ["AssignedPerson"] ]
-            return result
-        }
-
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        result.assignedPersonInstanceList = AssignedPerson.list(params)
-        result.assignedPersonInstanceTotal = AssignedPerson.count()
-
-        if(!result.assignedPersonInstanceList || !result.assignedPersonInstanceTotal)
-            return fail(code:"default.list.failure")
-
-        // Success.
-        return result
-    }
-
-    def show(params) {
-        def result = [:]
-        def fail = { Map m ->
-            result.error = [ code: m.code, args: ["AssignedPerson", params.id] ]
-            return result
-        }
-
-        result.assignedPersonInstance = AssignedPerson.get(params.id)
-
-        if(!result.assignedPersonInstance)
-            return fail(code:"default.not.found")
-
-        // Success.
-        return result
-    }
 
     def delete(params) {
@@ -86 +52 @@
             return fail(code:"default.not.found")
 
+        result.person = result.assignedPersonInstance.person
+        result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
         // Success.
         return result
@@ -101 +70 @@
                 return result
             }
+
+            result.person = Person.get(params.person.id)
+
+            // Prevent a null property reference.
+            if(!result.person)
+                return fail(code:"person.not.found")
+
+            result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
 
             result.assignedPersonInstance = AssignedPerson.get(params.id)
@@ -144 +121 @@
         result.assignedPersonInstance.properties = params
 
-        // success
+        result.person = Person.list().sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }[0] // Get the first result.
+        result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
+        // Success.
         return result
     }
@@ -153 +133 @@
 
             def fail = { Map m ->
+                status.setRollbackOnly()
                 if(result.assignedPersonInstance && m.field)
                     result.assignedPersonInstance.errors.rejectValue(m.field, m.code)
@@ -159 +140 @@
             }
 
-            result.assignedPersonInstance = new AssignedPerson(params)
+            result.person = Person.get(params.person.id)
+
+            // Prevent a null property reference.
+            if(!result.person)
+                return fail(code:"person.not.found")
+
+            result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
+            result.assignedPersonInstance = new AssignedPerson()
+            result.assignedPersonInstance.properties = params
 
             if(result.assignedPersonInstance.hasErrors() || !result.assignedPersonInstance.save())
@@ -180 +170 @@
     } // end save()
 
+    def groupsForPerson(params) {
+        def result = [:]
+
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: ["Person", params.person?.id] ]
+            return result
+        }
+
+        result.person = Person.get(params.person?.id)
+
+        if(!result.person)
+            return fail(code:"default.not.found")
+
+        result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
+        // Success.
+        return result
+    }
+
 } // end class

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

@@ -5 +5 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create AssignedPerson</title>         
+        <title>Create AssignedPerson</title>
     </head>
     <body>
@@ -42 +42 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'person','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Person.list().sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }}"
+                                                        name="person.id"
+                                                        value="${assignedPersonInstance?.person?.id}"
+                                                        onchange="${remoteFunction(action:'groupsForPerson', update:'groupsForPerson', params: '\'person.id=\' + this.value' )}">
+                                    </g:select>
                                 </td>
-                            </tr> 
+                            </tr>
                         
                             <tr class="prop">
@@ -70 +75 @@
                 </div>
             </g:form>
+
+            <br />
+
+            <div id="groupsForPerson" class="dialog">
+                <g:render template="groupsForPerson" />
+            </div>
+
         </div>
     </body>

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

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