Index: trunk/grails-app/views/appCore/acknowledgements.gsp =================================================================== --- trunk/grails-app/views/appCore/acknowledgements.gsp (revision 134) +++ trunk/grails-app/views/appCore/acknowledgements.gsp (revision 134) @@ -0,0 +1,52 @@ + + + + + Acknowledgements + + +
+ Home +
+
+

Welcome to Acknowledgements

+ +
${flash.message}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Silk icon set:
Author: + Mark James - http://www.famfamfam.com/lab/icons/silk/ +
License: + http://creativecommons.org/licenses/by/3.0/ +
+
+ +
+ + Index: trunk/grails-app/views/appCore/options.gsp =================================================================== --- trunk/grails-app/views/appCore/options.gsp (revision 133) +++ trunk/grails-app/views/appCore/options.gsp (revision 134) @@ -20,4 +20,7 @@
Change Session Timeout +
+
+ Acknowledgements Index: trunk/grails-app/views/assignedPersonDetailed/create.gsp =================================================================== --- trunk/grails-app/views/assignedPersonDetailed/create.gsp (revision 133) +++ trunk/grails-app/views/assignedPersonDetailed/create.gsp (revision 134) @@ -23,4 +23,5 @@ +
@@ -32,5 +33,5 @@ Index: trunk/grails-app/views/entryDetailed/create.gsp =================================================================== --- trunk/grails-app/views/entryDetailed/create.gsp (revision 133) +++ trunk/grails-app/views/entryDetailed/create.gsp (revision 134) @@ -61,9 +61,9 @@ - + @@ -40,5 +40,5 @@ - + @@ -47,5 +47,5 @@ - + @@ -54,5 +54,5 @@ - + @@ -61,5 +61,5 @@ - + @@ -68,5 +68,5 @@ - + @@ -75,5 +75,5 @@ - + @@ -110,5 +110,5 @@ - + Index: trunk/grails-app/views/period/edit.gsp =================================================================== --- trunk/grails-app/views/period/edit.gsp (revision 133) +++ trunk/grails-app/views/period/edit.gsp (revision 134) @@ -50,14 +50,14 @@ - Index: trunk/grails-app/views/period/show.gsp =================================================================== --- trunk/grails-app/views/period/show.gsp (revision 133) +++ trunk/grails-app/views/period/show.gsp (revision 134) @@ -45,10 +45,10 @@ - + @@ -42,5 +42,5 @@ Index: trunk/grails-app/views/taskDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/edit.gsp (revision 133) +++ trunk/grails-app/views/taskDetailed/edit.gsp (revision 134) @@ -159,10 +159,10 @@ Index: trunk/grails-app/views/taskDetailed/list.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/list.gsp (revision 133) +++ trunk/grails-app/views/taskDetailed/list.gsp (revision 134) @@ -26,9 +26,9 @@ - - - - - + + + + + @@ -54,5 +54,5 @@ Index: trunk/grails-app/views/taskDetailed/listSubTasks.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/listSubTasks.gsp (revision 134) +++ trunk/grails-app/views/taskDetailed/listSubTasks.gsp (revision 134) @@ -0,0 +1,71 @@ + + + + + Task List + + +
+ Home + New Task +
+
+

Task #${parentTaskInstance.id} sub tasks

+ +
${flash.message}
+ +
+ +
- + ${assignedPersonInstance?.task}
- : - Index: trunk/grails-app/views/maintenanceActionDetailed/show.gsp =================================================================== --- trunk/grails-app/views/maintenanceActionDetailed/show.gsp (revision 133) +++ trunk/grails-app/views/maintenanceActionDetailed/show.gsp (revision 134) @@ -33,5 +33,5 @@ Maintenance Policy:${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()}${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()}
System Section:${maintenanceActionInstance?.systemSection?.encodeAsHTML()}${maintenanceActionInstance?.systemSection?.encodeAsHTML()}
Asset:${maintenanceActionInstance?.asset?.encodeAsHTML()}${maintenanceActionInstance?.asset?.encodeAsHTML()}
Asset Type:${maintenanceActionInstance?.assetType?.encodeAsHTML()}${maintenanceActionInstance?.assetType?.encodeAsHTML()}
Assembly:${maintenanceActionInstance?.assembly?.encodeAsHTML()}${maintenanceActionInstance?.assembly?.encodeAsHTML()}
Sub Assembly:${maintenanceActionInstance?.subAssembly?.encodeAsHTML()}${maintenanceActionInstance?.subAssembly?.encodeAsHTML()}
Component Item:${maintenanceActionInstance?.componentItem?.encodeAsHTML()}${maintenanceActionInstance?.componentItem?.encodeAsHTML()}
Task Procedure:${maintenanceActionInstance?.taskProcedure?.encodeAsHTML()}${maintenanceActionInstance?.taskProcedure?.encodeAsHTML()}
- + +
    - -
  • ${r?.encodeAsHTML()}
    • + +
  • ${t?.encodeAsHTML()}
    •
-Add RecurringSchedule +Add TaskRecurringSchedule
Recurring Schedules:Task Recurring Schedules:
    - -
  • ${r?.encodeAsHTML()}
    • + +
  • ${t?.encodeAsHTML()}
    •
Index: trunk/grails-app/views/taskDetailed/create.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/create.gsp (revision 133) +++ trunk/grails-app/views/taskDetailed/create.gsp (revision 134) @@ -32,5 +32,5 @@ 		- + - + -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add AssignedPerson +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+ Add AssignedPerson 		Lead PersonTask PriorityTask Status - Show + Show
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:taskInstance, field:'id')}${fieldValue(bean:taskInstance, field:'description')}${fieldValue(bean:taskInstance, field:'leadPerson')}${fieldValue(bean:taskInstance, field:'taskPriority')}${fieldValue(bean:taskInstance, field:'taskStatus')} + + Show + +
+
+
+ +
+ + + Index: trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/show.gsp (revision 133) +++ trunk/grails-app/views/taskDetailed/show.gsp (revision 134) @@ -149,4 +149,5 @@ + Add AssignedPerson @@ -264,49 +265,25 @@ - - +
+ No Procedure linked. +
+
+ -
- - - - - - - - - - - - - -
- - - -
- - - -
-
- + - +
- + -
+
@@ -348,35 +325,33 @@ - - + - -
-
- - - - - - - - - - - - - - - - - - - -
StepDescription
- ${maintenanceAction?.procedureStepNumber} - - ${maintenanceAction?.description} -
-
+ +
+ + + + + + + + + + + + + + + + + + + +
StepDescription
+ ${maintenanceAction?.procedureStepNumber} + + ${maintenanceAction?.description} +
+
@@ -387,44 +362,72 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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}
-
+ + +
+ No Recurring Schedule. +
+
+ + + +
+ + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Recurring Schedule:${taskRecurringScheduleInstance.encodeAsHTML()}
Start Date:${taskRecurringScheduleInstance.startDate}
Next Due Date:${taskRecurringScheduleInstance.nextDueDate}
Last Generated Date:${taskRecurringScheduleInstance.lastGeneratedDate}
Last Generated Sub Task:${taskRecurringScheduleInstance.lastGeneratedSubTask}
+
+
+ + + + +
+ + @@ -438,22 +441,78 @@ -
- - - - - - - - - -
Sub Tasks: -
    - -
  • ${s?.encodeAsHTML()}
    • -     -
-
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdTarget Start DateDescriptionLead PersonTask PriorityTask Status
${fieldValue(bean:subTaskInstance, field:'id')}${subTaskInstance.description}${subTaskInstance.leadPerson}${subTaskInstance.taskPriority}${subTaskInstance.taskStatus} + + Show + +
+
+ + +
+ + + + Showing ${subTaskInstanceMax} of ${subTaskInstanceTotal} +
+ + + Total ${subTaskInstanceTotal} +
+ + + +
+ + + +
+ No Sub Tasks. + + Index: trunk/grails-app/views/taskProcedureDetailed/create.gsp =================================================================== --- trunk/grails-app/views/taskProcedureDetailed/create.gsp (revision 133) +++ trunk/grails-app/views/taskProcedureDetailed/create.gsp (revision 134) @@ -23,4 +23,6 @@ + +
@@ -32,5 +34,5 @@ @@ -41,5 +43,5 @@ @@ -52,5 +54,16 @@ - + + + + + + + + Index: trunk/grails-app/views/taskProcedureDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskProcedureDetailed/edit.gsp (revision 133) +++ trunk/grails-app/views/taskProcedureDetailed/edit.gsp (revision 134) @@ -35,5 +35,5 @@ @@ -44,5 +44,5 @@ Index: trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 133) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 134) @@ -5,32 +5,42 @@ - Create RecurringSchedule + Create TaskRecurringSchedule
Home - RecurringSchedule List + TaskRecurringSchedule List
-

Create RecurringSchedule

+

Create TaskRecurringSchedule

${flash.message}
 - +
- +
+
- +
- +
+ + + ${taskInstance} +
- +
- +
- + - + + + + + @@ -38,8 +48,26 @@ - + + + + + + + + + + @@ -49,6 +77,6 @@ - @@ -58,6 +86,6 @@ - @@ -67,17 +95,8 @@ - - - - - - - + Index: trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 133) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 134) @@ -5,25 +5,25 @@ - Edit RecurringSchedule + Edit TaskRecurringSchedule
Home - RecurringSchedule List - New RecurringSchedule + TaskRecurringSchedule List + New TaskRecurringSchedule
-

Edit RecurringSchedule

+

Edit TaskRecurringSchedule

${flash.message}
 - +
- +
- - + +
- + - + + ${taskRecurringScheduleInstance.task} +
+ + +
- + - + + +
+ + + +
+ + +
- + +
- + +
- + +
- - - -
@@ -32,8 +32,8 @@ - @@ -41,8 +41,26 @@ - + + + + + + + + + + @@ -52,6 +70,6 @@ - @@ -61,6 +79,6 @@ - @@ -70,6 +88,6 @@ - @@ -79,6 +97,6 @@ - Index: trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 133) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 134) @@ -24,14 +24,14 @@ - + + + - + + + - - - - @@ -42,13 +42,13 @@ - + - + + + + + - - - - Index: trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 133) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 134) @@ -5,14 +5,14 @@ - Show RecurringSchedule + Show TaskRecurringSchedule
Home - RecurringSchedule List - New RecurringSchedule + TaskRecurringSchedule List + New TaskRecurringSchedule
-

Show RecurringSchedule

+

Show TaskRecurringSchedule

${flash.message}
@@ -26,19 +26,33 @@
- + - + - + - + - + + + + + + + + + + + + + + + @@ -47,5 +61,5 @@ - + @@ -54,5 +68,5 @@ - + @@ -61,5 +75,5 @@ - + @@ -68,5 +82,5 @@ - + @@ -77,5 +91,5 @@
- +
- + - + +
- + - + + +
+ + + +
+ + +
- + +
- + +
- + +
- + +
Planned MaintenanceLast Generated Sub TaskPeriod
${fieldValue(bean:taskRecurringScheduleInstance, field:'id')}${fieldValue(bean:taskRecurringScheduleInstance, field:'task')}${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}${fieldValue(bean:taskRecurringScheduleInstance, field:'isActive')}${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')} ${fieldValue(bean:taskRecurringScheduleInstance, field:'period')}${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}${fieldValue(bean:taskRecurringScheduleInstance, field:'startDate')}
Id:${fieldValue(bean:recurringScheduleInstance, field:'id')}${fieldValue(bean:taskRecurringScheduleInstance, field:'id')}
Planned Maintenance:Last Generated Date:${recurringScheduleInstance?.plannedMaintenance?.encodeAsHTML()}${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}
Is Active:Last Generated Sub Task:${fieldValue(bean:recurringScheduleInstance, field:'isActive')}${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()}
Is Enabled:${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}
Next Due Date:${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')}
Period:${recurringScheduleInstance?.period?.encodeAsHTML()}${taskRecurringScheduleInstance?.period?.encodeAsHTML()}
Recur Every:${fieldValue(bean:recurringScheduleInstance, field:'recurEvery')}${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}
Start Date:${fieldValue(bean:taskRecurringScheduleInstance, field:'startDate')}
Task:${recurringScheduleInstance?.task?.encodeAsHTML()}${taskRecurringScheduleInstance?.task?.encodeAsHTML()}