Index: trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy (revision 268)
+++ trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy (revision 269)
@@ -27,5 +27,5 @@
if(maintenanceActionInstance) {
try {
- maintenanceActionInstance.delete()
+ maintenanceActionInstance.delete(flush:true)
flash.message = "MaintenanceAction ${params.id} deleted"
redirect(action:list)
@@ -77,5 +77,5 @@
else {
flash.message = "MaintenanceAction not found with id ${params.id}"
- redirect(action:edit,id:params.id)
+ redirect(action:list)
}
}
Index: trunk/grails-app/services/CreateBulkDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateBulkDataService.groovy (revision 268)
+++ trunk/grails-app/services/CreateBulkDataService.groovy (revision 269)
@@ -65,11 +65,9 @@
// createBulkTestTaskProcedure()
// createBulkTestMaintenanceActions()
-// createBulkTestSystemSections()
-// createBulkTestAssetTypes()
-// createBulkTestAssemblies()
-// createBulkTestSubAssemblies()
-// createBulkTestComponentItems()
+// createBulkTestSections()
// createBulkTestAssets()
// createBulkTestAssetExtenedAttributes()
+// createBulkTestAssetSubItems()
+// createBulkTestAssetSubItemExtenedAttributes()
log.info "Creating BULK data...complete."
Index: trunk/grails-app/views/maintenanceActionDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/maintenanceActionDetailed/create.gsp (revision 268)
+++ trunk/grails-app/views/maintenanceActionDetailed/create.gsp (revision 269)
@@ -5,5 +5,5 @@
- Create MaintenanceAction
+ Create MaintenanceAction
@@ -28,17 +28,8 @@
|
-
+
|
-
-
- |
-
-
-
- |
-
- |
-
-
+ |
+
|
@@ -55,8 +46,8 @@
|
-
+
|
-
-
+ |
+
|
@@ -64,26 +55,8 @@
|
-
+
|
-
-
- |
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
+ |
+
|
@@ -109,8 +82,8 @@
|
-
+
|
-
-
+ |
+
|
@@ -118,8 +91,8 @@
|
-
+
|
-
-
+ |
+
|
Index: trunk/grails-app/views/maintenanceActionDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/maintenanceActionDetailed/edit.gsp (revision 268)
+++ trunk/grails-app/views/maintenanceActionDetailed/edit.gsp (revision 269)
@@ -31,17 +31,8 @@
|
-
+
|
-
-
- |
-
-
-
- |
-
- |
-
-
+ |
+
|
@@ -58,8 +49,8 @@
|
-
+
|
-
-
+ |
+
|
@@ -67,26 +58,8 @@
|
-
+
|
-
-
- |
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
+ |
+
|
@@ -112,8 +85,8 @@
|
-
+
|
-
-
+ |
+
|
@@ -121,8 +94,8 @@
|
-
+
|
-
-
+ |
+
|
Index: trunk/grails-app/views/maintenanceActionDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/maintenanceActionDetailed/list.gsp (revision 268)
+++ trunk/grails-app/views/maintenanceActionDetailed/list.gsp (revision 269)
@@ -23,14 +23,14 @@
- Maintenance Policy |
-
- System Section |
+ Section |
Asset |
- Asset Type |
+ Asset Sub Item |
- Assembly |
+ Maintenance Policy |
+
+
@@ -41,13 +41,13 @@
${fieldValue(bean:maintenanceActionInstance, field:'id')} |
- ${fieldValue(bean:maintenanceActionInstance, field:'maintenancePolicy')} |
-
- ${fieldValue(bean:maintenanceActionInstance, field:'systemSection')} |
+ ${fieldValue(bean:maintenanceActionInstance, field:'section')} |
${fieldValue(bean:maintenanceActionInstance, field:'asset')} |
- ${fieldValue(bean:maintenanceActionInstance, field:'assetType')} |
+ ${fieldValue(bean:maintenanceActionInstance, field:'assetSubItem')} |
- ${fieldValue(bean:maintenanceActionInstance, field:'assembly')} |
+ ${fieldValue(bean:maintenanceActionInstance, field:'maintenancePolicy')} |
+
+ ${fieldValue(bean:maintenanceActionInstance, field:'procedureStepNumber')} |
Index: trunk/grails-app/views/maintenanceActionDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/maintenanceActionDetailed/show.gsp (revision 268)
+++ trunk/grails-app/views/maintenanceActionDetailed/show.gsp (revision 269)
@@ -30,14 +30,7 @@
- | Maintenance Policy: |
+ Section: |
- ${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()} |
-
-
-
-
- | System Section: |
-
- ${maintenanceActionInstance?.systemSection?.encodeAsHTML()} |
+ ${maintenanceActionInstance?.section?.encodeAsHTML()} |
@@ -46,33 +39,19 @@
Asset: |
- ${maintenanceActionInstance?.asset?.encodeAsHTML()} |
+ ${maintenanceActionInstance?.asset?.encodeAsHTML()} |
- | Asset Type: |
+ Asset Sub Item: |
- ${maintenanceActionInstance?.assetType?.encodeAsHTML()} |
+ ${maintenanceActionInstance?.assetSubItem?.encodeAsHTML()} |
- | Assembly: |
+ Maintenance Policy: |
- ${maintenanceActionInstance?.assembly?.encodeAsHTML()} |
-
-
-
-
- | Sub Assembly: |
-
- ${maintenanceActionInstance?.subAssembly?.encodeAsHTML()} |
-
-
-
-
- | Component Item: |
-
- ${maintenanceActionInstance?.componentItem?.encodeAsHTML()} |
+ ${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()} |
@@ -93,4 +72,11 @@
+ | Reasoning: |
+
+ ${fieldValue(bean:maintenanceActionInstance, field:'reasoning')} |
+
+
+
+
| Is Active: |
@@ -100,14 +86,7 @@
- | Reasoning: |
-
- ${fieldValue(bean:maintenanceActionInstance, field:'reasoning')} |
-
-
-
-
| Task Procedure: |
- ${maintenanceActionInstance?.taskProcedure?.encodeAsHTML()} |
+ ${maintenanceActionInstance?.taskProcedure?.encodeAsHTML()} |