Changeset 431 for trunk/grails-app/services

Timestamp:

Mar 5, 2010, 12:45:43 PM (15 years ago)

Author:

gav

Message:

Add ProductionReference.
Add ProductionManager and ProductionUser roles.
Update immediate callout help definitions, roll errors into one ul.
Add help definitions for resolved and unresolved.

Location:

trunk/grails-app/services

Files:

• CreateDataService.groovy (modified) (8 diffs)
• TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/CreateDataService.groovy

@@ -112 +112 @@
         createDemoSuppliers()
         createDemoManufacturers()
+        createDemoProductionReference()
 
         // Tasks
@@ -146 +147 @@
 
         // Authority #1
-        authInstance = new Authority(description:"Application Admin, not required for daily use! Grants full admin access to the application.",
+        authInstance = new Authority(description:"Application Admin, not required for daily use! \
+                                                                                Grants full admin access to the application.",
                                         authority:"ROLE_AppAdmin")
         saveAndTest(authInstance)
@@ -157 +159 @@
         // Authority #2
         authInstance = new Authority(description:"Business Manager, grants full management access.",
-                                        authority:"ROLE_Manager")
+                                                            authority:"ROLE_Manager")
         saveAndTest(authInstance)
 
         // Authority #3
-        authInstance = new Authority(description:"Application User, all application users need this base role to allow login.",
-                                        authority:"ROLE_AppUser")
+        authInstance = new Authority(description:"Application User, all application users need this base role \
+                                                                                    to allow login.",
+                                                            authority:"ROLE_AppUser")
         saveAndTest(authInstance)
 
         // Authority #4
         authInstance = new Authority(description:"Task Manager",
-                                        authority:"ROLE_TaskManager")
+                                                            authority:"ROLE_TaskManager")
         saveAndTest(authInstance)
 
         // Authority #5
         authInstance = new Authority(description:"Task User",
-                                        authority:"ROLE_TaskUser")
+                                                            authority:"ROLE_TaskUser")
         saveAndTest(authInstance)
 
         // Authority #6
         authInstance = new Authority(description:"Inventory Manager",
-                                        authority:"ROLE_InventoryManager")
+                                                            authority:"ROLE_InventoryManager")
         saveAndTest(authInstance)
 
         // Authority #7
         authInstance = new Authority(description:"Inventory User",
-                                        authority:"ROLE_InventoryUser")
+                                                            authority:"ROLE_InventoryUser")
         saveAndTest(authInstance)
 
         // Authority #8
         authInstance = new Authority(description:"Asset Manager",
-                                        authority:"ROLE_AssetManager")
+                                                            authority:"ROLE_AssetManager")
         saveAndTest(authInstance)
 
         // Authority #9
         authInstance = new Authority(description:"Asset User",
-                                        authority:"ROLE_AssetUser")
+                                                            authority:"ROLE_AssetUser")
+        saveAndTest(authInstance)
+
+        // Authority #10
+        authInstance = new Authority(description:"Production Manager",
+                                                            authority:"ROLE_ProductionManager")
+        saveAndTest(authInstance)
+
+        // Authority #11
+        authInstance = new Authority(description:"Production User",
+                                                            authority:"ROLE_ProductionUser")
         saveAndTest(authInstance)
     }
@@ -279 +292 @@
                                     password:passwordEncoded)
         saveAndTest(personInstance)
-        personInstance.addToAuthorities(Authority.get(2))
-        personInstance.addToAuthorities(Authority.get(3))
-        personInstance.addToPersonGroups(PersonGroup.get(5))
+        personInstance.addToAuthorities(Authority.get(2)) // ROLE_Manager.
+        personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
 
         //Person #4
@@ -290 +302 @@
                                     password:passwordEncoded)
         saveAndTest(personInstance)
-        personInstance.addToAuthorities(Authority.get(3))
-        personInstance.addToAuthorities(Authority.get(5))
-        personInstance.addToAuthorities(Authority.get(7))
-        personInstance.addToAuthorities(Authority.get(9))
+        personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
+        personInstance.addToAuthorities(Authority.get(5)) // ROLE_TaskManager.
+        personInstance.addToAuthorities(Authority.get(7)) // ROLE_InventoryUser.
+        personInstance.addToAuthorities(Authority.get(9)) // ROLE_AssetUser.
         personInstance.addToPersonGroups(PersonGroup.get(1))
 
@@ -323 +335 @@
 
         //Person #7
-        personInstance = new Person(loginName:"mann",
+        personInstance = new Person(loginName:"production manager",
                                     firstName:"Production",
-                                    lastName:"Mann",
+                                    lastName:"Manager",
                                     pass:passClearText,
                                     password:passwordEncoded)
         saveAndTest(personInstance)
-        personInstance.addToAuthorities(Authority.get(3))
-        personInstance.addToAuthorities(Authority.get(5))
+        personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
+        personInstance.addToAuthorities(Authority.get(10)) // ROLE_ProductionManager.
         personInstance.addToPersonGroups(PersonGroup.get(3))
 
-        //Person #7
+        //Person #8
+        personInstance = new Person(loginName:"production",
+                                    firstName:"Production",
+                                    lastName:"User",
+                                    pass:passClearText,
+                                    password:passwordEncoded)
+        saveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
+        personInstance.addToAuthorities(Authority.get(11)) // ROLE_ProductionUser.
+        personInstance.addToPersonGroups(PersonGroup.get(3))
+
+        //Person #9
         personInstance = new Person(loginName:"testmanager",
                                     firstName:"Test",
@@ -340 +363 @@
                                     password:passwordEncoded)
         saveAndTest(personInstance)
-        personInstance.addToAuthorities(Authority.get(3))
-        personInstance.addToAuthorities(Authority.get(4))
-        personInstance.addToAuthorities(Authority.get(6))
-        personInstance.addToAuthorities(Authority.get(8))
+        personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
+        personInstance.addToAuthorities(Authority.get(4)) // ROLE_TaskManager.
+        personInstance.addToAuthorities(Authority.get(6)) // ROLE_InventoryManager.
+        personInstance.addToAuthorities(Authority.get(8)) // ROLE_AssetManager.
         personInstance.addToPersonGroups(PersonGroup.get(3))
     }
@@ -621 +644 @@
     }
 
+    def createDemoProductionReference() {
+
+        // ProductionReference
+        def productionReferenceInstance
+
+        // ProductionReference #1
+        productionReferenceInstance = new ProductionReference(name: "Monday Production")
+        saveAndTest(productionReferenceInstance)
+
+        // ProductionReference #2
+        productionReferenceInstance = new ProductionReference(name: "Tuesday Production")
+        saveAndTest(productionReferenceInstance)
+    }
+
 /*********************
 START OF TASK

trunk/grails-app/services/TaskService.groovy

@@ -688 +688 @@
             }
 
+            def productionReference
+            if(params.entryFault.productionReference.id.isLong())
+                productionReference = ProductionReference.get(params.entryFault.productionReference.id.toLong())
+
             def faultParams = [task: result.taskInstance,
                                             entryType: EntryType.get(1),
                                             comment: params.entryFault.comment,
+                                            productionReference: productionReference,
                                             durationHour: params.entryFault.durationHour,
                                             durationMinute: params.entryFault.durationMinute]