Changeset 179 for trunk

Timestamp:

Nov 3, 2009, 5:58:21 PM (15 years ago)

Author:

gav

Message:

Format to 4 spaces, no tabs.

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (5 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -165 +165 @@
         }
         else {
-                        params.max = 10
-                        params.order = "desc"
-                        params.sort = "id"
-                        
-                        def entryWorkDoneList = Entry.withCriteria {
-                                                                                                                                def entryType = EntryType.findByName("WorkDone")
-                                                                                                                                eq("entryType", entryType)
-                                                                                                                                eq("task", taskInstance)
-                                                                                                                }
-                        
-                        def entryFaultList = Entry.withCriteria {
-                                                                                                                                def entryType = EntryType.findByName("Fault")
-                                                                                                                                eq("entryType", entryType)
-                                                                                                                                eq("task", taskInstance)
-                                                                                                                }
-
-                        def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
-                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)
+            params.max = 10
+            params.order = "desc"
+            params.sort = "id"
+
+            def entryWorkDoneList = Entry.withCriteria {
+                                                                def entryType = EntryType.findByName("WorkDone")
+                                                                eq("entryType", entryType)
+                                                                eq("task", taskInstance)
+                                                        }
+
+            def entryFaultList = Entry.withCriteria {
+                                                                def entryType = EntryType.findByName("Fault")
+                                                                eq("entryType", entryType)
+                                                                eq("task", taskInstance)
+                                                        }
+
+            def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
+            def subTaskInstanceTotal = Task.countByParentTask(taskInstance)
             def showTaskTab = new String("true")
 
@@ -202 +202 @@
                 taskRecurringScheduleExits = false
             }
-                        
+
             return [ taskInstance: taskInstance,
-                                                        entryWorkDoneList: entryWorkDoneList,
-                                                        entryFaultList: entryFaultList,
+                            entryWorkDoneList: entryWorkDoneList,
+                            entryFaultList: entryFaultList,
                             taskProcedureInstance: taskProcedureInstance,
                             taskProcedureExits: taskProcedureExits,
                             showTaskTab: showTaskTab,
-                                                        subTaskInstanceList: subTaskInstanceList,
-                                                        subTaskInstanceTotal: subTaskInstanceTotal,
-                                                        subTaskInstanceMax: params.max,
-                                                        maintenanceActionList: maintenanceActionList,
-                                                        taskRecurringScheduleInstance: taskRecurringScheduleInstance,
-                                                        taskRecurringScheduleExits: taskRecurringScheduleExits,
+                            subTaskInstanceList: subTaskInstanceList,
+                            subTaskInstanceTotal: subTaskInstanceTotal,
+                            subTaskInstanceMax: params.max,
+                            maintenanceActionList: maintenanceActionList,
+                            taskRecurringScheduleInstance: taskRecurringScheduleInstance,
+                            taskRecurringScheduleExits: taskRecurringScheduleExits,
                             inventoryMovementList: inventoryMovementList]
         }
@@ -268 +268 @@
                 def version = params.version.toLong()
                 if(taskInstance.version > version) {
-                    
+
                     taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.")
                     render(view:'edit',model:[taskInstance:taskInstance])
@@ -305 +305 @@
         }
     }
-        
-        def listSubTasks = {
-                def parentTaskInstance = Task.get(params.id)
-                                
+
+    def listSubTasks = {
+        def parentTaskInstance = Task.get(params.id)
+
         if(!parentTaskInstance) {
             flash.message = "Task not found with id ${params.id}"
@@ -314 +314 @@
         }
         else {
-                params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-                def subTaskInstanceList = Task.findAllByParentTask(parentTaskInstance, params)
-                def subTaskInstanceTotal = Task.countByParentTask(parentTaskInstance)
-                                
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        def subTaskInstanceList = Task.findAllByParentTask(parentTaskInstance, params)
+        def subTaskInstanceTotal = Task.countByParentTask(parentTaskInstance)
+
         [ taskInstanceList: subTaskInstanceList,
-                        taskInstanceTotal:  subTaskInstanceTotal,
-                        parentTaskInstance: parentTaskInstance]
-                }
-        }
-        
+            taskInstanceTotal:  subTaskInstanceTotal,
+            parentTaskInstance: parentTaskInstance]
+        }
+    }
+
 }