Index: trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/show.gsp (revision 126) +++ trunk/grails-app/views/taskDetailed/show.gsp (revision 131) @@ -18,411 +18,354 @@ - + + + - + - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
Id:${fieldValue(bean:taskInstance, field:'id')}
Description:${fieldValue(bean:taskInstance, field:'description')}
Comment:${fieldValue(bean:taskInstance, field:'comment')}
Target Start Date:
Target Completion Date:
Lead Person:${taskInstance?.leadPerson?.encodeAsHTML()}
Task Priority:${taskInstance?.taskPriority?.encodeAsHTML()}
Task Status:${taskInstance?.taskStatus?.encodeAsHTML()}
Is Active:${fieldValue(bean:taskInstance, field:'isActive')}
Is Approved:${fieldValue(bean:taskInstance, field:'isApproved')}
Is Scheduled:${fieldValue(bean:taskInstance, field:'isScheduled')}
Parent Task:${taskInstance?.parentTask?.encodeAsHTML()}
Task Group:${taskInstance?.taskGroup?.encodeAsHTML()}
Task Type:${taskInstance?.taskType?.encodeAsHTML()}
Assigned Persons: -
    - -
  • ${a?.encodeAsHTML()}
    • + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Id:${fieldValue(bean:taskInstance, field:'id')}
    Description:${fieldValue(bean:taskInstance, field:'description')}
    Comment:${fieldValue(bean:taskInstance, field:'comment')}
    Target Start Date:
    Target Completion Date:
    Lead Person:${taskInstance?.leadPerson?.encodeAsHTML()}
    Task Priority:${taskInstance?.taskPriority?.encodeAsHTML()}
    Task Status:${taskInstance?.taskStatus?.encodeAsHTML()}
    Is Active:${fieldValue(bean:taskInstance, field:'isActive')}
    Is Approved:${fieldValue(bean:taskInstance, field:'isApproved')}
    Is Scheduled:${fieldValue(bean:taskInstance, field:'isScheduled')}
    Parent Task:${taskInstance?.parentTask?.encodeAsHTML()}
    Task Group:${taskInstance?.taskGroup?.encodeAsHTML()}
    Task Type:${taskInstance?.taskType?.encodeAsHTML()}
    Assigned Persons: +
      + +
    • ${a?.encodeAsHTML()}
      • +       +
    +
    +
    + + +
    + + + + + +
    + +
    +

    Faults

    + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - -
    CommentDate DoneDurationEntered By
    ${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} + + Edit + +
    -
    - - -
    - - - - - -
    - -
    -

    Faults

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    CommentDate DoneDurationEntered By
    ${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} - - Edit - -
    -
    - -
    -

    Work Done

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    CommentDate DoneDurationEntered By
    ${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} - - Edit - -
    -
    - -
    - -
    - - - - - - -
    -     - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Recurring Schedule:${taskInstance.recurringSchedule?.encodeAsHTML()}
    Start Date:${taskInstance.recurringSchedule?.startDate}
    Next Due Date:${taskInstance.recurringSchedule?.nextDueDate}
    Last Excecuted Date:${taskInstance.recurringSchedule?.lastExecutedDate}
    -
    - -     - - -
    - - - - - - +
    Sub Tasks: -
      - -
    • ${s?.encodeAsHTML()}
      • +
    +
    + +
    +

    Work Done

    + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
    CommentDate DoneDurationEntered By
    ${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} + + Edit + +
    -
    -     - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Id:${taskInstance.recurringSchedule?.plannedMaintenance?.id}
    Name:${taskInstance.recurringSchedule?.plannedMaintenance?.name}
    Description:${taskInstance.recurringSchedule?.plannedMaintenance?.description}
    Recurring Schedule:${taskInstance.recurringSchedule?.encodeAsHTML()}
    Is Active:${taskInstance.recurringSchedule?.plannedMaintenance?.isActive}
    -
    -
    - - - - - -
    - -
    -

    Maintenance Actions

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    StepActionSystem SectionAssetAssemblyMaintenance Policy
    ${fieldValue(bean:maintenanceAction, field:'pmStepNumber')}${maintenanceAction.maintenanceAction}${maintenanceAction.systemSection}${maintenanceAction.asset}${maintenanceAction.assembly}${maintenanceAction.maintenancePolicy} - - Edit - -
    -
    - -
    - - -
    - - - - - - -
    -     - -     - - - - - +
+
+ +
+ +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
StepDescription
+ ${maintenanceAction?.procedureStepNumber} + + ${maintenanceAction?.description} +
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Recurring Schedule:${taskInstance.taskRecurringSchedule?.encodeAsHTML()}
Start Date:${taskInstance.taskRecurringSchedule?.startDate}
Next Due Date:${taskInstance.taskRecurringSchedule?.nextDueDate}
Last Generated Date:${taskInstance.taskRecurringSchedule?.lastGeneratedDate}
Last Generated Sub Task:${taskInstance.taskRecurringSchedule?.lastGeneratedSubTask}
+
+ + + + + + Used Inventory + + + + + +
+ + + + + + + + + +
Sub Tasks: +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
+
+ + + + + +