Index: trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp	(revision 135)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp	(revision 137)
@@ -53,5 +53,27 @@
                                     <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"
  										id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" />
-                                    <g:select optionKey="id" from="${Period.list()}" name="period.id" value="${taskRecurringScheduleInstance?.period?.id}" ></g:select>
+                                    <g:select optionKey="id" from="${Period.list()}" name="recurPeriod.id" value="${taskRecurringScheduleInstance?.recurPeriod?.id}" ></g:select>
+                                </td>
+                            </tr>   
+                      
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurEvery">Task Duration:</label>
+                                </td>
+                                <td valign="top" class="value" >
+                                    <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDuration','errors')}"
+                                        id="taskDuration" name="taskDuration" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'taskDuration')}" />
+                                    <g:select optionKey="id" from="${Period.list()}" name="taskDurationPeriod.id" value="${taskRecurringScheduleInstance?.taskDurationPeriod?.id}" ></g:select>
+                                </td>
+                            </tr>   
+                      
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurEvery">Generate Ahead:</label>
+                                </td>
+                                <td valign="top" class="value" >
+                                    <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>
                                 </td>
                             </tr>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp	(revision 135)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp	(revision 137)
@@ -55,7 +55,29 @@
                                     <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"
  										id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" />
-                                    <g:select optionKey="id" from="${Period.list()}" name="period.id" value="${taskRecurringScheduleInstance?.period?.id}" ></g:select>
+                                    <g:select optionKey="id" from="${Period.list()}" name="recurPeriod.id" value="${taskRecurringScheduleInstance?.recurPeriod?.id}" ></g:select>
                                 </td>
-                            </tr> 
+                            </tr>   
+                      
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurEvery">Task Duration:</label>
+                                </td>
+                                <td valign="top" class="value" >
+                                    <input type="text" class="time ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDuration','errors')}"
+                                        id="taskDuration" name="taskDuration" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'taskDuration')}" />
+                                    <g:select optionKey="id" from="${Period.list()}" name="taskDurationPeriod.id" value="${taskRecurringScheduleInstance?.taskDurationPeriod?.id}" ></g:select>
+                                </td>
+                            </tr>       
+                      
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurEvery">Generate Ahead:</label>
+                                </td>
+                                <td valign="top" class="value" >
+                                    <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>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -73,5 +95,5 @@
                 <div class="buttons">
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+<!--                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> -->
                 </div>
             </g:form>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp	(revision 135)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp	(revision 137)
@@ -28,5 +28,5 @@
                    	        <g:sortableColumn property="recurEvery" title="Recur Every" />
                    	        
-                   	        <g:sortableColumn property="period" title="Period" />
+                   	        <g:sortableColumn property="recurPeriod" title="Recur Period" />
                    	        
                    	        <g:sortableColumn property="isEnabled" title="Is Enabled" />
@@ -47,5 +47,5 @@
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}</td>
                         
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'period')}</td>
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'recurPeriod')}</td>
                         
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp	(revision 135)
+++ trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp	(revision 137)
@@ -39,8 +39,16 @@
                     
                         <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>
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Recur Every:</td>
                             
                             <td valign="top" class="value">
-								${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.period}
+								${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.recurPeriod}
 							</td>
                             
@@ -48,9 +56,18 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Start Date:</td>
+                            <td valign="top" class="name">Task Duration:</td>
                             
-							<td valign="top" class="value">
-								<g:formatDate date="${taskRecurringScheduleInstance.startDate}" format="EEE, dd MMM yyyy"/>
-							</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>
                     
@@ -61,20 +78,33 @@
                             
                         </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></td>
-						</tr>
-                        
-                        <tr class="prop">
-                    		<td></td>
-						</tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Next Due Date:</td>
+                            <td valign="top" class="name">Next Generation Date:</td>
                             
                             <td valign="top" class="value">
-								<g:formatDate date="${taskRecurringScheduleInstance.nextDueDate}" format="EEE, dd MMM yyyy"/>
-							</td>
-                            
+                                <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd MMM yyyy"/>
+                            </td>
                         </tr>
 						
@@ -105,5 +135,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="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+<!--                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> -->
                 </g:form>
             </div>