Index: /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 134) +++ /trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 135) @@ -89,5 +89,5 @@ } catch(Exception e) { - flash.message = "Please select a task, then Create a Recurring Schedule for it.'" + flash.message = "Please select a task, then Create a Recurring Schedule for it" redirect(controller:"taskDetailed", action:"list") } @@ -97,23 +97,52 @@ def taskRecurringScheduleInstance = new TaskRecurringSchedule(params) def taskInstance = Task.get(params.task.id) - - if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { + + if(taskInstance.taskRecurringSchedule) { + flash.message = "This task already has a recurring schedule" + redirect(controller:"taskDetailed", action:"show", id: params.task.id) + } + else { - taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance - - if(taskInstance.save()) { - flash.message = "TaskRecurringSchedule ${taskRecurringScheduleInstance.id} created" - redirect(action:show,id:taskRecurringScheduleInstance.id) + taskRecurringScheduleInstance.nextDueDate = new Date() + +// taskRecurringScheduleInstance.nextDueDate = calculateNextDueDate(new Date()) + + 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 { - 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]) } } +// private Date calculateNextDueDate(nextDue) { +// // def now = new Date() +// // def calculatedDays = new Integer() +// // def nextDue = new Date() +// +// // switch (period) { +// // case "Day(s)": +// // calculatedDays = period +// // nextDue = now + calculatedDays +// // case "Week(s)": +// // calculatedDays = period * 7 +// // nextDue = now + calculatedDays +// // // default: +// // } +// nextDue = nextDue + 1 +// return nextDue +// } + } Index: /trunk/grails-app/domain/TaskRecurringSchedule.groovy =================================================================== --- /trunk/grails-app/domain/TaskRecurringSchedule.groovy (revision 134) +++ /trunk/grails-app/domain/TaskRecurringSchedule.groovy (revision 135) @@ -4,5 +4,5 @@ Period period - Integer recurEvery + Integer recurEvery = 1 Date startDate = new Date() Date lastGeneratedDate Index: /trunk/grails-app/views/login/auth.gsp =================================================================== --- /trunk/grails-app/views/login/auth.gsp (revision 134) +++ /trunk/grails-app/views/login/auth.gsp (revision 135) @@ -56,5 +56,5 @@

- +

Index: /trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/show.gsp (revision 134) +++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 135) @@ -395,12 +395,31 @@ Start Date: - ${taskRecurringScheduleInstance.startDate} - + + + + + + + + Is Enabled: + + ${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')} + + + + + + + + + - Next Due Date: - - ${taskRecurringScheduleInstance.nextDueDate} + Next Due Date: + + + + @@ -408,6 +427,8 @@ Last Generated Date: - - ${taskRecurringScheduleInstance.lastGeneratedDate} + + + + @@ -415,7 +436,10 @@ Last Generated Sub Task: - - ${taskRecurringScheduleInstance.lastGeneratedSubTask} - + + + + ${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()} + + @@ -424,5 +448,5 @@

- + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 134) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 135) @@ -32,6 +32,15 @@ - - ${taskRecurringScheduleInstance.task} + + ${taskRecurringScheduleInstance?.task?.encodeAsHTML()} + + + + + + + + + @@ -39,19 +48,12 @@ - + - - + + + - - - - - - - - - - + @@ -61,40 +63,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 134) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 135) @@ -29,20 +29,31 @@ - + + + + + + - - - + + - @@ -55,50 +66,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 134) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 135) @@ -24,13 +24,13 @@ - + - - + + + + - - - - + + @@ -38,17 +38,22 @@ - + + - + - + + + - - - - + + Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 134) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 135) @@ -20,7 +20,6 @@
+ + + ${taskRecurringScheduleInstance?.task?.encodeAsHTML()} +
- + - + +
- + - + + +
- - - -
- - - -
- - - -
- - - -
- - - -
Last Generated Sub TaskPeriod
${fieldValue(bean:taskRecurringScheduleInstance, field:'id')}${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}${fieldValue(bean:taskRecurringScheduleInstance, field:'task')}${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}${fieldValue(bean:taskRecurringScheduleInstance, field:'period')} ${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')}${fieldValue(bean:taskRecurringScheduleInstance, field:'period')} + + Show + +
- - - + + @@ -29,17 +28,29 @@ + + + + + - + - + - + - - + @@ -50,37 +61,38 @@ + + + + + + + + - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - +
Id:
+ + + ${taskRecurringScheduleInstance?.task?.encodeAsHTML()} +
Last Generated Date:Recur Every:${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')} + ${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.period} +
Last Generated Sub Task:Start Date:${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()} + +
Next Due Date:${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')} + +
Last Generated Date: + +
Period:Last Generated Sub Task:${taskRecurringScheduleInstance?.period?.encodeAsHTML()}
Recur Every:${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}
Start Date:${fieldValue(bean:taskRecurringScheduleInstance, field:'startDate')}
Task:${taskRecurringScheduleInstance?.task?.encodeAsHTML()} + + ${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()} + +