Changeset 96 for trunk/src

Timestamp:

Mar 31, 2009, 5:43:09 AM (16 years ago)

Author:

gav

Message:

Implemented the bulk of AssignedPerson? domain

Location:

trunk/src/grails-app

Files:

• conf/BootStrap.groovy (modified) (4 diffs)
• controllers/AssignedPersonController.groovy (added)
• controllers/AssignedPersonDetailedController.groovy (added)
• controllers/BaseAppAdminController.groovy (added)
• controllers/TaskController.groovy (modified) (5 diffs)
• controllers/TaskDetailedController.groovy (modified) (3 diffs)
• domain/AssignedPerson.groovy (added)
• domain/Task.groovy (modified) (1 diff)
• views/assignedPerson (added)
• views/assignedPerson/create.gsp (added)
• views/assignedPerson/edit.gsp (added)
• views/assignedPerson/list.gsp (added)
• views/assignedPerson/show.gsp (added)
• views/assignedPersonDetailed (added)
• views/assignedPersonDetailed/create.gsp (added)
• views/assignedPersonDetailed/edit.gsp (added)
• views/assignedPersonDetailed/list.gsp (added)
• views/assignedPersonDetailed/show.gsp (added)
• views/task/create.gsp (modified) (1 diff)
• views/task/edit.gsp (modified) (5 diffs)
• views/task/list.gsp (modified) (1 diff)
• views/task/show.gsp (modified) (3 diffs)
• views/taskDetailed/edit.gsp (modified) (1 diff)
• views/taskDetailed/show.gsp (modified) (2 diffs)

trunk/src/grails-app/conf/BootStrap.groovy

@@ -215 +215 @@
                  comment:"Has been noted as problematic, try recallibrating")
         BootStrapSaveAndTest(taskInstance)
-        taskInstance.addToAssignedPersons(Person.get(1))
-        taskInstance.addToAssignedPersons(Person.get(2))
 
         subTaskInstance = new Task(taskGroup:TaskGroup.findByName("Engineering Activites"),
@@ -226 +224 @@
                  comment:"Some help required")
         BootStrapSaveAndTest(subTaskInstance)
-        subTaskInstance.addToAssignedPersons(Person.get(1))
         
         //Add task 2 as a subTask of task 1.
@@ -240 +237 @@
                  comment:"Nothing else has worked.")
         BootStrapSaveAndTest(subTaskInstance)
-        subTaskInstance.addToAssignedPersons(Person.get(1))
 
         //Add task 3 as a subTask of task 1.
@@ -314 +310 @@
         taskModificationTypeInstance = new TaskModificationType(name:"AssignedToModified").save()
         taskModificationTypeInstance = new TaskModificationType(name:"NameModified").save()
-        
+    
+        //AssignedPerson
+        def assignedPersonInstance
+
+        assignedPersonInstance = new AssignedPerson(person: Person.get(4),
+                                                                                        task: Task.get(1),
+                                                                                        estimatedHour: 1,
+                                                                                        estimatedMinute: 20)
+        BootStrapSaveAndTest(assignedPersonInstance)
+
+        assignedPersonInstance = new AssignedPerson(person: Person.get(5),
+                                                                                        task: Task.get(1),
+                                                                                        estimatedHour: 3,
+                                                                                        estimatedMinute: 30)
+        BootStrapSaveAndTest(assignedPersonInstance)
+
+
+        //Finally did it all work.        
         if(BootStrapDemoDataSuccessful) {
             println "BootStrapping demo data...successful."

trunk/src/grails-app/controllers/TaskController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-@Secured(['ROLE_AppAdmin']) 
-class TaskController extends BaseController {
+class TaskController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +9 @@
 
     def list = {
-        if(!params.max) params.max = 10
-        [ taskInstanceList: Task.list( params ) ]
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }
+
     def show = {
         def taskInstance = Task.get( params.id )
@@ -22 +22 @@
         else { return [ taskInstance : taskInstance ] }
     }
-  
+
     def delete = {
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
-            taskInstance.delete()
-            flash.message = "Task ${params.id} deleted"
-            redirect(action:list)
+            try {
+                taskInstance.delete()
+                flash.message = "Task ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "Task ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
         }
         else {
@@ -51 +57 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskInstance.version > version) {
+                    
+                    taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.")
+                    render(view:'edit',model:[taskInstance:taskInstance])
+                    return
+                }
+            }
             taskInstance.properties = params
             if(!taskInstance.hasErrors() && taskInstance.save()) {
@@ -82 +97 @@
         }
     }
-
 }

trunk/src/grails-app/controllers/TaskDetailedController.groovy

@@ -9 +9 @@
 
     def list = {
-        if(!params.max) params.max = 10
-        [ taskInstanceList: Task.list( params ) ]
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }
 
@@ -26 +26 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
-            taskInstance.delete()
-            flash.message = "Task ${params.id} deleted"
-            redirect(action:list)
+            try {
+                taskInstance.delete()
+                flash.message = "Task ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "Task ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
         }
         else {
@@ -57 +63 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskInstance.version > version) {
+                    
+                    taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.")
+                    render(view:'edit',model:[taskInstance:taskInstance])
+                    return
+                }
+            }
             taskInstance.properties = params
             if(!taskInstance.hasErrors() && taskInstance.save()) {

trunk/src/grails-app/domain/Task.groovy

@@ -16 +16 @@
     static hasMany = [entries: Entry, 
                         taskModifications: TaskModification, 
-                        assignedPersons: Person, 
+                        assignedPersons: AssignedPerson, 
                         subTasks: Task]
 

trunk/src/grails-app/views/task/create.gsp

@@ -41 +41 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                    <input type="text" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
                                 </td>
                             </tr> 

trunk/src/grails-app/views/task/edit.gsp

@@ -25 +25 @@
             <g:form method="post" >
                 <input type="hidden" name="id" value="${taskInstance?.id}" />
+                <input type="hidden" name="version" value="${taskInstance?.version}" />
                 <div class="dialog">
                     <table>
@@ -43 +44 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                    <input type="text" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
                                 </td>
                             </tr> 
@@ -100 +101 @@
 <ul>
 <g:each var="a" in="${taskInstance?.assignedPersons?}">
-    <li><g:link controller="person" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="person" params="['task.id':taskInstance?.id]" action="create">Add Person</g:link>
+    <li><g:link controller="assignedPerson" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="assignedPerson" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
 
                                 </td>
@@ -153 +154 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="taskModifications">Modifications:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskModifications','errors')}">
-                                    
-<ul>
-<g:each var="m" in="${taskInstance?.taskModifications?}">
-    <li><g:link controller="taskModification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="taskModification" params="['task.id':taskInstance?.id]" action="create">Add Modification</g:link>
-
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="subTasks">Sub Tasks:</label>
                                 </td>
@@ -198 +183 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
                                     <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskModifications">Task Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskModifications','errors')}">
+                                    
+<ul>
+<g:each var="t" in="${taskInstance?.taskModifications?}">
+    <li><g:link controller="taskModification" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="taskModification" params="['task.id':taskInstance?.id]" action="create">Add TaskModification</g:link>
+
                                 </td>
                             </tr> 

trunk/src/grails-app/views/task/list.gsp

@@ -58 +58 @@
             </div>
             <div class="paginateButtons">
-                <g:paginate total="${Task.count()}" />
+                <g:paginate total="${taskInstanceTotal}" />
             </div>
         </div>

trunk/src/grails-app/views/task/show.gsp

@@ -82 +82 @@
                             <td valign="top" class="name">Assigned Persons:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'assignedPersons')}</td>
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="a" in="${taskInstance.assignedPersons}">
+                                    <li><g:link controller="assignedPerson" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>
@@ -121 +127 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Modifications:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="m" in="${taskInstance.taskModifications}">
-                                    <li><g:link controller="taskModification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Sub Tasks:</td>
                             
@@ -161 +154 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Task Modifications:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="t" in="${taskInstance.taskModifications}">
+                                    <li><g:link controller="taskModification" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Task Type:</td>
                             

trunk/src/grails-app/views/taskDetailed/edit.gsp

@@ -151 +151 @@
                                     <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
                                 </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="assignedPersons">Assigned Persons:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedPersons','errors')}">
+                                    
+<ul>
+<g:each var="a" in="${taskInstance?.assignedPersons?}">
+    <li><g:link controller="assignedPersonDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
+
+                                </td>
                             </tr> 
+
+
                         
                         </tbody>

trunk/src/grails-app/views/taskDetailed/show.gsp

@@ -78 +78 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Assigned Persons:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="s" in="${taskInstance.assignedPersons}">
-                                    <li>${s?.firstName} ${s?.lastName}</li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Is Active:</td>
                             
@@ -142 +129 @@
                             
                             <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Assigned Persons:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="a" in="${taskInstance.assignedPersons}">
+                                    <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>