Changeset 633 for trunk/grails-app/controllers

Timestamp:

Jul 19, 2010, 8:47:38 AM (14 years ago)

Author:

gav

Message:

Domain change: Add PurchasingGroup?.
Logic and views to suite.

Location:

trunk/grails-app/controllers

Files:

• CostCodeDetailedController.groovy (modified) (2 diffs)
• InventoryItemPurchaseDetailedController.groovy (modified) (4 diffs)
• PersonController.groovy (modified) (2 diffs)
• PurchasingGroupDetailedController.groovy (added)

trunk/grails-app/controllers/CostCodeDetailedController.groovy

@@ -78 +78 @@
             }
             costCodeInstance.properties = params
+            // Trim name to avoid spaces.
+            costCodeInstance.name = costCodeInstance.name.trim()
             if(!costCodeInstance.hasErrors() && costCodeInstance.save(flush: true)) {
                 flash.message = "CostCode ${params.id} updated"
@@ -100 +102 @@
     def save = {
         def costCodeInstance = new CostCode(params)
+        // Trim name to avoid spaces.
+        costCodeInstance.name = costCodeInstance.name.trim()
         if(!costCodeInstance.hasErrors() && costCodeInstance.save(flush: true)) {
             flash.message = "CostCode ${costCodeInstance.id} created"

trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -226 +226 @@
         params.returnTo = params.returnTo ?: 'inventoryItem'
 
-        if(!result.error)
-            return [ inventoryItemPurchaseInstance : result.inventoryItemPurchaseInstance ]
+        def costCodes = []
+
+        if(!result.error) {
+            if(inventoryPurchaseService.isPersonInPurchasingGroup(result.inventoryItemPurchaseInstance.costCode.purchasingGroup))
+                costCodes = inventoryPurchaseService.getCostCodesByPerson()
+
+            return [ inventoryItemPurchaseInstance : result.inventoryItemPurchaseInstance,
+                            'costCodes': costCodes ]
+        }
 
         flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
@@ -248 +255 @@
         }
 
-        render(view:'edit', model:[inventoryItemPurchaseInstance: result.inventoryItemPurchaseInstance.attach()])
+        result.inventoryItemPurchaseInstance.attach()
+        result.inventoryItemPurchaseInstance.costCode.attach()
+        result.inventoryItemPurchaseInstance.costCode.purchasingGroup.attach()
+
+        def costCodes = []
+        if(inventoryPurchaseService.isPersonInPurchasingGroup(result.inventoryItemPurchaseInstance.costCode.purchasingGroup))
+            costCodes = inventoryPurchaseService.getCostCodesByPerson()
+
+        render(view:'edit', model:[inventoryItemPurchaseInstance: result.inventoryItemPurchaseInstance,
+                                                'costCodes': costCodes])
     }
 
@@ -262 +278 @@
         }
 
-        return ['inventoryItemPurchaseInstance':inventoryItemPurchaseInstance]
+        def costCodes = inventoryPurchaseService.getCostCodesByPerson()
+
+        return ['inventoryItemPurchaseInstance': inventoryItemPurchaseInstance,
+                        'costCodes': costCodes]
     }
 
@@ -282 +301 @@
         }
 
+        def costCodes = inventoryPurchaseService.getCostCodesByPerson()
+
         params.errorMessage = g.message(code: result.error.code, args: result.error.args)
-        render(view:'create', model:['inventoryItemPurchaseInstance': result.inventoryItemPurchaseInstance])
+        render(view:'create', model:['inventoryItemPurchaseInstance': result.inventoryItemPurchaseInstance,
+                                                    'costCodes': costCodes])
     }
 

trunk/grails-app/controllers/PersonController.groovy

@@ -157 +157 @@
             person.properties = params
             person.setPersonGroupsFromCheckBoxList(params.personGroups)
+            person.setPurchasingGroupsFromCheckBoxList(params.purchasingGroups)
 
             if(params.pass == "") {
@@ -194 +195 @@
             person.password = authenticateService.encodePassword(params.pass)
             person.setPersonGroupsFromCheckBoxList(params.personGroups)
+            person.setPurchasingGroupsFromCheckBoxList(params.purchasingGroups)
             if (person.save(flush: true)) {
                 addRemoveAuthorities(person)