Index: trunk/grails-app/controllers/AssignedGroupController.groovy
===================================================================
--- trunk/grails-app/controllers/AssignedGroupController.groovy (revision 242)
+++ trunk/grails-app/controllers/AssignedGroupController.groovy (revision 242)
@@ -0,0 +1,99 @@
+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 242)
+++ trunk/grails-app/controllers/AssignedGroupDetailedController.groovy (revision 242)
@@ -0,0 +1,107 @@
+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/domain/AssignedGroup.groovy
===================================================================
--- trunk/grails-app/domain/AssignedGroup.groovy (revision 242)
+++ trunk/grails-app/domain/AssignedGroup.groovy (revision 242)
@@ -0,0 +1,18 @@
+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/Task.groovy
===================================================================
--- trunk/grails-app/domain/Task.groovy (revision 241)
+++ trunk/grails-app/domain/Task.groovy (revision 242)
@@ -21,4 +21,5 @@
static hasMany = [entries: Entry,
taskModifications: TaskModification,
+ assignedGroups: AssignedGroup,
assignedPersons: AssignedPerson,
subTasks: Task,
Index: trunk/grails-app/i18n/messages.properties
===================================================================
--- trunk/grails-app/i18n/messages.properties (revision 241)
+++ trunk/grails-app/i18n/messages.properties (revision 242)
@@ -4,7 +4,6 @@
person.personGroups=Person Groups
-person.personGroups.help= Groups are for grouping people for information purposes. \
-For example a person with training in an area can be added to that group and that group assigned to a task. \
-This group then provides a record of persons trained in that area. \
+person.personGroups.help=Groups may be assigned to tasks and \
+may also provide a record of persons qualified or trained in a specific area. \
Use Ctrl or Shift to select multiple groups. \
Groups provide no application authorisations.
@@ -35,6 +34,11 @@
Include condition and contributing factors.
+assignedGroup.estimatedDuration=Estimated Duration
+assignedGroup.estimatedDuration.help=The estimated amount of time (hh:mm) that you would \
+like to assign this group to the task.
+
assignedPerson.estimatedDuration=Estimated Duration
-assignedPerson.estimatedDuration.help=The estimated amount of time (hh:mm) that you would like to assign this person to the task.
+assignedPerson.estimatedDuration.help=The estimated amount of time (hh:mm) that you would \
+like to assign this person to the task.
task.notFound=Could not complete operation, task not found.
@@ -47,4 +51,6 @@
taskRecurringSchedule.notFound=Could not complete operation, recurring schedule not found.
+task.assignedGroups=Assigned Groups
+task.assignedGroups.help=The person groups assigned to work on this task during planning along with estimated time.
task.assignedPersons=Assigned Persons
task.assignedPersons.help=The persons assigned to work on this task during planning along with estimated time.
Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy (revision 241)
+++ trunk/grails-app/services/CreateDataService.groovy (revision 242)
@@ -110,4 +110,5 @@
createDemoTasks()
createDemoEntries()
+ createDemoAssignedGroups()
createDemoAssignedPersons()
createDemoTaskRecurringSchedules()
@@ -655,4 +656,24 @@
}
+ def createDemoAssignedGroups() {
+
+ //AssignedGroup
+ def assignedGroupInstance
+
+ //AssignedGroup #1
+ assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(1),
+ task: Task.get(1),
+ estimatedHour: 2,
+ estimatedMinute: 30)
+ saveAndTest(assignedGroupInstance)
+
+ //AssignedGroup #2
+ assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(2),
+ task: Task.get(1),
+ estimatedHour: 1,
+ estimatedMinute: 0)
+ saveAndTest(assignedGroupInstance)
+ }
+
def createDemoAssignedPersons() {
Index: trunk/grails-app/views/assignedGroup/create.gsp
===================================================================
--- trunk/grails-app/views/assignedGroup/create.gsp (revision 242)
+++ trunk/grails-app/views/assignedGroup/create.gsp (revision 242)
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+ Create AssignedGroup
+
+
+
+
+
+
+
Create AssignedGroup
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Edit AssignedGroup
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
AssignedGroup List
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+ | Task |
+
+ Person Group |
+
+
+
+
+
+
+
+
+
+
+
+ | ${fieldValue(bean:assignedGroupInstance, field:'id')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'task')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'personGroup')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedHour')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedMinute')} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Show AssignedGroup
+
+ ${flash.message}
+
+
+
+
+
+
+
+ | Id: |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'id')} |
+
+
+
+
+ | Task: |
+
+ ${assignedGroupInstance?.task?.encodeAsHTML()} |
+
+
+
+
+ | Person Group: |
+
+ ${assignedGroupInstance?.personGroup?.encodeAsHTML()} |
+
+
+
+
+ | Estimated Hour: |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedHour')} |
+
+
+
+
+ | Estimated Minute: |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedMinute')} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Create Assigned Group
+
+
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Edit Assigned Group
+
+
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Assigned Group List
+
+
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+ | Task |
+
+ Group |
+
+
+
+
+
+
+
+
+
+
+
+ | ${fieldValue(bean:assignedGroupInstance, field:'id')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'task')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'personGroup')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedHour')} |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'estimatedMinute')} |
+
+
+
+
+
+
+
+
+
+
+
Show Assigned Group
+
+
+
+ ${flash.message}
+
+
+
+
+
+
+
+ | Id: |
+
+ ${fieldValue(bean:assignedGroupInstance, field:'id')} |
+
+
+
+
+ | Task: |
+
+ ${assignedGroupInstance?.task?.encodeAsHTML()} |
+
+
+
+
+ | Group: |
+
+ ${assignedGroupInstance?.personGroup?.encodeAsHTML()} |
+
+
+
+
+ | Estimated Duration: |
+ ${assignedGroupInstance.estimatedHour}h : ${assignedGroupInstance.estimatedMinute}min |
+
+
+
+
+
+
+
+
+
+
+
+
+
- ${assignedPersonInstance?.task}
+ |
+
+ ${assignedPersonInstance?.task.encodeAsHTML()}
+
|
-
+
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 242)
@@ -31,8 +31,10 @@
- |
-
+ |
+
+ ${assignedPersonInstance?.task.encodeAsHTML()}
+
|
-
+
Index: trunk/grails-app/views/task/edit.gsp
===================================================================
--- trunk/grails-app/views/task/edit.gsp (revision 241)
+++ trunk/grails-app/views/task/edit.gsp (revision 242)
@@ -139,4 +139,20 @@
|
+
+ |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+Add AssignedGroup
+
+ |
+
+
+
+ |
|
Index: trunk/grails-app/views/task/show.gsp
===================================================================
--- trunk/grails-app/views/task/show.gsp (revision 241)
+++ trunk/grails-app/views/task/show.gsp (revision 242)
@@ -114,4 +114,17 @@
+ | Assigned Groups: |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+ |
+
+
+
+
| Assigned Persons: |
Index: trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/edit.gsp (revision 241)
+++ trunk/grails-app/views/taskDetailed/edit.gsp (revision 242)
@@ -151,4 +151,19 @@
|
+
+ |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+
+ |
+
+
+
+ |
|
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp (revision 241)
+++ trunk/grails-app/views/taskDetailed/show.gsp (revision 242)
@@ -183,4 +183,19 @@
+ | Assigned Groups: |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+ Add Assigned Group
+ |
+
+
+
+
+
| Assigned Persons: |
@@ -191,5 +206,5 @@
- Add AssignedPerson
+ Add Assigned Person