Index: trunk/grails-app/views/recurringSchedule/create.gsp
===================================================================
--- trunk/grails-app/views/recurringSchedule/create.gsp	(revision 122)
+++ trunk/grails-app/views/recurringSchedule/create.gsp	(revision 123)
@@ -33,4 +33,22 @@
                                 <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'plannedMaintenance','errors')}">
                                     <g:select optionKey="id" from="${PlannedMaintenance.list()}" name="plannedMaintenance.id" value="${recurringScheduleInstance?.plannedMaintenance?.id}" noSelection="['null':'']"></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="lastExecutedDate">Last Executed Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'lastExecutedDate','errors')}">
+                                    <g:datePicker name="lastExecutedDate" value="${recurringScheduleInstance?.lastExecutedDate}" noSelection="['':'']"></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="nextDueDate">Next Due Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'nextDueDate','errors')}">
+                                    <g:datePicker name="nextDueDate" value="${recurringScheduleInstance?.nextDueDate}" noSelection="['':'']"></g:datePicker>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/recurringSchedule/edit.gsp
===================================================================
--- trunk/grails-app/views/recurringSchedule/edit.gsp	(revision 122)
+++ trunk/grails-app/views/recurringSchedule/edit.gsp	(revision 123)
@@ -36,4 +36,22 @@
                                 <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'plannedMaintenance','errors')}">
                                     <g:select optionKey="id" from="${PlannedMaintenance.list()}" name="plannedMaintenance.id" value="${recurringScheduleInstance?.plannedMaintenance?.id}" noSelection="['null':'']"></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="lastExecutedDate">Last Executed Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'lastExecutedDate','errors')}">
+                                    <g:datePicker name="lastExecutedDate" value="${recurringScheduleInstance?.lastExecutedDate}" noSelection="['':'']"></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="nextDueDate">Next Due Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:recurringScheduleInstance,field:'nextDueDate','errors')}">
+                                    <g:datePicker name="nextDueDate" value="${recurringScheduleInstance?.nextDueDate}" noSelection="['':'']"></g:datePicker>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/recurringSchedule/list.gsp
===================================================================
--- trunk/grails-app/views/recurringSchedule/list.gsp	(revision 122)
+++ trunk/grails-app/views/recurringSchedule/list.gsp	(revision 123)
@@ -26,12 +26,12 @@
                    	        <th>Planned Maintenance</th>
                    	    
+                   	        <g:sortableColumn property="lastExecutedDate" title="Last Executed Date" />
+                        
+                   	        <g:sortableColumn property="nextDueDate" title="Next Due Date" />
+                        
                    	        <g:sortableColumn property="isActive" title="Is Active" />
                         
                    	        <th>Period</th>
                    	    
-                   	        <g:sortableColumn property="recurEvery" title="Recur Every" />
-                        
-                   	        <g:sortableColumn property="startDate" title="Start Date" />
-                        
                         </tr>
                     </thead>
@@ -44,11 +44,11 @@
                             <td>${fieldValue(bean:recurringScheduleInstance, field:'plannedMaintenance')}</td>
                         
+                            <td>${fieldValue(bean:recurringScheduleInstance, field:'lastExecutedDate')}</td>
+                        
+                            <td>${fieldValue(bean:recurringScheduleInstance, field:'nextDueDate')}</td>
+                        
                             <td>${fieldValue(bean:recurringScheduleInstance, field:'isActive')}</td>
                         
                             <td>${fieldValue(bean:recurringScheduleInstance, field:'period')}</td>
-                        
-                            <td>${fieldValue(bean:recurringScheduleInstance, field:'recurEvery')}</td>
-                        
-                            <td>${fieldValue(bean:recurringScheduleInstance, field:'startDate')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/recurringSchedule/show.gsp
===================================================================
--- trunk/grails-app/views/recurringSchedule/show.gsp	(revision 122)
+++ trunk/grails-app/views/recurringSchedule/show.gsp	(revision 123)
@@ -34,4 +34,18 @@
                             
                             <td valign="top" class="value"><g:link controller="plannedMaintenance" action="show" id="${recurringScheduleInstance?.plannedMaintenance?.id}">${recurringScheduleInstance?.plannedMaintenance?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Last Executed Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:recurringScheduleInstance, field:'lastExecutedDate')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Next Due Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:recurringScheduleInstance, field:'nextDueDate')}</td>
                             
                         </tr>