Index: trunk/grails-app/controllers/AssignedGroupController.groovy
===================================================================
--- trunk/grails-app/controllers/AssignedGroupController.groovy	(revision 240)
+++ 	(revision )
@@ -1,99 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class AssignedGroupController extends BaseAppAdminController {
-    
-    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 = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assignedGroupInstanceList: AssignedGroup.list( params ), assignedGroupInstanceTotal: AssignedGroup.count() ]
-    }
-
-    def show = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ assignedGroupInstance : assignedGroupInstance ] }
-    }
-
-    def delete = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            try {
-                assignedGroupInstance.delete(flush:true)
-                flash.message = "AssignedGroup ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssignedGroup ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ assignedGroupInstance : assignedGroupInstance ]
-        }
-    }
-
-    def update = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assignedGroupInstance.version > version) {
-                    
-                    assignedGroupInstance.errors.rejectValue("version", "assignedGroup.optimistic.locking.failure", "Another user has updated this AssignedGroup while you were editing.")
-                    render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-                    return
-                }
-            }
-            assignedGroupInstance.properties = params
-            if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-                flash.message = "AssignedGroup ${params.id} updated"
-                redirect(action:show,id:assignedGroupInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-            }
-        }
-        else {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def create = {
-        def assignedGroupInstance = new AssignedGroup()
-        assignedGroupInstance.properties = params
-        return ['assignedGroupInstance':assignedGroupInstance]
-    }
-
-    def save = {
-        def assignedGroupInstance = new AssignedGroup(params)
-        if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-            flash.message = "AssignedGroup ${assignedGroupInstance.id} created"
-            redirect(action:show,id:assignedGroupInstance.id)
-        }
-        else {
-            render(view:'create',model:[assignedGroupInstance:assignedGroupInstance])
-        }
-    }
-}
Index: trunk/grails-app/controllers/AssignedGroupDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/AssignedGroupDetailedController.groovy	(revision 240)
+++ 	(revision )
@@ -1,107 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class AssignedGroupDetailedController 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 = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assignedGroupInstanceList: AssignedGroup.list( params ), assignedGroupInstanceTotal: AssignedGroup.count() ]
-    }
-
-    def show = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ assignedGroupInstance : assignedGroupInstance ] }
-    }
-
-    def delete = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            try {
-                def taskId = assignedGroupInstance.task.id
-                assignedGroupInstance.delete()
-                flash.message = "AssignedGroup ${params.id} deleted"
-                redirect(controller:"taskDetailed", action:"show", id: taskId)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssignedGroup ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ assignedGroupInstance : assignedGroupInstance ]
-        }
-    }
-
-    def update = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assignedGroupInstance.version > version) {
-
-                    assignedGroupInstance.errors.rejectValue("version", "assignedGroup.optimistic.locking.failure", "Another user has updated this AssignedGroup while you were editing.")
-                    render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-                    return
-                }
-            }
-            assignedGroupInstance.properties = params
-            if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-                flash.message = "AssignedGroup ${params.id} updated"
-                redirect(action:show,id:assignedGroupInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-            }
-        }
-        else {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
-        }
-    }
-
-    def create = {
-        if(!params.task?.id) {
-            flash.message = "Please select a task and then 'Add Assigned Group'"
-            redirect(controller: "taskDetailed", action: "search")
-        }
-        else {
-            def assignedGroupInstance = new AssignedGroup()
-            assignedGroupInstance.properties = params
-            return ['assignedGroupInstance':assignedGroupInstance]
-        }
-    }
-
-    def save = {
-        def assignedGroupInstance = new AssignedGroup(params)
-
-        if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-            flash.message = "AssignedGroup ${assignedGroupInstance.id} created"
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
-        }
-        else {
-            render(view:'create',model:[assignedGroupInstance:assignedGroupInstance])
-        }
-    }
-}
Index: trunk/grails-app/controllers/AssignedPersonController.groovy
===================================================================
--- trunk/grails-app/controllers/AssignedPersonController.groovy	(revision 241)
+++ trunk/grails-app/controllers/AssignedPersonController.groovy	(revision 241)
@@ -0,0 +1,99 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class AssignedPersonController extends BaseAppAdminController {
+    
+    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 = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ assignedPersonInstanceList: AssignedPerson.list( params ), assignedPersonInstanceTotal: AssignedPerson.count() ]
+    }
+
+    def show = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+
+        if(!assignedPersonInstance) {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ assignedPersonInstance : assignedPersonInstance ] }
+    }
+
+    def delete = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+        if(assignedPersonInstance) {
+            try {
+                assignedPersonInstance.delete(flush:true)
+                flash.message = "AssignedPerson ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "AssignedPerson ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
+        }
+        else {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+
+        if(!assignedPersonInstance) {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ assignedPersonInstance : assignedPersonInstance ]
+        }
+    }
+
+    def update = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+        if(assignedPersonInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(assignedPersonInstance.version > version) {
+                    
+                    assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.")
+                    render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
+                    return
+                }
+            }
+            assignedPersonInstance.properties = params
+            if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
+                flash.message = "AssignedPerson ${params.id} updated"
+                redirect(action:show,id:assignedPersonInstance.id)
+            }
+            else {
+                render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
+            }
+        }
+        else {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def create = {
+        def assignedPersonInstance = new AssignedPerson()
+        assignedPersonInstance.properties = params
+        return ['assignedPersonInstance':assignedPersonInstance]
+    }
+
+    def save = {
+        def assignedPersonInstance = new AssignedPerson(params)
+        if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
+            flash.message = "AssignedPerson ${assignedPersonInstance.id} created"
+            redirect(action:show,id:assignedPersonInstance.id)
+        }
+        else {
+            render(view:'create',model:[assignedPersonInstance:assignedPersonInstance])
+        }
+    }
+}
Index: trunk/grails-app/controllers/AssignedPersonDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/AssignedPersonDetailedController.groovy	(revision 241)
+++ trunk/grails-app/controllers/AssignedPersonDetailedController.groovy	(revision 241)
@@ -0,0 +1,107 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class AssignedPersonDetailedController 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 = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ assignedPersonInstanceList: AssignedPerson.list( params ), assignedPersonInstanceTotal: AssignedPerson.count() ]
+    }
+
+    def show = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+
+        if(!assignedPersonInstance) {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ assignedPersonInstance : assignedPersonInstance ] }
+    }
+
+    def delete = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+        if(assignedPersonInstance) {
+            try {
+                def taskId = assignedPersonInstance.task.id
+                assignedPersonInstance.delete()
+                flash.message = "AssignedPerson ${params.id} deleted"
+                redirect(controller:"taskDetailed", action:"show", id: taskId)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "AssignedPerson ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
+        }
+        else {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+
+        if(!assignedPersonInstance) {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ assignedPersonInstance : assignedPersonInstance ]
+        }
+    }
+
+    def update = {
+        def assignedPersonInstance = AssignedPerson.get( params.id )
+        if(assignedPersonInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(assignedPersonInstance.version > version) {
+
+                    assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.")
+                    render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
+                    return
+                }
+            }
+            assignedPersonInstance.properties = params
+            if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
+                flash.message = "AssignedPerson ${params.id} updated"
+                redirect(action:show,id:assignedPersonInstance.id)
+            }
+            else {
+                render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
+            }
+        }
+        else {
+            flash.message = "AssignedPerson not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        if(!params.task?.id) {
+            flash.message = "Please select a task and then 'Add Assigned Person'"
+            redirect(controller: "taskDetailed", action: search)
+        }
+        else {
+            def assignedPersonInstance = new AssignedPerson()
+            assignedPersonInstance.properties = params
+            return ['assignedPersonInstance':assignedPersonInstance]
+        }
+    }
+
+    def save = {
+        def assignedPersonInstance = new AssignedPerson(params)
+
+        if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
+            flash.message = "AssignedPerson ${assignedPersonInstance.id} created"
+            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        }
+        else {
+            render(view:'create',model:[assignedPersonInstance:assignedPersonInstance])
+        }
+    }
+}
Index: trunk/grails-app/domain/AssignedGroup.groovy
===================================================================
--- trunk/grails-app/domain/AssignedGroup.groovy	(revision 240)
+++ 	(revision )
@@ -1,18 +1,0 @@
-class AssignedGroup {
-
-    PersonGroup personGroup
-    Task task
-    Integer estimatedHour = 0
-    Integer estimatedMinute = 0
-
-    static constraints = {
-        task()
-        personGroup()
-        estimatedHour(min:0)
-        estimatedMinute(min:0,max:59)
-    }
-
-    String toString() {
-        "${personGroup.name} - ${estimatedHour}h : ${estimatedMinute}min"
-    }
-}
Index: trunk/grails-app/domain/AssignedPerson.groovy
===================================================================
--- trunk/grails-app/domain/AssignedPerson.groovy	(revision 241)
+++ trunk/grails-app/domain/AssignedPerson.groovy	(revision 241)
@@ -0,0 +1,18 @@
+class AssignedPerson {
+
+    Person person
+    Task task
+    Integer estimatedHour = 0
+    Integer estimatedMinute = 0
+
+    static constraints = {
+        task()
+        person()
+        estimatedHour(min:0)
+        estimatedMinute(min:0,max:59)
+    }
+
+    String toString() {
+        "${person.firstName} ${person.lastName} - ${estimatedHour}h : ${estimatedMinute}min"
+    }
+}
Index: trunk/grails-app/domain/Task.groovy
===================================================================
--- trunk/grails-app/domain/Task.groovy	(revision 240)
+++ trunk/grails-app/domain/Task.groovy	(revision 241)
@@ -21,5 +21,5 @@
     static hasMany = [entries: Entry, 
                         taskModifications: TaskModification,
-                        assignedGroups: AssignedGroup,
+                        assignedPersons: AssignedPerson,
                         subTasks: Task,
                         associatedAssets: Asset,
Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy	(revision 240)
+++ trunk/grails-app/services/CreateDataService.groovy	(revision 241)
@@ -110,5 +110,5 @@
         createDemoTasks()
         createDemoEntries()
-        createDemoAssignedGroups()
+        createDemoAssignedPersons()
         createDemoTaskRecurringSchedules()
 
@@ -655,22 +655,22 @@
     }
 
-    def createDemoAssignedGroups() {
-
-        //AssignedGroup
-        def assignedGroupInstance
-
-        //AssignedGroup #1
-        assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(4),
+    def createDemoAssignedPersons() {
+
+        //AssignedPerson
+        def assignedPersonInstance
+
+        //AssignedPerson #1
+        assignedPersonInstance = new AssignedPerson(person: Person.get(4),
                                                                                         task: Task.get(1),
                                                                                         estimatedHour: 1,
                                                                                         estimatedMinute: 20)
-        saveAndTest(assignedGroupInstance)
-
-        //AssignedGroup #2
-        assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(5),
+        saveAndTest(assignedPersonInstance)
+
+        //AssignedPerson #2
+        assignedPersonInstance = new AssignedPerson(person: Person.get(5),
                                                                                         task: Task.get(1),
                                                                                         estimatedHour: 3,
                                                                                         estimatedMinute: 30)
-        saveAndTest(assignedGroupInstance)
+        saveAndTest(assignedPersonInstance)
     }
 
Index: trunk/grails-app/services/TaskService.groovy
===================================================================
--- trunk/grails-app/services/TaskService.groovy	(revision 240)
+++ trunk/grails-app/services/TaskService.groovy	(revision 241)
@@ -97,8 +97,8 @@
         if(params.taskProcedure) p.taskProcedure = params.taskProcedure
 
-                    //Set the assignedGroups
-//                     taskInstance.assignedGroups.each() {
+                    //Set the assignedPersons
+//                     taskInstance.assignedPersons.each() {
 // 
-//                     def assignedGroup = new AssignedGroup(person: it.person,
+//                     def assignedPerson = new AssignedPerson(person: it.person,
 //                                                                                             task: subTaskInstance,
 //                                                                                             estimatedHour: it.estimatedHour,
Index: trunk/grails-app/views/assignedPerson/create.gsp
===================================================================
--- trunk/grails-app/views/assignedPerson/create.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPerson/create.gsp	(revision 241)
@@ -0,0 +1,73 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create AssignedPerson</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create AssignedPerson</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${assignedPersonInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${assignedPersonInstance}" 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="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${assignedPersonInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="estimatedHour">Estimated Hour:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}">
+                                    <input type="text" id="estimatedHour" name="estimatedHour" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="estimatedMinute">Estimated Minute:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}">
+                                    <input type="text" id="estimatedMinute" name="estimatedMinute" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                </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: trunk/grails-app/views/assignedPerson/edit.gsp
===================================================================
--- trunk/grails-app/views/assignedPerson/edit.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPerson/edit.gsp	(revision 241)
@@ -0,0 +1,77 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit AssignedPerson</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit AssignedPerson</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${assignedPersonInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${assignedPersonInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${assignedPersonInstance?.id}" />
+                <input type="hidden" name="version" value="${assignedPersonInstance?.version}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${assignedPersonInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="estimatedHour">Estimated Hour:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}">
+                                    <input type="text" id="estimatedHour" name="estimatedHour" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="estimatedMinute">Estimated Minute:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}">
+                                    <input type="text" id="estimatedMinute" name="estimatedMinute" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                </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: trunk/grails-app/views/assignedPerson/list.gsp
===================================================================
--- trunk/grails-app/views/assignedPerson/list.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPerson/list.gsp	(revision 241)
@@ -0,0 +1,59 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>AssignedPerson List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+        </div>
+        <div class="body">
+            <h1>AssignedPerson 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" />
+                        
+                   	        <th>Task</th>
+                   	    
+                   	        <th>Person</th>
+                   	    
+                   	        <g:sortableColumn property="estimatedHour" title="Estimated Hour" />
+                        
+                   	        <g:sortableColumn property="estimatedMinute" title="Estimated Minute" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${assignedPersonInstanceList}" status="i" var="assignedPersonInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${assignedPersonInstance.id}">${fieldValue(bean:assignedPersonInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'task')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'person')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'estimatedHour')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'estimatedMinute')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${assignedPersonInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: trunk/grails-app/views/assignedPerson/show.gsp
===================================================================
--- trunk/grails-app/views/assignedPerson/show.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPerson/show.gsp	(revision 241)
@@ -0,0 +1,71 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show AssignedPerson</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show AssignedPerson</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:assignedPersonInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${assignedPersonInstance?.task?.id}">${assignedPersonInstance?.task?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${assignedPersonInstance?.person?.id}">${assignedPersonInstance?.person?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Estimated Hour:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:assignedPersonInstance, field:'estimatedHour')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Estimated Minute:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:assignedPersonInstance, field:'estimatedMinute')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${assignedPersonInstance?.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>
+    </body>
+</html>
Index: trunk/grails-app/views/assignedPersonDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/create.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPersonDetailed/create.gsp	(revision 241)
@@ -0,0 +1,72 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create AssignedPerson</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <h1>Create Assigned Person</h1>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${assignedPersonInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${assignedPersonInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <input type="hidden"  name="task.id" value="${assignedPersonInstance?.task?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'task','errors')}">
+                                    ${assignedPersonInstance?.task}
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Estimated Duration:</label>
+                                </td>
+
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}" 
+                                        type="text" id="estimatedHour" name="estimatedHour" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}" 
+                                        type="text" id="estimatedMinute" name="estimatedMinute" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                    <g:helpBalloon code="assignedPerson.estimatedDuration" />
+                                </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: trunk/grails-app/views/assignedPersonDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/edit.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPersonDetailed/edit.gsp	(revision 241)
@@ -0,0 +1,73 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit AssignedPerson</title>
+    </head>
+    <body>
+        <div class="nav">
+            <h1>Edit Assigned Person</h1>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${assignedPersonInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${assignedPersonInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${assignedPersonInstance?.id}" />
+                <input type="hidden" name="version" value="${assignedPersonInstance?.version}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${assignedPersonInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Estimated Duration:</label>
+                                </td>
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}" 
+                                        type="text" id="estimatedHour" name="estimatedHour" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}" 
+                                        type="text" id="estimatedMinute" name="estimatedMinute" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                    <g:helpBalloon code="assignedPerson.estimatedDuration" />
+                                </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: trunk/grails-app/views/assignedPersonDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/list.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPersonDetailed/list.gsp	(revision 241)
@@ -0,0 +1,58 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>AssignedPerson List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <h1>Assigned Person List</h1>
+        </div>
+        <div class="body">
+            <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" />
+                        
+                   	        <th>Task</th>
+                   	    
+                   	        <th>Person</th>
+                   	    
+                   	        <g:sortableColumn property="estimatedHour" title="Estimated Hour" />
+                        
+                   	        <g:sortableColumn property="estimatedMinute" title="Estimated Minute" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${assignedPersonInstanceList}" status="i" var="assignedPersonInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${assignedPersonInstance.id}">${fieldValue(bean:assignedPersonInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'task')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'person')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'estimatedHour')}</td>
+                        
+                            <td>${fieldValue(bean:assignedPersonInstance, field:'estimatedMinute')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${assignedPersonInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: trunk/grails-app/views/assignedPersonDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/show.gsp	(revision 241)
+++ trunk/grails-app/views/assignedPersonDetailed/show.gsp	(revision 241)
@@ -0,0 +1,60 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show AssignedPerson</title>
+    </head>
+    <body>
+        <div class="nav">
+            <h1>Show Assigned Person</h1>
+        </div>
+        <div class="body">
+            <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:assignedPersonInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskDetailed" action="show" id="${assignedPersonInstance?.task?.id}">${assignedPersonInstance?.task?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${assignedPersonInstance?.person?.id}">${assignedPersonInstance?.person?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Estimated Duration:</td>
+                            <td valign="top" class="value">${assignedPersonInstance.estimatedHour}h : ${assignedPersonInstance.estimatedMinute}min</td>
+                        </tr>
+
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${assignedPersonInstance?.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>
+    </body>
+</html>
Index: trunk/grails-app/views/task/edit.gsp
===================================================================
--- trunk/grails-app/views/task/edit.gsp	(revision 240)
+++ trunk/grails-app/views/task/edit.gsp	(revision 241)
@@ -139,14 +139,14 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assignedGroups">Assigned Groups:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedGroups','errors')}">
-                                    
-<ul>
-<g:each var="a" in="${taskInstance?.assignedGroups?}">
-    <li><g:link controller="assignedGroup" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="assignedGroup" params="['task.id':taskInstance?.id]" action="create">Add AssignedGroup</g:link>
+                                    <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="assignedPerson" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="assignedPerson" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
 
                                 </td>
Index: trunk/grails-app/views/task/show.gsp
===================================================================
--- trunk/grails-app/views/task/show.gsp	(revision 240)
+++ trunk/grails-app/views/task/show.gsp	(revision 241)
@@ -114,10 +114,10 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Assigned Groups:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="a" in="${taskInstance.assignedGroups}">
-                                    <li><g:link controller="assignedGroup" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                            <td valign="top" class="name">Assigned Persons:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="a" in="${taskInstance.assignedPersons}">
+                                    <li><g:link controller="assignedPerson" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
Index: trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/edit.gsp	(revision 240)
+++ trunk/grails-app/views/taskDetailed/edit.gsp	(revision 241)
@@ -151,11 +151,11 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assignedGroups">Assigned Groups:</label>
+                                    <label for="assignedPersons">Assigned Persons:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedGroups','errors')}">
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedPersons','errors')}">
                                     
                                 <ul>
-                                <g:each var="a" in="${taskInstance?.assignedGroups?}">
-                                    <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                <g:each var="a" in="${taskInstance?.assignedPersons?}">
+                                    <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 240)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 241)
@@ -183,13 +183,13 @@
 
                                     <tr class="prop">
-                                        <td valign="top" class="name">Assigned Groups:</td>
+                                        <td valign="top" class="name">Assigned Persons:</td>
 
                                         <td  valign="top" style="text-align:left;" class="value">
                                             <ul>
-                                            <g:each var="a" in="${taskInstance.assignedGroups}">
-                                                <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                            <g:each var="a" in="${taskInstance.assignedPersons}">
+                                                <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
                                             </g:each>
                                             </ul>
-                                            <g:link controller="assignedGroupDetailed" params="['task.id':taskInstance?.id]" action="create">Add Assigned Group</g:link>
+                                            <g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
                                         </td>