Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 124)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 126)
@@ -4,4 +4,5 @@
         <meta name="layout" content="main" />
         <title>Show Task</title>
+        <resource:tabView skin="tabviewCustom" />
     </head>
     <body>
@@ -12,8 +13,20 @@
         </div>
         <div class="body">
-            <h1>Show Task</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
+
+
+
+            <richui:tabView id="tabView">
+                <richui:tabLabels>
+                    <richui:tabLabel selected="true" title="Task" />
+                    <richui:tabLabel title="Recurrence" />
+                    <richui:tabLabel title="Sub Tasks" />
+                    <richui:tabLabel title="PM" />
+                </richui:tabLabels>
+                <richui:tabContents>
+                    <richui:tabContent>
+
             <div class="dialog">
                 <table>
@@ -105,4 +118,179 @@
                         </tr>
                     
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Group:</td>
+                            
+                            <td valign="top" class="value">${taskInstance?.taskGroup?.encodeAsHTML()}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Type:</td>
+                            
+                            <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Assigned Persons:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="a" in="${taskInstance.assignedPersons}">
+                                    <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+
+
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskInstance?.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>
+                </g:form>
+            </div>
+
+            <div class="list">
+                <h1>Faults</h1>
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Comment</th>
+                            <th>Date Done</th>
+                            <th>Duration</th>
+                            <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>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
+                        <g:if test="${entry.entryType == EntryType.findByName('Fault')}">
+                            <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}">
+                                        <img  src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                    </g:link>
+                                </td>
+
+                            </tr>
+                        </g:if>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+
+            <div class="list">
+                <h1>Work Done</h1>
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Comment</th>
+                            <th>Date Done</th>
+                            <th>Duration</th>
+                            <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>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
+                        <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}">
+                            <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}">
+                                        <img  src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                    </g:link>
+                                </td>
+
+                            </tr>
+                        </g:if>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+
+            <br />
+
+            <div class="buttons">
+                <g:form controller="entryDetailed">
+                    <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
+                    <span class="button">
+                        <g:actionSubmit value="Add Entry" action="create"  class="add"/>
+                    </span>
+                </g:form>
+            </div>
+        </richui:tabContent>
+
+        <richui:tabContent>
+           <div class="dialog">
+                <table>
+                    <tbody>
+                        <tr class="prop">
+                            <td valign="top" class="name">Recurring Schedule:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.encodeAsHTML()}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Start Date:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.startDate}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Next Due Date:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.nextDueDate}</td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Last Excecuted Date:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.lastExecutedDate}</td>
+                            
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+
+        </richui:tabContent>
+
+        <richui:tabContent>
+            <div class="dialog">
+                <table>
+                    <tbody>
                         <tr class="prop">
                             <td valign="top" class="name">Sub Tasks:</td>
@@ -117,29 +305,46 @@
                             
                         </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Group:</td>
-                            
-                            <td valign="top" class="value">${taskInstance?.taskGroup?.encodeAsHTML()}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Task Type:</td>
-                            
-                            <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Assigned Persons:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="a" in="${taskInstance.assignedPersons}">
-                                    <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
+                    </tbody>
+                </table>
+            </div>
+        </richui:tabContent>
+
+<!-- Planned Maintenance start-->
+        <richui:tabContent>
+            <div class="dialog">
+                <table>
+                    <tbody>
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.id}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.name}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.description}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Recurring Schedule:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="recurringScheduleDetailed" action="edit" id="${taskInstance.recurringSchedule?.id}">${taskInstance.recurringSchedule?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.isActive}</td>
                             
                         </tr>
@@ -149,6 +354,6 @@
             </div>
             <div class="buttons">
-                <g:form>
-                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                <g:form controller="plannedMaintenanceDetailed">
+                    <input type="hidden" name="id" value="${taskInstance.recurringSchedule?.plannedMaintenance?.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>
@@ -157,81 +362,44 @@
 
             <div class="list">
-                <h1>Faults</h1>
+                <h1>Maintenance Actions</h1>
                 <table>
                     <thead>
                         <tr>
-                            <th>Comment</th>
-                            <th>Date Done</th>
-                            <th>Duration</th>
-                            <th>Entered By</th>
+
+<!--                             <g:sortableColumn property="plannedMaintenanceInstance.maintenanceAction.pmStepNumber" title="PM Step" /> -->
+                            <th>Step</th>
+                            <th>Action</th>
+                            <th>System Section</th>
+                            <th>Asset</th>
+                            <th>Assembly</th>
+                            <th>Maintenance Policy</th>
                             <th></th>
 
-<!--                            <g:sortableColumn property="comment" title="Comment" />
-                        
-                            <g:sortableColumn property="dateDone" title="Date Done" />
-                        
-                            <g:sortableColumn property="enteredBy" title="Entered By" />-->
+<!--                            <g:sortableColumn property="commentW" title="Comment" />
+                        
+                            <g:sortableColumn property="dateDoneW" title="Date Done" />
+                        
+                            <g:sortableColumn property="enteredByW" title="Entered By" />-->
                         </tr>
                     </thead>
                     <tbody>
-                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                        <g:if test="${entry.entryType == EntryType.findByName('Fault')}">
-                            <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}">
-                                        <img  src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
-                                    </g:link>
-                                </td>
-
-                            </tr>
-                        </g:if>
-                    </g:each>
-                    </tbody>
-                </table>
-            </div>
-
-            <div class="list">
-                <h1>Work Done</h1>
-                <table>
-                    <thead>
-                        <tr>
-                            <th>Comment</th>
-                            <th>Date Done</th>
-                            <th>Duration</th>
-                            <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>
-                    </thead>
-                    <tbody>
-                    <g:each in="${taskInstance?.entries}" status="i" var="entry">
-                        <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}">
-                            <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}">
-                                        <img  src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
-                                    </g:link>
-                                </td>
-
-                            </tr>
-                        </g:if>
-                    </g:each>
+                        <g:each in="${taskInstance.recurringSchedule?.plannedMaintenance?.maintenanceActions}" status="i" var="maintenanceAction">
+                                <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/maintenanceActionDetailed/edit/${maintenanceAction.id}"'/>
+    
+                                    <td>${fieldValue(bean:maintenanceAction, field:'pmStepNumber')}</td>
+                                    <td>${maintenanceAction.maintenanceAction}</td>
+                                    <td>${maintenanceAction.systemSection}</td>
+                                    <td>${maintenanceAction.asset}</td>
+                                    <td>${maintenanceAction.assembly}</td>
+                                    <td>${maintenanceAction.maintenancePolicy}</td>
+    
+                                    <td>
+                                        <g:link controller="maintenanceActionDetailed" action="edit" id="${maintenanceAction.id}">
+                                            <img  src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                        </g:link>
+                                    </td>
+    
+                                </tr>
+                        </g:each>
                     </tbody>
                 </table>
@@ -240,12 +408,20 @@
             <br />
 
-            <div class="buttons">
-                <g:form controller="entryDetailed">
-                    <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
-                    <span class="button">
-                        <g:actionSubmit value="Add Entry" action="create"  class="add"/>
-                    </span>
-                </g:form>
-            </div>
+            <g:if test="${taskInstance.recurringSchedule?.plannedMaintenance?.id}">
+                <div class="buttons">
+                    <g:form controller="maintenanceActionDetailed">
+                        <input type="hidden" name="plannedMaintenanceInstance.id" value="${taskInstance.recurringSchedule?.plannedMaintenance?.id}" />
+                        <span class="button">
+                            <g:actionSubmit value="Add Action" action="create"  class="add"/>
+                        </span>
+                    </g:form>
+                </div>
+            </g:if>
+
+        </richui:tabContent>
+<!-- Planned Maintenance end-->
+
+    </richui:tabContents>
+</richui:tabView>
 
         </div>
