Index: /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy =================================================================== --- /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy (revision 83) +++ /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy (revision 84) @@ -227,4 +227,18 @@ 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,4 +273,28 @@ 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 Index: /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy =================================================================== --- /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy (revision 83) +++ /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy (revision 84) @@ -6,6 +6,7 @@ // 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,4 +14,10 @@ } + def listDetailed = { + if(!params.max) params.max = 10 + [ taskInstanceList: Task.list( params ) ] + } + + @Secured(['ROLE_AppAdmin']) def show = { def taskInstance = Task.get( params.id ) @@ -23,4 +30,15 @@ } + 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,4 +54,18 @@ } + 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,4 +80,23 @@ } + 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,4 +117,23 @@ } + 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,4 +142,11 @@ } + def createDetailed = { + def taskInstance = new Task() + taskInstance.properties = params + return ['taskInstance':taskInstance] + } + + @Secured(['ROLE_AppAdmin']) def save = { def taskInstance = new Task(params) @@ -82,3 +159,14 @@ } } + + 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]) + } + } } Index: /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp (revision 83) +++ /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp (revision 84) @@ -12,4 +12,8 @@

Welcome to Admin

+
+ "Warning these pages are for use by the application admin only and not for daily use."
+ "They allow direct administration of the back-end data, cascade deletion and updates may occur." +

Index: /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp (revision 83) +++ /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp (revision 84) @@ -8,5 +8,5 @@
- Tasks + Tasks
Index: /branches/TaskRewrite/src/grails-app/views/task/createDetailed.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/task/createDetailed.gsp (revision 84) +++ /branches/TaskRewrite/src/grails-app/views/task/createDetailed.gsp (revision 84) @@ -0,0 +1,155 @@ + + + + + + + Create Task + + +
+ Home + Task List +
+
+

Create Task

+ +
${flash.message}
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /branches/TaskRewrite/src/grails-app/views/task/editDetailed.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/task/editDetailed.gsp (revision 84) +++ /branches/TaskRewrite/src/grails-app/views/task/editDetailed.gsp (revision 84) @@ -0,0 +1,222 @@ + + + + + + + Edit Task + + +
+ Home + Task List + New Task +
+
+

Edit Task

+ +
${flash.message}
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+Add Person + +
+ + + +
    + +
  • ${e?.encodeAsHTML()}
    • +     +
+Add Entry + +
+ + + +
+ + + +
+ + + +
+ + + +
    + +
  • ${m?.encodeAsHTML()}
    • +     +
+Add Modification + +
+ + + +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+Add Task + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ +
+ + Index: /branches/TaskRewrite/src/grails-app/views/task/listDetailed.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/task/listDetailed.gsp (revision 84) +++ /branches/TaskRewrite/src/grails-app/views/task/listDetailed.gsp (revision 84) @@ -0,0 +1,72 @@ + + + + + + + Task List + + +
+ Home + New Task +
+
+

Task List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Lead PersonTask PriorityTask StatusEditShow
${fieldValue(bean:taskInstance, field:'id')}${fieldValue(bean:taskInstance, field:'description')}${fieldValue(bean:taskInstance, field:'leadPerson')}${fieldValue(bean:taskInstance, field:'taskPriority')}${fieldValue(bean:taskInstance, field:'taskStatus')}EditShow
+
+
+ +
+
+ + Index: /branches/TaskRewrite/src/grails-app/views/task/showDetailed.gsp =================================================================== --- /branches/TaskRewrite/src/grails-app/views/task/showDetailed.gsp (revision 84) +++ /branches/TaskRewrite/src/grails-app/views/task/showDetailed.gsp (revision 84) @@ -0,0 +1,227 @@ + + + + + Show Task + + +
+ Home + Task List + New Task +
+
+

Show Task

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:taskInstance, field:'id')}
Description:${fieldValue(bean:taskInstance, field:'description')}
Comment:${fieldValue(bean:taskInstance, field:'comment')}
Target Start Date:
Target Completion Date:
Lead Person:${taskInstance?.leadPerson?.encodeAsHTML()}
Task Priority:${taskInstance?.taskPriority?.encodeAsHTML()}
Task Status:${taskInstance?.taskStatus?.encodeAsHTML()}
Assigned Persons:${fieldValue(bean:taskInstance, field:'assignedPersons')}
Is Active:${fieldValue(bean:taskInstance, field:'isActive')}
Is Approved:${fieldValue(bean:taskInstance, field:'isApproved')}
Is Scheduled:${fieldValue(bean:taskInstance, field:'isScheduled')}
Modifications: +
    + +
  • ${m?.encodeAsHTML()}
    • +     +
+
Parent Task:${taskInstance?.parentTask?.encodeAsHTML()}
Sub Tasks: +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
Task Group:${taskInstance?.taskGroup?.encodeAsHTML()}
Task Type:${taskInstance?.taskType?.encodeAsHTML()}
+
+
+ + + + + +
+ +
+

Faults

+ + + + + + + + + + + + + + + + + + + + + + + + + +
${entry.comment}${entry.enteredBy}
+
+ +
+

Work Done

+ + + + + + + + + + + + + + + + + + + + + + + + + +
${entry.comment}${entry.enteredBy}
+
+ +
+ + Index: /branches/TaskRewrite/src/web-app/css/main.css =================================================================== --- /branches/TaskRewrite/src/web-app/css/main.css (revision 83) +++ /branches/TaskRewrite/src/web-app/css/main.css (revision 84) @@ -294,5 +294,6 @@ color: #666; font-size: 10px; - margin-top: 5px; + margin-top: -1px; + margin-bottom: 5px; overflow: hidden; padding: 0;