Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 135)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 137)
@@ -158,5 +158,4 @@
                         </div>
             
-            
                         <div class="buttons">
                             <g:form>
@@ -186,6 +185,5 @@
                                 </thead>
                                 <tbody>
-                                <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                                    <g:if test="${entry.entryType == EntryType.findByName('Fault')}">
+                                <g:each in="${entryFaultList}" status="i" var="entry">
                                         <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
                                         
@@ -202,5 +200,4 @@
             
                                         </tr>
-                                    </g:if>
                                 </g:each>
                                 </tbody>
@@ -227,6 +224,5 @@
                                 </thead>
                                 <tbody>
-                                <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                                    <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}">
+                                <g:each in="${entryWorkDoneList}" status="i" var="entry">
                                         <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
             
@@ -243,5 +239,4 @@
             
                                         </tr>
-                                    </g:if>
                                 </g:each>
                                 </tbody>
@@ -261,4 +256,6 @@
                     </richui:tabContent>
 <!-- End Task tab -->
+
+
 
 <!-- Start Task Procedure tab-->
@@ -398,4 +395,23 @@
 												<g:formatDate date="${taskRecurringScheduleInstance.startDate}" 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">Generate Ahead:</td>
+                                            
+                                            <td valign="top" class="value">
+                                                ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod}
+                                            </td>
+                                            
+                                        </tr>
 											
 										</tr>
@@ -407,21 +423,36 @@
 											
 										</tr>
+                                        
+                                    </tbody>
+                                </table>
+                
+                                <table>
+                                    <tbody>
                         
 										<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 Target Start Date:</td>   
 											                         
 											<td valign="top" class="value">
-												<g:formatDate date="${taskRecurringScheduleInstance.nextDueDate}" format="EEE, dd MMM yyyy"/>
+												<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">