Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 196)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 199)
@@ -462,14 +462,28 @@
 
                                             <td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Start Date:</td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Next Generation Date:</td>
 
                                             <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.startDate}" format="EEE, dd-MMM-yyyy"/>
+                                                <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd-MMM-yyyy"/>
                                             </td>
-
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Generate Ahead:</td>
+
+                                            <td valign="top" class="value">
+                                                ${taskRecurringScheduleInstance?.generateAhead} ${Period.get(1).encodeAsHTML()}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Next Target Start Date:</td>
+
+                                            <td valign="top" class="value">
+                                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
+                                            </td>
                                         </tr>
 
@@ -483,71 +497,17 @@
 
                                         <tr class="prop">
-                                            <td valign="top" class="name">Generate Ahead:</td>
-
-                                            <td valign="top" class="value">
-                                                ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod}
-                                            </td>
-
-                                        </tr>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Is Enabled:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
-
-                                        </tr>
-
-                                    </tbody>
-                                </table>
-
-                                <table>
-                                    <tbody>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Target Start Date:</td>   
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Target Completion Date:</td>   
+                                            <td valign="top" class="name">Next Target Completion Date:</td>
 
                                             <td valign="top" class="value">
                                                 <g:formatDate date="${taskRecurringScheduleInstance.nextTargetCompletionDate}" format="EEE, dd-MMM-yyyy"/>
                                             </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Generation Date:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Last Generated Date:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.lastGeneratedDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Last Generated Sub Task:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}">
-                                                    ${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()}
-                                                </g:link>
-                                            </td>
-                                        </tr>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Enabled:</td>
+
+                                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
+                                        </tr>
+
                                     </tbody>
                                 </table>
@@ -557,4 +517,5 @@
                                     <input type="hidden" name="id" value="${taskRecurringScheduleInstance?.id}" />
                                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                                    <span class="button"><g:actionSubmit class="go" value="Show" /></span>
                                 </g:form>
                             </div>
Index: trunk/grails-app/views/taskRecurringSchedule/create.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/create.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringSchedule/create.gsp	(revision 199)
@@ -55,13 +55,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lastGeneratedDate">Last Generated Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'lastGeneratedDate','errors')}">
-                                    <g:datePicker name="lastGeneratedDate" value="${taskRecurringScheduleInstance?.lastGeneratedDate}" precision="minute" noSelection="['':'']"></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="lastGeneratedSubTask">Last Generated Sub Task:</label>
                                 </td>
@@ -73,17 +64,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="generateAheadPeriod">Generate Ahead Period:</label>
+                                    <label for="enabled">Enabled:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAheadPeriod','errors')}">
-                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isEnabled">Is Enabled:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'isEnabled','errors')}">
-                                    <g:checkBox name="isEnabled" value="${taskRecurringScheduleInstance?.isEnabled}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'enabled','errors')}">
+                                    <g:checkBox name="enabled" value="${taskRecurringScheduleInstance?.enabled}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -127,8 +109,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="startDate">Start Date:</label>
+                                    <label for="subTasksGenerated">Sub Tasks Generated:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}">
-                                    <g:datePicker name="startDate" value="${taskRecurringScheduleInstance?.startDate}" precision="minute" ></g:datePicker>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'subTasksGenerated','errors')}">
+                                    <input type="text" id="subTasksGenerated" name="subTasksGenerated" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'subTasksGenerated')}" />
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskRecurringSchedule/edit.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/edit.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringSchedule/edit.gsp	(revision 199)
@@ -58,13 +58,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lastGeneratedDate">Last Generated Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'lastGeneratedDate','errors')}">
-                                    <g:datePicker name="lastGeneratedDate" value="${taskRecurringScheduleInstance?.lastGeneratedDate}" precision="minute" noSelection="['':'']"></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="lastGeneratedSubTask">Last Generated Sub Task:</label>
                                 </td>
@@ -76,17 +67,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="generateAheadPeriod">Generate Ahead Period:</label>
+                                    <label for="enabled">Enabled:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAheadPeriod','errors')}">
-                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isEnabled">Is Enabled:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'isEnabled','errors')}">
-                                    <g:checkBox name="isEnabled" value="${taskRecurringScheduleInstance?.isEnabled}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'enabled','errors')}">
+                                    <g:checkBox name="enabled" value="${taskRecurringScheduleInstance?.enabled}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -130,8 +112,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="startDate">Start Date:</label>
+                                    <label for="subTasksGenerated">Sub Tasks Generated:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}">
-                                    <g:datePicker name="startDate" value="${taskRecurringScheduleInstance?.startDate}" precision="minute" ></g:datePicker>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'subTasksGenerated','errors')}">
+                                    <input type="text" id="subTasksGenerated" name="subTasksGenerated" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'subTasksGenerated')}" />
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskRecurringSchedule/list.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/list.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringSchedule/list.gsp	(revision 199)
@@ -29,8 +29,8 @@
                    	        <g:sortableColumn property="generateAhead" title="Generate Ahead" />
                         
-                   	        <g:sortableColumn property="lastGeneratedDate" title="Last Generated Date" />
-                        
                    	        <th>Last Generated Sub Task</th>
                    	    
+                   	        <g:sortableColumn property="enabled" title="Enabled" />
+                        
                         </tr>
                     </thead>
@@ -47,7 +47,7 @@
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td>
                         
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}</td>
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}</td>
                         
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}</td>
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/taskRecurringSchedule/show.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/show.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringSchedule/show.gsp	(revision 199)
@@ -51,11 +51,4 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Last Generated Date:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Last Generated Sub Task:</td>
                             
@@ -65,14 +58,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Generate Ahead Period:</td>
+                            <td valign="top" class="name">Enabled:</td>
                             
-                            <td valign="top" class="value"><g:link controller="period" action="show" id="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}">${taskRecurringScheduleInstance?.generateAheadPeriod?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Enabled:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
                             
                         </tr>
@@ -107,7 +93,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Start Date:</td>
+                            <td valign="top" class="name">Sub Tasks Generated:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'startDate')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'subTasksGenerated')}</td>
                             
                         </tr>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp	(revision 199)
@@ -38,8 +38,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="startDate">Start Date:</label>
+                                    <label for="nextTargetStartDate">Next Target Start Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}">
-                                    <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.startDate}" />
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetStartDate','errors')}">
+                                    <richui:dateChooser name="nextTargetStartDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.nextTargetStartDate}" />
                                 </td>
                             </tr>   
@@ -74,5 +74,5 @@
                                     <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}"
                                         id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />
-                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
+                                        ${Period.get(1).encodeAsHTML()}
                                 </td>
                             </tr>
@@ -80,8 +80,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isEnabled">Is Enabled:</label>
+                                    <label for="enabled">Enabled:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'isEnabled','errors')}">
-                                    <g:checkBox name="isEnabled" value="${taskRecurringScheduleInstance?.isEnabled}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'enabled','errors')}">
+                                    <g:checkBox name="enabled" value="${taskRecurringScheduleInstance?.enabled}" ></g:checkBox>
                                 </td>
                             </tr>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp	(revision 199)
@@ -39,8 +39,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="startDate">Start Date:</label>
+                                    <label for="nextTargetStartDate">Next Target Start Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}">
-                                    <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.startDate}" />
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetStartDate','errors')}">
+                                    <richui:dateChooser name="nextTargetStartDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.nextTargetStartDate}" />
                                 </td>
                             </tr>   
@@ -75,5 +75,5 @@
                                     <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}"
                                         id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />
-                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
+                                        ${Period.get(1).encodeAsHTML()}
                                 </td>
                             </tr>
@@ -81,8 +81,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isEnabled">Is Enabled:</label>
+                                    <label for="enabled">Enabled:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'isEnabled','errors')}">
-                                    <g:checkBox name="isEnabled" value="${taskRecurringScheduleInstance?.isEnabled}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'enabled','errors')}">
+                                    <g:checkBox name="enabled" value="${taskRecurringScheduleInstance?.enabled}" ></g:checkBox>
                                 </td>
                             </tr>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp	(revision 199)
@@ -29,5 +29,5 @@
                    	        <g:sortableColumn property="recurPeriod" title="Recur Period" />
                    	        
-                   	        <g:sortableColumn property="isEnabled" title="Is Enabled" />
+                   	        <g:sortableColumn property="enabled" title="Enabled" />
 
                             <th></th>
@@ -48,5 +48,5 @@
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'recurPeriod')}</td>
                         
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
 
                             <td>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp	(revision 196)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp	(revision 199)
@@ -13,116 +13,123 @@
         <div class="body">
             <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
+                <div class="message">${flash.message}</div>
             </g:if>
             <div class="dialog">
                 <table>
-                    <tbody>     
-                                   
+                    <tbody>
                         <tr class="prop">
-                            <td valign="top" class="name">Id:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'id')}</td>
-                            
+                            <td valign="top" class="name">Recurring Schedule for task:</td>
+
+                            <td valign="top" class="value">
+                                <g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance.task?.id}">
+                                    ${taskRecurringScheduleInstance.task.encodeAsHTML()}
+                                </g:link>
+                            </td>
                         </tr>
 
-						<tr class="prop">
-							<td valign="top" class="name">
-								<label for="recForTask">Recurring Schedule for Task:</label>
-							</td>
-							<td valign="top" name="recForTask" class="value">
-								<g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance?.task?.id}">${taskRecurringScheduleInstance?.task?.encodeAsHTML()}</g:link>
-							</td>
-						</tr>
-                    
                         <tr class="prop">
-                            <td valign="top" class="name">Start Date:</td>
-                            
-                            <td valign="top" class="value">
-                                <g:formatDate date="${taskRecurringScheduleInstance.startDate}" format="EEE, dd-MMM-yyyy"/>
-                            </td>
+                            <td valign="top" class="name"></td>
+
+                            <td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</td>
                         </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Recur Every:</td>
-                            
-                            <td valign="top" class="value">
-								${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.recurPeriod}
-							</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Duration:</td>
-                            
-                            <td valign="top" class="value">
-                                ${taskRecurringScheduleInstance?.taskDuration} ${taskRecurringScheduleInstance?.taskDurationPeriod}
-                            </td>
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Generate Ahead:</td>
-                            
-                            <td valign="top" class="value">
-                                ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod}
-                            </td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Enabled:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
-                            
-                        </tr>
-                    </tbody>
-                </table>
-                
-                <table>
-                    <tbody>
-                        <tr class="prop">
-                            <td valign="top" class="name">Next Target Start Date:</td>
-                            
-                            <td valign="top" class="value">
-								<g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
-							</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Next Target Completion Date:</td>
-                            
-                            <td valign="top" class="value">
-                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetCompletionDate}" format="EEE, dd-MMM-yyyy"/>
-                            </td>
-                            
-                        </tr>
-                        
+
                         <tr class="prop">
                             <td valign="top" class="name">Next Generation Date:</td>
-                            
+
                             <td valign="top" class="value">
                                 <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd-MMM-yyyy"/>
                             </td>
                         </tr>
-						
+
                         <tr class="prop">
-                            <td valign="top" class="name">Last Generated Date:</td>
-                            
+                            <td valign="top" class="name">Generate Ahead:</td>
+
                             <td valign="top" class="value">
-                           		<g:formatDate date="${taskRecurringScheduleInstance.lastGeneratedDate}" format="EEE, dd-MMM-yyyy"/>
-							</td>
+                                ${taskRecurringScheduleInstance.generateAhead} ${Period.get(1).encodeAsHTML()}
+                            </td>
                         </tr>
-                    
+
                         <tr class="prop">
-                            <td valign="top" class="name">Last Generated Sub Task:</td>
-                            
+                            <td valign="top" class="name">Next Target Start Date:</td>
+
                             <td valign="top" class="value">
-								<g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}">
-									${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()}
-								</g:link>
-							</td>
-                            
+                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
+                            </td>
                         </tr>
-                    
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Duration:</td>
+
+                            <td valign="top" class="value">
+                                ${taskRecurringScheduleInstance.taskDuration} ${taskRecurringScheduleInstance.taskDurationPeriod}
+                            </td>
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Next Target Completion Date:</td>
+
+                            <td valign="top" class="value">
+                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetCompletionDate}" format="EEE, dd-MMM-yyyy"/>
+                            </td>
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Enabled:</td>
+
+                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
+                        </tr>
+
+                    </tbody>
+                </table>
+                <table>
+                    <tbody>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Note:</td>
+
+                            <td valign="top" class="value">
+                                Recurring Schedules are reviewed and Sub Tasks generated every ${grailsApplication.config.taskRecurringScheduleJob.repeatInterval.encodeAsHTML()} seconds.
+                            </td>
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Sub Tasks Generated:</td>
+
+                            <td valign="top" class="value">
+                                ${fieldValue(bean:taskRecurringScheduleInstance, field:'subTasksGenerated')}
+                            </td>
+                        </tr>
+
+                        <g:if test="${taskRecurringScheduleInstance.lastGeneratedSubTask}">
+
+                            <tr class="prop">
+                                <td valign="top" class="name">Last Generated Sub Task:</td>
+
+                                <td valign="top" class="value">
+                                    <g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance.lastGeneratedSubTask?.id}">
+                                        ${taskRecurringScheduleInstance.lastGeneratedSubTask?.encodeAsHTML()}
+                                    </g:link>
+                                </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name"></td>
+
+                                <td valign="top" class="value">
+                                        ${TaskModification.findByTaskAndTaskModificationType(taskRecurringScheduleInstance.lastGeneratedSubTask, TaskModificationType.get(1))}
+                                </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name"></td>
+
+                                <td valign="top" class="value">
+                                        With target start date:
+                                        <g:formatDate date="${taskRecurringScheduleInstance.lastGeneratedSubTask?.targetStartDate}" format="EEE, dd-MMM-yyyy"/>
+                                </td>
+                            </tr>
+
+                        </g:if>
+
                     </tbody>
                 </table>
@@ -130,5 +137,5 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${taskRecurringScheduleInstance?.id}" />
+                    <input type="hidden" name="id" value="${taskRecurringScheduleInstance.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> -->