Index: trunk/grails-app/views/taskRecurringSchedule/create.gsp =================================================================== --- trunk/grails-app/views/taskRecurringSchedule/create.gsp (revision 151) +++ 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 151) +++ 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 151) +++ 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 151) +++ 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()} + + +