Changeset 124 for trunk/grails-app/controllers

Timestamp:

May 4, 2009, 1:59:11 PM (16 years ago)

Author:

gav

Message:

Detail controller and views for Asset, AssetExtendedAttribute?, PlannedMaintenance?, MaintenanceAction?, RecurringSchedule?, SystemSection?.
Some minor work on Task controller and views.
Change PlannedMaintenance? relationship, adjust ERD, Bootstrap and Domain classes to suite.

Location:

trunk/grails-app/controllers

Files:

• AssetDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/AssetController.groovy) (1 diff)
• AssetExtendedAttributeDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/AssetExtendedAttributeController.groovy) (1 diff)
• MaintenanceActionDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/MaintenanceActionController.groovy) (3 diffs)
• PlannedMaintenanceDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/PlannedMaintenanceController.groovy) (2 diffs)
• RecurringScheduleDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/RecurringScheduleController.groovy) (1 diff)
• SystemSectionDetailedController.groovy (copied) (copied from trunk/grails-app/controllers/SystemSectionController.groovy) (1 diff)
• TaskDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class AssetController extends BaseAppAdminController {
+class AssetDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class AssetExtendedAttributeController extends BaseAppAdminController {
+class AssetExtendedAttributeDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class MaintenanceActionController extends BaseAppAdminController {
+class MaintenanceActionDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }
@@ -82 +82 @@
 
     def create = {
-        def maintenanceActionInstance = new MaintenanceAction()
-        maintenanceActionInstance.properties = params
-        return ['maintenanceActionInstance':maintenanceActionInstance]
+        try {
+            def plannedMaintenanceInstance = PlannedMaintenance.get(params.plannedMaintenanceInstance.id)
+            def maintenanceActionInstance = new MaintenanceAction()
+            maintenanceActionInstance.plannedMaintenance = plannedMaintenanceInstance
+            return ['maintenanceActionInstance':maintenanceActionInstance]
+        }
+        catch(Exception e) {
+            flash.message = "Please select a PlannedMaintenance, then 'Add action'"
+            redirect(controller:"plannedMaintenanceDetailed", action:"list")
+        }
     }
 
@@ -91 +98 @@
         if(!maintenanceActionInstance.hasErrors() && maintenanceActionInstance.save()) {
             flash.message = "MaintenanceAction ${maintenanceActionInstance.id} created"
-            redirect(action:show,id:maintenanceActionInstance.id)
+            redirect(controller:"plannedMaintenanceDetailed", action:"show", id: params.plannedMaintenance.id)
         }
         else {

trunk/grails-app/controllers/PlannedMaintenanceDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class PlannedMaintenanceController extends BaseAppAdminController {
+class PlannedMaintenanceDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }
@@ -14 +14 @@
 
     def show = {
+// Use this to return a list of the maintenanceActions
+//     def list = {
+//         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+//         [ maintenanceActionInstanceList: MaintenanceAction.list( params ), maintenanceActionInstanceTotal: MaintenanceAction.count() ]
+//     }
         def plannedMaintenanceInstance = PlannedMaintenance.get( params.id )
 

trunk/grails-app/controllers/RecurringScheduleDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class RecurringScheduleController extends BaseAppAdminController {
+class RecurringScheduleDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

trunk/grails-app/controllers/SystemSectionDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class SystemSectionController extends BaseAppAdminController {
+class SystemSectionDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -8 +8 @@
     static allowedMethods = [delete:'POST', save:'POST', update:'POST']
 
+//     def list = {
+//         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+//         def taskInstanceActives = Task.findAllByIsActive( true ).list( params )
+// //         def taskInstanceList = taskInstanceActives.list( params )
+//         return [ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceActives.count() ]
+//     }
+
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        def taskInstanceList = Task.findAllByIsActive( true )
-        return [ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.count() ]
+        [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }