Index: /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy	(revision 84)
+++ /branches/TaskRewrite/src/grails-app/controllers/TaskController.groovy	(revision 85)
@@ -1,4 +1,5 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
+@Secured(['ROLE_AppAdmin']) 
 class TaskController extends BaseController {
     
@@ -6,18 +7,10 @@
 
     // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', deleteDetailed:'POST', save:'POST', saveDetailed:'POST', updateDetailed:'POST']
+    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
 
-    @Secured(['ROLE_AppAdmin']) 
     def list = {
         if(!params.max) params.max = 10
         [ taskInstanceList: Task.list( params ) ]
     }
-
-    def listDetailed = {
-        if(!params.max) params.max = 10
-        [ taskInstanceList: Task.list( params ) ]
-    }
-
-    @Secured(['ROLE_AppAdmin']) 
     def show = {
         def taskInstance = Task.get( params.id )
@@ -29,16 +22,5 @@
         else { return [ taskInstance : taskInstance ] }
     }
-
-    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 )
@@ -54,18 +36,4 @@
     }
 
-    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 )
@@ -80,23 +48,4 @@
     }
 
-    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 )
@@ -117,23 +66,4 @@
     }
 
-    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()
@@ -142,11 +72,4 @@
     }
 
-    def createDetailed = {
-        def taskInstance = new Task()
-        taskInstance.properties = params
-        return ['taskInstance':taskInstance]
-    }
-
-    @Secured(['ROLE_AppAdmin']) 
     def save = {
         def taskInstance = new Task(params)
@@ -160,13 +83,3 @@
     }
 
-    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/controllers/TaskDetailedController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/TaskDetailedController.groovy	(revision 85)
+++ /branches/TaskRewrite/src/grails-app/controllers/TaskDetailedController.groovy	(revision 85)
@@ -0,0 +1,90 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class TaskDetailedController extends BaseController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ taskInstanceList: Task.list( params ) ]
+    }
+
+    def show = {
+        def taskInstance = Task.get( params.id )
+
+        if(!taskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+        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)
+        }
+        else {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        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 ]
+        }
+    }
+
+    def update = {
+        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)
+        }
+    }
+
+    def create = {
+        def taskInstance = new Task()
+        taskInstance.properties = params
+        return ['taskInstance':taskInstance]
+    }
+
+    def save = {
+        def taskInstance = new Task(params)
+        if(!taskInstance.hasErrors() && taskInstance.save()) {
+            flash.message = "Task ${taskInstance.id} created"
+            redirect(action:show,id:taskInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskInstance:taskInstance])
+        }
+    }
+}
Index: /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp	(revision 84)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp	(revision 85)
@@ -8,5 +8,5 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" controller="task" action="listDetailed">Tasks</g:link></span>
+            <span class="menuButton"><g:link class="list" controller="taskDetailed" action="list">Tasks</g:link></span>
 
         </div>
Index: anches/TaskRewrite/src/grails-app/views/task/createDetailed.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/createDetailed.gsp	(revision 84)
+++ 	(revision )
@@ -1,155 +1,0 @@
-
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Create Task</title>         
-    </head>
-    <body>
-        <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="listDetailed">Task List</g:link></span>
-        </div>
-        <div class="body">
-            <h1>Create Task</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
-            <g:hasErrors bean="${taskInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskInstance}" as="list" />
-            </div>
-            </g:hasErrors>
-            <g:form action="save" method="post" >
-                <div class="dialog">
-                    <table>
-                        <tbody>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text"  style="width:450px" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
-                                </td>
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="comment">Comment:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
-                                    <textarea  style="width:450px" rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="targetStartDate">Target Start Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
-                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" precision="day"></g:datePicker>
-                                </td>
-                            </tr> 
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="targetCompletionDate">Target Completion Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
-                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" precision="day"></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="leadPerson">Lead Person:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskPriority">Task Priority:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskStatus">Task Status:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
-                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isApproved">Is Approved:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
-                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isScheduled">Is Scheduled:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
-                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="parentTask">Parent Task:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${Task.list()}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'']"></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskGroup">Task Group:</label>
-                                </td>
-                                <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="taskType">Task Type:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
-                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                        </tbody>
-                    </table>
-                </div>
-                <div class="buttons">
-                    <span class="button"><input class="save" type="submit" value="CreateDetailed" /></span>
-                </div>
-            </g:form>
-        </div>
-    </body>
-</html>
Index: anches/TaskRewrite/src/grails-app/views/task/editDetailed.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/editDetailed.gsp	(revision 84)
+++ 	(revision )
@@ -1,222 +1,0 @@
-
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Edit Task</title>
-    </head>
-    <body>
-        <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="listDetailed">Task List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="createDetailed">New Task</g:link></span>
-        </div>
-        <div class="body">
-            <h1>Edit Task</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
-            <g:hasErrors bean="${taskInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskInstance}" as="list" />
-            </div>
-            </g:hasErrors>
-            <g:form method="post" >
-                <input type="hidden" name="id" value="${taskInstance?.id}" />
-                <div class="dialog">
-                    <table>
-                        <tbody>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text"  style="width:300px" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="targetStartDate">Target Start Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
-                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" precision="day" ></g:datePicker>
-                                </td>
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="leadPerson">Lead Person:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskPriority">Task Priority:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskStatus">Task Status:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
-                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="parentTask">Parent Task:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${possibleParentList}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'']"></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="comment">Comment:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
-                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
-                                </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="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>
-
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="entries">Entries:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'entries','errors')}">
-                                    
-<ul>
-<g:each var="e" in="${taskInstance?.entries?}">
-    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="entry" params="['task.id':taskInstance?.id]" action="create">Add Entry</g:link>
-
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isApproved">Is Approved:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
-                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isScheduled">Is Scheduled:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
-                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="modifications">Modifications:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'modifications','errors')}">
-                                    
-<ul>
-<g:each var="m" in="${taskInstance?.modifications?}">
-    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="modification" 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>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'subTasks','errors')}">
-                                    
-<ul>
-<g:each var="s" in="${taskInstance?.subTasks?}">
-    <li><g:link controller="task" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="task" params="['task.id':taskInstance?.id]" action="create">Add Task</g:link>
-
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="targetCompletionDate">Target Completion Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
-                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" ></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskGroup">Task Group:</label>
-                                </td>
-                                <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="taskType">Task Type:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
-                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                        </tbody>
-                    </table>
-                </div>
-                <div class="buttons">
-                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
-                </div>
-            </g:form>
-        </div>
-    </body>
-</html>
Index: anches/TaskRewrite/src/grails-app/views/task/listDetailed.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/listDetailed.gsp	(revision 84)
+++ 	(revision )
@@ -1,72 +1,0 @@
-
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Task List</title>
-    </head>
-    <body>
-        <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
-        </div>
-        <div class="body">
-            <h1>Task List</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
-            <div class="list">
-                <table>
-                    <thead>
-                        <tr>
-                        
-                   	        <g:sortableColumn property="id" title="Id" />
-                        
-                   	        <g:sortableColumn property="targetStartDate" title="Target Start Date" />
-                        
-                   	        <g:sortableColumn property="description" title="Description" />
-                        
-                   	        <th>Lead Person</th>
-                   	    
-                   	        <th>Task Priority</th>
-                   	    
-                   	        <th>Task Status</th>
-            
-                            <th>Edit</th>
-
-                            <th>Show</th>
-                   	    
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <g:each in="${taskInstanceList}" status="i" var="taskInstance">
-                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'id')}</td>
-                        
-                            <td><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd MMM yyyy"/></td>
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'description')}</td>
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'taskPriority')}</td>
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'taskStatus')}</td>
-
-                            <td><g:link action="editDetailed" id="${taskInstance.id}">Edit</g:link></td>
-
-                            <td><g:link action="showDetailed" id="${taskInstance.id}">Show</g:link></td>
-                        
-                        </tr>
-                    </g:each>
-                    </tbody>
-                </table>
-            </div>
-            <div class="paginateButtons">
-                <g:paginate total="${Task.count()}" />
-            </div>
-        </div>
-    </body>
-</html>
Index: anches/TaskRewrite/src/grails-app/views/task/showDetailed.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/showDetailed.gsp	(revision 84)
+++ 	(revision )
@@ -1,227 +1,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Show Task</title>
-    </head>
-    <body>
-        <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="listDetailed" action="listDetailed">Task List</g:link></span>
-            <span class="menuButton"><g:link class="createDetailed" action="createDetailed">New Task</g:link></span>
-        </div>
-        <div class="body">
-            <h1>Show Task</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
-            <div class="dialog">
-                <table>
-                    <tbody>
-
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Id:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'id')}</td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Description:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'description')}</td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Comment:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'comment')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Target Start Date:</td>
-                            
-                            <td valign="top" class="value"><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd MMM yyyy"/></td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Target Completion Date:</td>
-                            
-                            <td valign="top" class="value"><g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd MMM yyyy"/></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Lead Person:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="person" action="show" id="${taskInstance?.leadPerson?.id}">${taskInstance?.leadPerson?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Priority:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="taskPriority" action="show" id="${taskInstance?.taskPriority?.id}">${taskInstance?.taskPriority?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Status:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="taskStatus" action="show" id="${taskInstance?.taskStatus?.id}">${taskInstance?.taskStatus?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Assigned Persons:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'assignedPersons')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Active:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isActive')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Approved:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isApproved')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Scheduled:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isScheduled')}</td>
-                            
-                        </tr>
-                    
-                        <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.modifications}">
-                                    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Parent Task:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="task" action="show" id="${taskInstance?.parentTask?.id}">${taskInstance?.parentTask?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Sub Tasks:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="s" in="${taskInstance.subTasks}">
-                                    <li><g:link controller="task" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Group:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="taskGroup" action="show" id="${taskInstance?.taskGroup?.id}">${taskInstance?.taskGroup?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Type:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="taskType" action="show" id="${taskInstance?.taskType?.id}">${taskInstance?.taskType?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                    </tbody>
-                </table>
-            </div>
-            <div class="buttons">
-                <g:form>
-                    <input type="hidden" name="id" value="${taskInstance?.id}" />
-                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
-                </g:form>
-            </div>
-
-            <div class="list">
-                <h1>Faults</h1>
-                <table>
-                    <thead>
-                        <tr>
-                            <g:sortableColumn property="comment" title="Comment" />
-                        
-                            <g:sortableColumn property="dateDone" title="Date Done" />
-                        
-                            <g:sortableColumn property="enteredBy" title="Entered By" />
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                        <g:if test="${entry.entryType == EntryType.findByName('Fault')}"> 
-                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-                            
-                                <td width="65%">${entry.comment}</td>
-                            
-                                <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td>
-                        
-                                <td>${entry.enteredBy}</td>
-                        </g:if>
-                        
-                        </tr>
-                    </g:each>
-                    </tbody>
-                </table>
-            </div>
-
-            <div class="list">
-                <h1>Work Done</h1>
-                <table>
-                    <thead>
-                        <tr>
-                            <g:sortableColumn property="comment" title="Comment" />
-                        
-                            <g:sortableColumn property="dateDone" title="Date Done" />
-                        
-                            <g:sortableColumn property="enteredBy" title="Entered By" />
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                        <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}"> 
-                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-                            
-                                <td width="65%">${entry.comment}</td>
-                            
-                                <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td>
-                        
-                                <td>${entry.enteredBy}</td>
-                        </g:if>
-                        
-                        </tr>
-                    </g:each>
-                    </tbody>
-                </table>
-            </div>
-
-        </div>
-    </body>
-</html>
Index: /branches/TaskRewrite/src/grails-app/views/taskDetailed/create.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/taskDetailed/create.gsp	(revision 85)
+++ /branches/TaskRewrite/src/grails-app/views/taskDetailed/create.gsp	(revision 85)
@@ -0,0 +1,155 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create Task</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
+                                    <input type="text"  style="width:450px" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
+                                    <textarea  style="width:450px" rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetStartDate">Target Start Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
+                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" precision="day"></g:datePicker>
+                                </td>
+                            </tr> 
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetCompletionDate">Target Completion Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
+                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" precision="day"></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="leadPerson">Lead Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskPriority">Task Priority:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
+                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskStatus">Task Status:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
+                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isApproved">Is Approved:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
+                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isScheduled">Is Scheduled:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
+                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
+                                </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="parentTask">Parent Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'']"></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskGroup">Task Group:</label>
+                                </td>
+                                <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="taskType">Task Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
+                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/taskDetailed/edit.gsp	(revision 85)
+++ /branches/TaskRewrite/src/grails-app/views/taskDetailed/edit.gsp	(revision 85)
@@ -0,0 +1,222 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit Task</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
+                                    <input type="text"  style="width:300px" maxlength="50" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetStartDate">Target Start Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
+                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" precision="day" ></g:datePicker>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="leadPerson">Lead Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskPriority">Task Priority:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
+                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskStatus">Task Status:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskStatus','errors')}">
+                                    <g:select optionKey="id" from="${TaskStatus.list()}" name="taskStatus.id" value="${taskInstance?.taskStatus?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="parentTask">Parent Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
+                                    <g:select optionKey="id" from="${possibleParentList}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'']"></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
+                                </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="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>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entries">Entries:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'entries','errors')}">
+                                    
+<ul>
+<g:each var="e" in="${taskInstance?.entries?}">
+    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="entry" params="['task.id':taskInstance?.id]" action="create">Add Entry</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isApproved">Is Approved:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isApproved','errors')}">
+                                    <g:checkBox name="isApproved" value="${taskInstance?.isApproved}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isScheduled">Is Scheduled:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'isScheduled','errors')}">
+                                    <g:checkBox name="isScheduled" value="${taskInstance?.isScheduled}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="modifications">Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'modifications','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${taskInstance?.modifications?}">
+    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="modification" 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>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'subTasks','errors')}">
+                                    
+<ul>
+<g:each var="s" in="${taskInstance?.subTasks?}">
+    <li><g:link controller="task" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="task" params="['task.id':taskInstance?.id]" action="create">Add Task</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetCompletionDate">Target Completion Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
+                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskGroup">Task Group:</label>
+                                </td>
+                                <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="taskType">Task Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
+                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/taskDetailed/list.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/taskDetailed/list.gsp	(revision 85)
+++ /branches/TaskRewrite/src/grails-app/views/taskDetailed/list.gsp	(revision 85)
@@ -0,0 +1,72 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Task List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Task List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="targetStartDate" title="Target Start Date" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <th>Lead Person</th>
+                   	    
+                   	        <th>Task Priority</th>
+                   	    
+                   	        <th>Task Status</th>
+            
+                            <th>Edit</th>
+
+                            <th>Show</th>
+                   	    
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstanceList}" status="i" var="taskInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'id')}</td>
+                        
+                            <td><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd MMM yyyy"/></td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'taskPriority')}</td>
+                        
+                            <td>${fieldValue(bean:taskInstance, field:'taskStatus')}</td>
+
+                            <td><g:link action="edit" id="${taskInstance.id}">Edit</g:link></td>
+
+                            <td><g:link action="show" id="${taskInstance.id}">Show</g:link></td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${Task.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/taskDetailed/show.gsp	(revision 85)
+++ /branches/TaskRewrite/src/grails-app/views/taskDetailed/show.gsp	(revision 85)
@@ -0,0 +1,227 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show Task</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">Task List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show Task</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'id')}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'description')}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Comment:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'comment')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Target Start Date:</td>
+                            
+                            <td valign="top" class="value"><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd MMM yyyy"/></td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Target Completion Date:</td>
+                            
+                            <td valign="top" class="value"><g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd MMM yyyy"/></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Lead Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${taskInstance?.leadPerson?.id}">${taskInstance?.leadPerson?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Priority:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskPriority" action="show" id="${taskInstance?.taskPriority?.id}">${taskInstance?.taskPriority?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Status:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskStatus" action="show" id="${taskInstance?.taskStatus?.id}">${taskInstance?.taskStatus?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Assigned Persons:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'assignedPersons')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Approved:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isApproved')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Scheduled:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isScheduled')}</td>
+                            
+                        </tr>
+                    
+                        <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.modifications}">
+                                    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Parent Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${taskInstance?.parentTask?.id}">${taskInstance?.parentTask?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Sub Tasks:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="s" in="${taskInstance.subTasks}">
+                                    <li><g:link controller="task" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Group:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskGroup" action="show" id="${taskInstance?.taskGroup?.id}">${taskInstance?.taskGroup?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskType" action="show" id="${taskInstance?.taskType?.id}">${taskInstance?.taskType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+
+            <div class="list">
+                <h1>Faults</h1>
+                <table>
+                    <thead>
+                        <tr>
+                            <g:sortableColumn property="comment" title="Comment" />
+                        
+                            <g:sortableColumn property="dateDone" title="Date Done" />
+                        
+                            <g:sortableColumn property="enteredBy" title="Entered By" />
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
+                        <g:if test="${entry.entryType == EntryType.findByName('Fault')}"> 
+                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                            
+                                <td width="65%">${entry.comment}</td>
+                            
+                                <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td>
+                        
+                                <td>${entry.enteredBy}</td>
+                        </g:if>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+
+            <div class="list">
+                <h1>Work Done</h1>
+                <table>
+                    <thead>
+                        <tr>
+                            <g:sortableColumn property="comment" title="Comment" />
+                        
+                            <g:sortableColumn property="dateDone" title="Date Done" />
+                        
+                            <g:sortableColumn property="enteredBy" title="Entered By" />
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
+                        <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}"> 
+                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                            
+                                <td width="65%">${entry.comment}</td>
+                            
+                                <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td>
+                        
+                                <td>${entry.enteredBy}</td>
+                        </g:if>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+
+        </div>
+    </body>
+</html>