Changeset 84 for branches

Timestamp:

Mar 24, 2009, 3:30:12 AM (16 years ago)

Author:

gav

Message:

Start creating 'Detail views for Task. Add to BootStrap?. Small change to css.

Location:

branches/TaskRewrite/src

Files:

• grails-app/conf/BootStrap.groovy (modified) (2 diffs)
• grails-app/controllers/TaskController.groovy (modified) (8 diffs)
• grails-app/views/appCore/admin.gsp (modified) (1 diff)
• grails-app/views/appCore/home.gsp (modified) (1 diff)
• grails-app/views/task/createDetailed.gsp (added)
• grails-app/views/task/editDetailed.gsp (added)
• grails-app/views/task/listDetailed.gsp (added)
• grails-app/views/task/showDetailed.gsp (added)
• web-app/css/main.css (modified) (1 diff)

branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy

@@ -227 +227 @@
         subTaskInstance.parentTask = Task.get(1)
 
+        subTaskInstance = new Task(taskGroup:TaskGroup.findByName("Engineering Activites"),
+                 taskStatus:TaskStatus.findByName("Not Started"),
+                 taskPriority:TaskPriority.get(2),
+                 taskType:TaskType.get(1),
+                 leadPerson:Person.get(3),
+                 description:"Replace sensor at next opportunity.",
+                 comment:"Nothing else has worked.")
+        BootStrapSaveAndTest(subTaskInstance)
+        subTaskInstance.addToAssignedPersons(Person.get(1))
+
+        //Add task 3 as a subTask of task 1.
+        taskInstance.addToSubTasks(Task.get(3))
+        subTaskInstance.parentTask = Task.get(1)
+
         taskInstance = new Task(taskGroup:TaskGroup.findByName("Production Activites"),
                  taskStatus:TaskStatus.findByName("Not Started"),
@@ -259 +273 @@
         entryTypeInstance = new EntryType(name:"Work Request")
         BootStrapSaveAndTest(entryTypeInstance)
+
+        //Entry
+        def entryInstance
+
+        entryInstance = new Entry(enteredBy: Person.get(6),
+                                                    task: Task.get(1),
+                                                    entryType: EntryType.findByName("Fault"),
+                                                    comment: "This level sensor is causing us trouble.",
+                                                    durationMinute: 20)
+        BootStrapSaveAndTest(entryInstance)
+
+        entryInstance = new Entry(enteredBy: Person.get(4),
+                                                    task: Task.get(1),
+                                                    entryType: EntryType.findByName("WorkDone"),
+                                                    comment: "Cleaned sensor, see how it goes.",
+                                                    durationMinute: 30)
+        BootStrapSaveAndTest(entryInstance)
+
+        entryInstance = new Entry(enteredBy: Person.get(4),
+                                                    task: Task.get(1),
+                                                    entryType: EntryType.findByName("WorkDone"),
+                                                    comment: "Checked up on it later and sensor is dropping out intermittently, created subTask to replace sensor.",
+                                                    durationMinute: 20)
+        BootStrapSaveAndTest(entryInstance)
 
         //ModificationType

branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy

@@ -6 +6 @@
 
     // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+    static allowedMethods = [delete:'POST', deleteDetailed:'POST', save:'POST', saveDetailed:'POST', updateDetailed:'POST']
 
+    @Secured(['ROLE_AppAdmin']) 
     def list = {
         if(!params.max) params.max = 10
@@ -13 +14 @@
     }
 
+    def listDetailed = {
+        if(!params.max) params.max = 10
+        [ taskInstanceList: Task.list( params ) ]
+    }
+
+    @Secured(['ROLE_AppAdmin']) 
     def show = {
         def taskInstance = Task.get( params.id )
@@ -23 +30 @@
     }
 
+    def showDetailed = {
+        def taskInstance = Task.get( params.id )
+
+        if(!taskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskInstance : taskInstance ] }
+    }
+
+    @Secured(['ROLE_AppAdmin'])     
     def delete = {
         def taskInstance = Task.get( params.id )
@@ -36 +54 @@
     }
 
+    def deleteDetailed = {
+        def taskInstance = Task.get( params.id )
+        if(taskInstance) {
+            taskInstance.delete()
+            flash.message = "Task ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    @Secured(['ROLE_AppAdmin']) 
     def edit = {
         def taskInstance = Task.get( params.id )
@@ -48 +80 @@
     }
 
+    def editDetailed = {
+        def taskInstance = Task.get( params.id )
+
+        if(!taskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            def criteria = taskInstance.createCriteria()
+            def results = criteria {
+                and {
+                    notEqual('id', taskInstance.id)
+                    }
+            }
+            return [ taskInstance : taskInstance, possibleParentList: results ]
+        }
+    }
+
+    @Secured(['ROLE_AppAdmin']) 
     def update = {
         def taskInstance = Task.get( params.id )
@@ -66 +117 @@
     }
 
+    def updateDetailed = {
+        def taskInstance = Task.get( params.id )
+        if(taskInstance) {
+            taskInstance.properties = params
+            if(!taskInstance.hasErrors() && taskInstance.save()) {
+                flash.message = "Task ${params.id} updated"
+                redirect(action:show,id:taskInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskInstance:taskInstance])
+            }
+        }
+        else {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    @Secured(['ROLE_AppAdmin']) 
     def create = {
         def taskInstance = new Task()
@@ -72 +142 @@
     }
 
+    def createDetailed = {
+        def taskInstance = new Task()
+        taskInstance.properties = params
+        return ['taskInstance':taskInstance]
+    }
+
+    @Secured(['ROLE_AppAdmin']) 
     def save = {
         def taskInstance = new Task(params)
@@ -82 +159 @@
         }
     }
+
+    def saveDetailed = {
+        def taskInstance = new Task(params)
+        if(!taskInstance.hasErrors() && taskInstance.save()) {
+            flash.message = "Task ${taskInstance.id} created"
+            redirect(action:showDetailed,id:taskInstance.id)
+        }
+        else {
+            render(view:'createDetailed',model:[taskInstance:taskInstance])
+        }
+    }
 }

branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp

@@ -12 +12 @@
         <div class="body">
             <h1>Welcome to Admin</h1>
+            <div class="errors">
+                "Warning these pages are for use by the application admin only and not for daily use." <br />
+                "They allow direct administration of the back-end data, cascade deletion and updates may occur."
+            </div>
             <br/>
             <div class="dialog">

branches/TaskRewrite/src/grails-app/views/appCore/home.gsp

@@ -8 +8 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" controller="task" action="list">Tasks</g:link></span>
+            <span class="menuButton"><g:link class="list" controller="task" action="listDetailed">Tasks</g:link></span>
 
         </div>

branches/TaskRewrite/src/web-app/css/main.css

@@ -294 +294 @@
     color: #666;
     font-size: 10px;
-    margin-top: 5px;
+    margin-top: -1px;
+    margin-bottom: 5px;
     overflow: hidden;
     padding: 0;