Index: /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 156) +++ /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 157) @@ -4,7 +4,7 @@ class TaskRecurringScheduleDetailedController extends BaseController { - - def dateUtilService - + + def dateUtilService + def index = { redirect(action:list,params:params) } @@ -21,5 +21,5 @@ if(!taskRecurringScheduleInstance) { - flash.message = "TaskRecurringSchedule not found with id ${params.id}" + flash.message = "Recurring Schedule not found with id ${params.id}" redirect(action:list) } @@ -32,14 +32,14 @@ try { taskRecurringScheduleInstance.delete() - flash.message = "TaskRecurringSchedule ${params.id} deleted" + flash.message = "Recurring Schedule ${params.id} deleted" redirect(action:list) } catch(org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "TaskRecurringSchedule ${params.id} could not be deleted" + flash.message = "Recurring Schedule ${params.id} could not be deleted" redirect(action:show,id:params.id) } } else { - flash.message = "TaskRecurringSchedule not found with id ${params.id}" + flash.message = "Recurring Schedule not found with id ${params.id}" redirect(action:list) } @@ -50,5 +50,5 @@ if(!taskRecurringScheduleInstance) { - flash.message = "TaskRecurringSchedule not found with id ${params.id}" + flash.message = "Recurring Schedule not found with id ${params.id}" redirect(action:list) } @@ -59,61 +59,61 @@ def update = { - TaskRecurringSchedule.withTransaction { status -> - - def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id ) - if(taskRecurringScheduleInstance) { - - if(params.version) { - def version = params.version.toLong() - if(taskRecurringScheduleInstance.version > version) { - taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this TaskRecurringSchedule while you were editing.") - render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - return - } - } - - Date originalDate = taskRecurringScheduleInstance.startDate - taskRecurringScheduleInstance.properties = params // Domain object is now 'dirty'. - Date newDate = taskRecurringScheduleInstance.startDate - - // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date. - if(originalDate.getTime() != newDate.getTime()) - { - if(newDate < dateUtilService.getToday()) - { - status.setRollbackOnly() // Only allow the transaction to Rollback, preventing flush due to 'dirty'. - taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") - render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - return - } - } - - taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate - taskRecurringScheduleInstance.setNextGenerationDate() - taskRecurringScheduleInstance.setNextTargetCompletionDate() - - if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) - { - flash.message = "TaskRecurringSchedule ${params.id} updated" - redirect(action:show,id:taskRecurringScheduleInstance.id) - } - else - { - render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - } - } - else - { - flash.message = "TaskRecurringSchedule not found with id ${params.id}" - redirect(action:edit,id:params.id) - } - - } // end withTransaction - } // end update() - + TaskRecurringSchedule.withTransaction { status -> + + def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id ) + if(taskRecurringScheduleInstance) { + + if(params.version) { + def version = params.version.toLong() + if(taskRecurringScheduleInstance.version > version) { + taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this Recurring Schedule while you were editing.") + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + return + } + } + + Date originalDate = taskRecurringScheduleInstance.startDate + taskRecurringScheduleInstance.properties = params // Domain object is now 'dirty'. + Date newDate = taskRecurringScheduleInstance.startDate + + // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date. + if(originalDate.getTime() != newDate.getTime()) + { + if(newDate < dateUtilService.getToday()) + { + status.setRollbackOnly() // Only allow the transaction to Rollback, preventing flush due to 'dirty'. + taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + return + } + } + + taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate + taskRecurringScheduleInstance.setNextGenerationDate() + taskRecurringScheduleInstance.setNextTargetCompletionDate() + + if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) + { + flash.message = "Recurring Schedule ${params.id} updated" + redirect(action:show,id:taskRecurringScheduleInstance.id) + } + else + { + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + } + } + else + { + flash.message = "Recurring Schedule not found with id ${params.id}" + redirect(action:edit,id:params.id) + } + + } // end withTransaction + } // end update() + def create = { try { def taskInstance = Task.get(params.taskInstance.id) - def taskRecurringScheduleInstance = new TaskRecurringSchedule() + def taskRecurringScheduleInstance = new TaskRecurringSchedule() taskRecurringScheduleInstance.task = taskInstance return [taskRecurringScheduleInstance: taskRecurringScheduleInstance] @@ -127,33 +127,33 @@ def save = { def taskRecurringScheduleInstance = new TaskRecurringSchedule(params) - def taskInstance = Task.get(params.task.id) - - if(taskInstance.taskRecurringSchedule) { - flash.message = "This task already has a recurring schedule" - redirect(controller:"taskDetailed", action:"show", id: params.task.id) - } - else { - - if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) { - taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") - } - - if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { - - taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance - - if(taskInstance.save()) { - flash.message = "TaskRecurringSchedule ${taskRecurringScheduleInstance.id} created" - redirect(action:show,id:taskRecurringScheduleInstance.id) - } - else { - flash.message = "Task could not be saved and therefore the Recurring Schedule has been disgarded, cause unknown." - render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - } - } - else { - render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - } - } + def taskInstance = Task.get(params.task.id) + + if(taskInstance.taskRecurringSchedule) { + flash.message = "This task already has a recurring schedule" + redirect(controller:"taskDetailed", action:"show", id: params.task.id) + } + else { + + if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) { + taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") + } + + if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { + + taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance + + if(taskInstance.save()) { + flash.message = "Recurring Schedule ${taskRecurringScheduleInstance.id} created" + redirect(action:show,id:taskRecurringScheduleInstance.id) + } + else { + flash.message = "Task could not be saved and therefore the Recurring Schedule has been disgarded, cause unknown." + render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + } + } + else { + render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + } + } } // end save() Index: /trunk/grails-app/views/taskRecurringSchedule/create.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringSchedule/create.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringSchedule/create.gsp (revision 157) @@ -9,5 +9,5 @@
- Home + Home TaskRecurringSchedule List
@@ -29,4 +29,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42,13 +69,4 @@ - - - - - - - - - @@ -74,13 +92,4 @@ - - - - - - - - - @@ -92,8 +101,17 @@ - + - - + + + + + + + + + + + @@ -126,4 +144,13 @@ + + + + + + + + + Index: /trunk/grails-app/views/taskRecurringSchedule/edit.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringSchedule/edit.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringSchedule/edit.gsp (revision 157) @@ -9,5 +9,5 @@
- Home + Home TaskRecurringSchedule List New TaskRecurringSchedule @@ -32,4 +32,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,13 +72,4 @@ - - - - - - - - - @@ -77,13 +95,4 @@ - - - - - - - - - @@ -95,8 +104,17 @@ - + - - + + + + + + + + + + + @@ -129,4 +147,13 @@ + + + + + + + + + Index: /trunk/grails-app/views/taskRecurringSchedule/list.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringSchedule/list.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringSchedule/list.gsp (revision 157) @@ -9,5 +9,5 @@
- Home + Home New TaskRecurringSchedule
@@ -24,14 +24,14 @@ + + + + + + Last Generated Sub Task - - - Generate Ahead Period - - - @@ -42,13 +42,13 @@ ${fieldValue(bean:taskRecurringScheduleInstance, field:'id')} + ${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')} + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'taskDuration')} + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')} + ${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')} ${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')} - - ${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')} - - ${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAheadPeriod')} - - ${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')} Index: /trunk/grails-app/views/taskRecurringSchedule/show.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringSchedule/show.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringSchedule/show.gsp (revision 157) @@ -9,5 +9,5 @@
- Home + Home TaskRecurringSchedule List New TaskRecurringSchedule @@ -31,4 +31,25 @@ + Recur Every: + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')} + + + + + Task Duration: + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'taskDuration')} + + + + + Generate Ahead: + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')} + + + + Last Generated Date: @@ -41,11 +62,4 @@ ${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()} - - - - - Generate Ahead: - - ${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')} @@ -66,11 +80,4 @@ - Next Due Date: - - ${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')} - - - - Next Generation Date: @@ -80,7 +87,14 @@ - Recur Every: + Next Target Completion Date: - ${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')} + ${fieldValue(bean:taskRecurringScheduleInstance, field:'nextTargetCompletionDate')} + + + + + Next Target Start Date: + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'nextTargetStartDate')} @@ -107,4 +121,11 @@ + + Task Duration Period: + + ${taskRecurringScheduleInstance?.taskDurationPeriod?.encodeAsHTML()} + + + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 157) @@ -5,13 +5,12 @@ - Create TaskRecurringSchedule + Create TaskRecurringSchedule +
- Home - TaskRecurringSchedule List +

Create Recurring Schedule

-

Create TaskRecurringSchedule

${flash.message}
@@ -42,5 +41,5 @@ - + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 157) @@ -6,13 +6,11 @@ Edit TaskRecurringSchedule +
- Home - TaskRecurringSchedule List - New TaskRecurringSchedule +

Edit Recurring Schedule

-

Edit TaskRecurringSchedule

${flash.message}
@@ -44,5 +42,5 @@ - + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 156) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 157) @@ -9,10 +9,7 @@
- Home - TaskRecurringSchedule List - New TaskRecurringSchedule +

Show Recurring Schedule

-

Show TaskRecurringSchedule

${flash.message}