Index: /trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/show.gsp	(revision 152)
+++ /trunk/grails-app/views/taskDetailed/show.gsp	(revision 153)
@@ -35,111 +35,110 @@
 <!-- Start Task tab -->
                     <richui:tabContent>
-            
+
                         <div class="dialog">
                             <table>
                                 <tbody>
-            
-                                
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Id:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'id')}</td>
-                                        
-                                    </tr>
-            
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Description:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'description')}</td>
-                                        
-                                    </tr>
-            
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Comment:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'comment')}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Target Start Date:</td>
-                                        
+
                                         <td valign="top" class="value"><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
-                                        
-                                    </tr>
-            
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Target Completion Date:</td>
-                                        
+
                                         <td valign="top" class="value"><g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd-MMM-yyyy"/></td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Lead Person:</td>
-                                        
+
                                         <td valign="top" class="value">${taskInstance?.leadPerson?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Task Priority:</td>
-                                        
+
                                         <td valign="top" class="value">${taskInstance?.taskPriority?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Task Status:</td>
-                                        
+
                                         <td valign="top" class="value">${taskInstance?.taskStatus?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Is Active:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isActive')}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Is Approved:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isApproved')}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Is Scheduled:</td>
-                                        
+
                                         <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'isScheduled')}</td>
-                                        
-                                    </tr>
-            
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Parent Task:</td>
-                                        
+
                                         <td valign="top" class="value"><g:link controller="taskDetailed" action="show" id="${taskInstance?.parentTask?.id}">${taskInstance?.parentTask?.encodeAsHTML()}</g:link></td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Task Group:</td>
-                                        
+
                                         <td valign="top" class="value">${taskInstance?.taskGroup?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Task Type:</td>
-                                        
+
                                         <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-            
+
+                                    </tr>
+
                                     <tr class="prop">
                                         <td valign="top" class="name">Assigned Persons:</td>
-                                        
+
                                         <td  valign="top" style="text-align:left;" class="value">
                                             <ul>
@@ -150,11 +149,11 @@
                                             <g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
                                         </td>
-                                        
-                                    </tr>
-                                
+
+                                    </tr>
+
                                 </tbody>
                             </table>
                         </div>
-            
+
                         <div class="buttons">
                             <g:form>
@@ -164,5 +163,5 @@
                             </g:form>
                         </div>
-            
+
                         <div class="list">
                             <h1>Faults</h1>
@@ -175,9 +174,9 @@
                                         <th>Entered By</th>
                                         <th></th>
-            
+
             <!--                            <g:sortableColumn property="comment" title="Comment" />
-                                    
+
                                         <g:sortableColumn property="dateDone" title="Date Done" />
-                                    
+
                                         <g:sortableColumn property="enteredBy" title="Entered By" />-->
                                     </tr>
@@ -186,10 +185,10 @@
                                 <g:each in="${entryFaultList}" status="i" var="entry">
                                         <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
-                                        
+
                                             <td style="width:65%">${entry.comment}</td>
                                             <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
                                             <td>${entry.durationHour}:${entry.durationMinute}</td>
                                             <td>${entry.enteredBy}</td>
-            
+
                                             <td>
                                                 <g:link controller="entryDetailed" action="edit" id="${entry.id}">
@@ -197,5 +196,5 @@
                                                 </g:link>
                                             </td>
-            
+
                                         </tr>
                                 </g:each>
@@ -203,5 +202,5 @@
                             </table>
                         </div>
-            
+
                         <div class="list">
                             <h1>Work Done</h1>
@@ -214,9 +213,9 @@
                                         <th>Entered By</th>
                                         <th></th>
-            
+
             <!--                            <g:sortableColumn property="commentW" title="Comment" />
-                                    
+
                                         <g:sortableColumn property="dateDoneW" title="Date Done" />
-                                    
+
                                         <g:sortableColumn property="enteredByW" title="Entered By" />-->
                                     </tr>
@@ -225,10 +224,10 @@
                                 <g:each in="${entryWorkDoneList}" status="i" var="entry">
                                         <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
-            
+
                                             <td width="65%">${entry.comment}</td>
                                             <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
                                             <td>${entry.durationHour}:${entry.durationMinute}</td>
                                             <td>${entry.enteredBy}</td>
-            
+
                                             <td>
                                                 <g:link controller="entryDetailed" action="edit" id="${entry.id}">
@@ -236,5 +235,5 @@
                                                 </g:link>
                                             </td>
-            
+
                                         </tr>
                                 </g:each>
@@ -242,7 +241,7 @@
                             </table>
                         </div>
-            
+
                         <br />
-            
+
                         <div class="buttons">
                             <g:form controller="entryDetailed">
@@ -257,12 +256,11 @@
 
 
-
 <!-- Start Task Procedure tab-->
                     <richui:tabContent>
                         <g:if test="${!taskProcedureExits}">
-                        	<br />
-                        	No Procedure linked.
-                        	<br />
-							<br />
+                            <br />
+                            No Procedure linked.
+                            <br />
+                            <br />
                             <g:form controller="taskProcedureDetailed" >
                                 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
@@ -281,37 +279,36 @@
                         </g:if>
                         <g:else>
-                        	<div class="dialog">
+                            <div class="dialog">
                                 <table>
                                     <tbody>
-                
-                                    
+
                                         <tr class="prop">
                                             <td valign="top" class="name">Procedure Id:</td>
-                                            
+
                                             <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
-                                            
-                                        </tr>
-                                    
+
+                                        </tr>
+
                                         <tr class="prop">
                                             <td valign="top" class="name">Name:</td>
-                                            
+
                                             <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'name')}</td>
-                                            
-                                        </tr>
-                                    
+
+                                        </tr>
+
                                         <tr class="prop">
                                             <td valign="top" class="name">Description:</td>
-                                            
+
                                             <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'description')}</td>
-                                            
-                                        </tr>
-                                    
+
+                                        </tr>
+
                                         <tr class="prop">
                                             <td valign="top" class="name">Is Active:</td>
-                                            
+
                                             <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td>
-                                            
-                                        </tr>
-                                    
+
+                                        </tr>
+
                                     </tbody>
                                 </table>
@@ -321,33 +318,33 @@
                                     <input type="hidden" name="id" value="${taskProcedureInstance?.id}" />
                                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-								</g:form>
-                            </div>
-                            
-							<div class="list">
-								<table>
-									<thead>
-										<tr>
-											<th>Step</th>
-											<th>Description</th>
-										</tr>
-									</thead>
-									<tbody>
-										<g:each in="${maintenanceActionList}" status="i" var="maintenanceAction">
-											<tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-												
-												<td valign="top" class="name">
-													${maintenanceAction?.procedureStepNumber}
-												</td>
-												
-												<td  valign="top" style="text-align:left;" class="value">
-													${maintenanceAction?.description}
-												</td>
-												
-											</tr>
-										</g:each>
-	
-									</tbody>
-								</table>
-							</div>
+                                </g:form>
+                            </div>
+
+                            <div class="list">
+                                <table>
+                                    <thead>
+                                        <tr>
+                                            <th>Step</th>
+                                            <th>Description</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <g:each in="${maintenanceActionList}" status="i" var="maintenanceAction">
+                                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+
+                                                <td valign="top" class="name">
+                                                    ${maintenanceAction?.procedureStepNumber}
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
+                                                    ${maintenanceAction?.description}
+                                                </td>
+
+                                            </tr>
+                                        </g:each>
+
+                                    </tbody>
+                                </table>
+                            </div>
 
                         </g:else>
@@ -360,8 +357,8 @@
 
                         <g:if test="${!taskRecurringScheduleExits}">
-                        	<br />
-                        	No Recurring Schedule.
-                        	<br />
-							<br />
+                            <br />
+                            No Recurring Schedule.
+                            <br />
+                            <br />
                             <g:form controller="taskRecurringScheduleDetailed" >
                                 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
@@ -377,111 +374,111 @@
                         </g:if>
                         <g:else>
-							
-						<div class="dialog">
-								<table>
-									<tbody>
-										<tr class="prop">
-											<td valign="top" class="name">Recurring Schedule:</td>
-											
-											<td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</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>
-                            
-                                        </tr>
-                                    
+
+                        <div class="dialog">
+                                <table>
+                                    <tbody>
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Recurring Schedule:</td>
+
+                                            <td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</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>
+
+                                        </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>
-                    
-										<tr class="prop">
-											<td valign="top" class="name">Is Enabled:</td>
-											
-											<td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
-											
-										</tr>
-                                        
+
+                                        </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 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>
+
                                         <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>
-									</tbody>
-								</table>
-							</div>
+
+                                        <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>
+                                    </tbody>
+                                </table>
+                            </div>
                             <div class="buttons">
                                 <g:form controller="taskRecurringScheduleDetailed">
                                     <input type="hidden" name="id" value="${taskRecurringScheduleInstance?.id}" />
                                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-								</g:form>
-                            </div>
-                            
-						</g:else>
+                                </g:form>
+                            </div>
+
+                        </g:else>
                     </richui:tabContent>
 <!-- End Task Recurrence tab -->
@@ -493,79 +490,77 @@
 <!-- End Inventory tab -->
 
-<!-- Start Sub Task tab -->  
+<!-- Start Sub Task tab -->
                     <richui:tabContent>
-                    	<g:if test="${subTaskInstanceTotal >= 1}">
-							<div class="list">
-								<table>
-									<thead>
-										<tr>
-										
-											<th>Id</th>
-											
-											<th>Target Start Date</th>
-											
-											<th>Description</th>
-											
-											<th>Lead Person</th>
-											
-											<th>Task Priority</th>
-										
-											<th>Task Status</th>
-											
-											<th></th>
-										
-										</tr>
-									</thead>
-									<tbody>
-									<g:each in="${subTaskInstanceList}" status="i" var="subTaskInstance">
-									<tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'/>
-	
-											<td>${fieldValue(bean:subTaskInstance, field:'id')}</td>
-											
-											<td><g:formatDate date="${subTaskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
-											
-											<td>${subTaskInstance.description}</td>
-										
-	
-											<td>${subTaskInstance.leadPerson}</td>
-											
-											<td>${subTaskInstance.taskPriority}</td>
-											
-											<td>${subTaskInstance.taskStatus}</td>
-											
-											<td>
-												<g:link action="show" id="${subTaskInstance.id}">
-													<img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
-												</g:link>
-											</td>
-	
-										
-										</tr>
-									</g:each>
-									</tbody>
-								</table>
-							</div>
-							
-							
-							<div class="buttons">
-								<g:form>
-									<input type="hidden" name="id" value="${taskInstance?.id}" />
-									<g:if test="${subTaskInstanceTotal > subTaskInstanceMax}">
-										Showing ${subTaskInstanceMax} of ${subTaskInstanceTotal}
-										<br />
-									</g:if>
-									<g:else>
-										Total ${subTaskInstanceTotal}
-										<br />
-									</g:else>
-									<span class="button"><g:actionSubmit action="listSubTasks" class="table" value="Sortable List" /></span>
-								</g:form>
-							</div>
-							
-						</g:if>
-						<g:else>
-							<br />
-							No Sub Tasks.
-						</g:else>
+                        <g:if test="${subTaskInstanceTotal >= 1}">
+                            <div class="list">
+                                <table>
+                                    <thead>
+                                        <tr>
+
+                                            <th>Id</th>
+
+                                            <th>Target Start Date</th>
+
+                                            <th>Description</th>
+
+                                            <th>Lead Person</th>
+
+                                            <th>Task Priority</th>
+
+                                            <th>Task Status</th>
+
+                                            <th></th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                    <g:each in="${subTaskInstanceList}" status="i" var="subTaskInstance">
+                                    <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'/>
+
+                                            <td>${fieldValue(bean:subTaskInstance, field:'id')}</td>
+
+                                            <td><g:formatDate date="${subTaskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
+
+                                            <td>${subTaskInstance.description}</td>
+
+
+                                            <td>${subTaskInstance.leadPerson}</td>
+
+                                            <td>${subTaskInstance.taskPriority}</td>
+
+                                            <td>${subTaskInstance.taskStatus}</td>
+
+                                            <td>
+                                                <g:link action="show" id="${subTaskInstance.id}">
+                                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                                </g:link>
+                                            </td>
+
+                                        </tr>
+                                    </g:each>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                            <div class="buttons">
+                                <g:form>
+                                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                                    <g:if test="${subTaskInstanceTotal > subTaskInstanceMax}">
+                                        Showing ${subTaskInstanceMax} of ${subTaskInstanceTotal}
+                                        <br />
+                                    </g:if>
+                                    <g:else>
+                                        Total ${subTaskInstanceTotal}
+                                        <br />
+                                    </g:else>
+                                    <span class="button"><g:actionSubmit action="listSubTasks" class="table" value="Sortable List" /></span>
+                                </g:form>
+                            </div>
+
+                        </g:if>
+                        <g:else>
+                            <br />
+                            No Sub Tasks.
+                        </g:else>
 
                     </richui:tabContent>
@@ -574,5 +569,5 @@
                 </richui:tabContents>
             </richui:tabView>
-            
+
         </div>
     </body>