Changeset 633

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

Files:

• conf/Config.groovy (modified) (1 diff)
• controllers/CostCodeDetailedController.groovy (modified) (2 diffs)
• controllers/InventoryItemPurchaseDetailedController.groovy (modified) (4 diffs)
• controllers/PersonController.groovy (modified) (2 diffs)
• controllers/PurchasingGroupDetailedController.groovy (added)
• domain/CostCode.groovy (modified) (2 diffs)
• domain/Person.groovy (modified) (2 diffs)
• domain/PurchasingGroup.groovy (added)
• i18n/messages.properties (modified) (3 diffs)
• services/CreateDataService.groovy (modified) (5 diffs)
• services/InventoryPurchaseService.groovy (modified) (1 diff)
• views/appCore/manager.gsp (modified) (2 diffs)
• views/costCodeDetailed/create.gsp (modified) (1 diff)
• views/costCodeDetailed/edit.gsp (modified) (1 diff)
• views/costCodeDetailed/list.gsp (modified) (2 diffs)
• views/costCodeDetailed/show.gsp (modified) (2 diffs)
• views/inventoryItemPurchaseDetailed/create.gsp (modified) (2 diffs)
• views/inventoryItemPurchaseDetailed/edit.gsp (modified) (3 diffs)
• views/person/create.gsp (modified) (1 diff)
• views/person/edit.gsp (modified) (1 diff)
• views/person/show.gsp (modified) (1 diff)
• views/purchasingGroupDetailed (added)
• views/purchasingGroupDetailed/create.gsp (added)
• views/purchasingGroupDetailed/edit.gsp (added)
• views/purchasingGroupDetailed/list.gsp (added)
• views/purchasingGroupDetailed/show.gsp (added)

trunk/grails-app/conf/Config.groovy

@@ -401 +401 @@
             [order:91, controller:'inventoryItemPurchaseDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
         ]
+    ],
+    [order:230, controller:'purchasingGroupDetailed', title:'purchasingGroup', action:'list',
+        subItems: [
+            [order:10, controller:'purchasingGroupDetailed', title:'Purchasing Group List', action:'list', isVisible: { true }],
+            [order:20, controller:'purchasingGroupDetailed', title:'Create', action:'create', isVisible: { true }],
+            [order:90, controller:'purchasingGroupDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
+            [order:91, controller:'purchasingGroupDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+        ]
     ]
 ]

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)

trunk/grails-app/domain/CostCode.groovy

@@ -1 +1 @@
 class CostCode {
+
+    PurchasingGroup purchasingGroup
+
     String name
     String description = ""
@@ -7 +10 @@
 
     static constraints = {
-        name(maxSize:50,unique:true,blank:false)
+        name(blank:false, maxSize:50, validator: {val, obj ->
+            // Name must be unique for a purchasingGroup.
+            def list = CostCode.withCriteria {
+                eq('purchasingGroup', obj.purchasingGroup)
+                eq('name', obj.name)
+                if(obj.id)
+                    notEqual('id', obj.id)
+            }
+            if(list.size() > 0)
+                return 'not.unique.for.purchasing.group'
+            // Success.
+            return true
+        })
         description(maxSize:100)
     }
 
     String toString() {
-        "${this.name}"
+        "${this.name}.${this.purchasingGroup}"
     }
+
 }

trunk/grails-app/domain/Person.groovy

@@ -7 +7 @@
                         tasks: Task,
                         contacts: Contact,
-                        addresses: Address]
+                        addresses: Address,
+                        purchasingGroups: PurchasingGroup]
 
     static belongsTo = [Authority]
@@ -68 +69 @@
     }
 
+    //  This additional setter is used to convert the checkBoxList string or string array
+    //  of ids selected to the corresponding domain objects.
+    public void setPurchasingGroupsFromCheckBoxList(ids) {
+        def idList = []
+        if(ids instanceof String) {
+                if(ids.isInteger())
+                    idList << ids.toInteger()
+        }
+        else {
+            ids.each() {
+                if(it.isInteger())
+                    idList << it.toInteger()
+            }
+        }
+        this.purchasingGroups = idList.collect { PurchasingGroup.get( it ) }
+    }
+
 } // end class

trunk/grails-app/i18n/messages.properties

@@ -45 +45 @@
 person.pass.doesNotMatch=Passwords must match
 
+costCode.name.not.unique.for.purchasing.group=CostCode name must be unique for purchasingGroup.
+
 #
 # Help Balloon and property definitions.
@@ -61 +63 @@
 may also provide a record of persons qualified or trained in a specific area. \
     Groups provide no application authorisations.
+person.purchasingGroups=Purchasing Groups
+person.purchasingGroups.help=Purchasing groups determine the available cost codes that a person may purchase against.
 person.loginName=Login Name
 person.loginName.help=This is the id or name that the person will use to login to the application.
@@ -231 +235 @@
 inventoryItemPurchase.delete.failure.payment.approved=Could not delete, payment has been approved.
 inventoryItemPurchase.operation.not.permitted.on.inactive.or.obsolete.item=This operation is not permitted on an inactive or obsolete inventory item.
+inventoryItemPurchase.costCodes.not.found=No cost codes found, a person needs to be assigned to a purchasing group that has cost codes.
 
 assignedGroup.task.not.found=Please select a task and then ''Add Assigned Group''.

trunk/grails-app/services/CreateDataService.groovy

@@ -115 +115 @@
 
         // Person and Utils
-        createDemoPersons()
         createDemoSites()
         createDemoDepartments()
@@ -121 +120 @@
         createDemoManufacturers()
         createDemoProductionReference()
+        createDemoPurchasingGroups()  /// @todo: Perhaps a 'createQuickStartData' method?
         createDemoCostCodes()
+        createDemoPersons()
 
         // Assets
@@ -307 +308 @@
         personInstance.addToAuthorities(Authority.get(2)) // ROLE_Manager.
         personInstance.addToAuthorities(Authority.get(3)) // ROLE_AppUser.
+        personInstance.addToPersonGroups(PersonGroup.get(1))
+        personInstance.addToPurchasingGroups(PurchasingGroup.get(1))
+        personInstance.addToPurchasingGroups(PurchasingGroup.get(2))
 
         //Person #4
@@ -697 +701 @@
     }
 
+    void createDemoPurchasingGroups() {
+
+        // PurchasingGroup
+        def purchasingGroupInstance
+
+        purchasingGroupInstance = new PurchasingGroup(name:"R&M")
+        saveAndTest(purchasingGroupInstance)
+
+        purchasingGroupInstance = new PurchasingGroup(name:"Raw Materials")
+        saveAndTest(purchasingGroupInstance)
+
+        purchasingGroupInstance = new PurchasingGroup(name:"Safety")
+        saveAndTest(purchasingGroupInstance)
+    }
+
     def createDemoCostCodes() {
 
@@ -703 +722 @@
 
         // CostCode #1
-        costCodeInstance = new CostCode(name: "RM Reelstand")
+        costCodeInstance = new CostCode(name: "Reelstand.172",
+                                                                    purchasingGroup: PurchasingGroup.get(1))
         saveAndTest(costCodeInstance)
 
         // CostCode #2
-        costCodeInstance = new CostCode(name: "CAPEX Reelstand")
+        costCodeInstance = new CostCode(name: "Reelstand.CAPEX",
+                                                                    purchasingGroup: PurchasingGroup.get(1))
+        saveAndTest(costCodeInstance)
+
+        // CostCode #2
+        costCodeInstance = new CostCode(name: "PrintUnit.123",
+                                                                    purchasingGroup: PurchasingGroup.get(3))
         saveAndTest(costCodeInstance)
     }

trunk/grails-app/services/InventoryPurchaseService.groovy

@@ -89 +89 @@
     }
 
+    /**
+    * Get costCodes by person and the purchasingGroups they have been assigned.
+    * @param person A Person, defaults to currentUser.
+    * @returns A list of CostCodes.
+    */
+    def getCostCodesByPerson(person = authService.currentUser) {
+        if(person.purchasingGroups) {
+            CostCode.withCriteria {
+                    eq('isActive', true)
+                    or {
+                        person.purchasingGroups.each() { purchasingGroup ->
+                            eq('purchasingGroup', purchasingGroup)
+                        }
+                    }
+            }.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } // withCriteria
+        }
+        else
+            []
+    } // getCostCodesByPerson
+
+    /**
+    * Check if a person is in a purchasing group.
+    * @param person A PurchasingGroup to check for.
+    * @param person A Person, defaults to currentUser.
+    * @returns True if person is in group.
+    */
+    def isPersonInPurchasingGroup(purchasingGroup, person = authService.currentUser) {
+        for(pg in person.purchasingGroups) {
+            if(pg.id == purchasingGroup.id)
+                return true
+        }
+    } // isPersonInPurchasingGroup
+
     def delete(params) {
         InventoryItemPurchase.withTransaction { status ->

trunk/grails-app/views/appCore/manager.gsp

@@ -27 +27 @@
                                 <a href="${createLink(controller:'personGroupDetailed', action:'list')}">Assigned Groups</a>
                                 <br />
+                                <a href="${createLink(controller:'costCodeDetailed', action:'list')}">Cost Codes</a>
+                                <br />
                                 <a href="${createLink(controller:'departmentDetailed', action:'list')}">Departments</a>
                                 <br />
@@ -38 +40 @@
                                 <br />
                                 <a href="${createLink(controller:'manufacturerDetailed', action:'list')}">Manufacturers</a>
+                                <br />
+                                <a href="${createLink(controller:'purchasingGroupDetailed', action:'list')}">Purchasing Groups</a>
                                 <br />
                                 <a href="${createLink(controller:'productionReferenceDetailed', action:'list')}">Production Reference</a>

trunk/grails-app/views/costCodeDetailed/create.gsp

@@ -35 +35 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="purchasingGroup">Purchasing Group:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:costCodeInstance,field:'purchasingGroup','errors')}">
+                                    <g:select optionKey="id"
+                                                    from="${PurchasingGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                    name="purchasingGroup.id"
+                                                    value="${costCodeInstance?.purchasingGroup?.id}" >
+                                    </g:select>
+                                    <p>
+                                        <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link>
+                                    </p>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>

trunk/grails-app/views/costCodeDetailed/edit.gsp

@@ -37 +37 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="purchasingGroup">Purchasing Group:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:costCodeInstance,field:'purchasingGroup','errors')}">
+                                    <g:select optionKey="id"
+                                                    from="${PurchasingGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                    name="purchasingGroup.id"
+                                                    value="${costCodeInstance?.purchasingGroup?.id}" >
+                                    </g:select>
+                                    <p>
+                                        <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link>
+                                    </p>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>

trunk/grails-app/views/costCodeDetailed/list.gsp

@@ -23 +23 @@
                                 <g:sortableColumn property="name" title="Name" />
                         
+                            <g:sortableColumn property="purchasingGroup" title="Group" />
+                        
                                 <g:sortableColumn property="description" title="Description" />
                         
@@ -41 +43 @@
                             <td onclick='window.location = "${request.getContextPath()}/costCodeDetailed/show/${costCodeInstance.id}"'>
                                 ${fieldValue(bean:costCodeInstance, field:'name')}
+                            </td>
+                        
+                            <td onclick='window.location = "${request.getContextPath()}/costCodeDetailed/show/${costCodeInstance.id}"'>
+                                ${fieldValue(bean:costCodeInstance, field:'purchasingGroup')}
                             </td>
                         

trunk/grails-app/views/costCodeDetailed/show.gsp

@@ -34 +34 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Purchasing Group:</td>
+                            <td valign="top" class="value">
+                                <g:link controller="purchasingGroupDetailed" action="show" id="${costCodeInstance?.purchasingGroup?.id}">
+                                    ${costCodeInstance?.purchasingGroup?.encodeAsHTML()}
+                                </g:link>
+                            </td>
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Description:</td>
                             
@@ -44 +53 @@
                             
                             <td valign="top" class="value">${fieldValue(bean:costCodeInstance, field:'isActive')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Inventory Item Purchases:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="i" in="${costCodeInstance.inventoryItemPurchases}">
-                                    <li><g:link controller="inventoryItemPurchaseDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
                             
                         </tr>

trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp

@@ -15 +15 @@
         <div class="body">
             <g:render template="/shared/messages" />
+            <g:if test="${!costCodes}" >
+                <div class="errors">
+                    <ul>
+                        <li><g:message code="inventoryItemPurchase.costCodes.not.found" /><li>
+                </div>
+            </g:if>
             <g:hasErrors bean="${inventoryItemPurchaseInstance}">
             <div class="errors">
@@ -66 +72 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}">
                                     <g:select optionKey="id"
-                                                        from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
+                                                        from="${ costCodes }"
                                                         name="costCode.id"
                                                         value="${inventoryItemPurchaseInstance?.costCode?.id}"

trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp

@@ -59 +59 @@
                                 </td>
                             </tr> 
-                        
+
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -65 +65 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}">
-                                    <g:select optionKey="id"
-                                                        from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
-                                                        name="costCode.id"
-                                                        value="${inventoryItemPurchaseInstance?.costCode?.id}" >
-                                    </g:select>
+                                    <g:if test="${costCodes}">
+                                        <g:select optionKey="id"
+                                                            from="${ costCodes }"
+                                                            name="costCode.id"
+                                                            value="${inventoryItemPurchaseInstance.costCode?.id}" >
+                                        </g:select>
+                                    </g:if>
+                                    <g:else>
+                                        <g:link controller="costCodeDetailed" action="show" id="${inventoryItemPurchaseInstance?.costCode?.id}">
+                                            ${inventoryItemPurchaseInstance?.costCode?.encodeAsHTML()}
+                                        </g:link>
+                                    </g:else>
                                     <g:helpBalloon code="inventoryItemPurchase.cost.code" />
                                 </td>
@@ -96 +103 @@
                                                         from="${ Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
                                                         name="supplier.id"
-                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}"
-                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
+                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}">
                                     </g:select>
                                     <g:helpBalloon code="inventoryItemPurchase.supplier" />

trunk/grails-app/views/person/create.gsp

@@ -105 +105 @@
 
                     <tr class="prop">
+                        <td valign="top" class="name">
+                            <label for="purchasingGroups">Purchasing Groups:</label>
+                        </td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'purchasingGroups','errors')}">
+                            <g:helpBalloon class="helpballoon" code="person.purchasingGroups" />
+                            <custom:checkBoxList name="purchasingGroups"
+                                                            from="${PurchasingGroup.findAllByIsActive(true)}"
+                                                            value="${person?.purchasingGroups?.collect{it.id}}"
+                                                            optionKey="id"
+                                                            sortBy="name"
+                                                            linkController="purchasingGroupDetailed"
+                                                            linkAction="show"/>
+                            <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link>
+                        </td>
+                    </tr>
+
+                    <tr class="prop">
                         <td valign="top" class="name" align="left">
                             Authorities:

trunk/grails-app/views/person/edit.gsp

@@ -144 +144 @@
 
                     <tr class="prop">
+                        <td valign="top" class="name">
+                            <label for="purchasingGroups">Purchasing Groups:</label>
+                        </td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'purchasingGroups','errors')}">
+                            <g:helpBalloon class="helpballoon" code="person.purchasingGroups" />
+                            <custom:checkBoxList name="purchasingGroups"
+                                                            from="${PurchasingGroup.findAllByIsActive(true)}"
+                                                            value="${person?.purchasingGroups?.collect{it.id}}"
+                                                            optionKey="id"
+                                                            sortBy="name"
+                                                            linkController="purchasingGroupDetailed"
+                                                            linkAction="show"/>
+                            <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link>
+                        </td>
+                    </tr>
+
+                    <tr class="prop">
                         <td valign="top" class="name" align="left">
                             Authorities:

trunk/grails-app/views/person/show.gsp

@@ -89 +89 @@
                     <td valign="top" class="value">
                         <ul>
-                        <g:each in="${person.personGroups}" var='group'>
-                            <li>${group}</li>
+                        <g:each var='group' in="${ person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
+                            <li>
+                                <g:link controller="personGroupDetailed"
+                                                action="show"
+                                                id="${group.id}">
+                                    ${group.encodeAsHTML()}
+                                </g:link>
+                            </li>
+                        </g:each>
+                        </ul>
+                    </td>
+                </tr>
+
+                <tr class="prop">
+                    <td valign="top" class="name">Purchasing Groups:</td>
+                    <td valign="top" class="value">
+                        <ul>
+                        <g:each  var='a' in="${ person.purchasingGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
+                            <li>
+                                <g:link controller="purchasingGroupDetailed"
+                                                action="show"
+                                                id="${a.id}">
+                                    ${a.encodeAsHTML()}
+                                </g:link>
+                            </li>
                         </g:each>
                         </ul>