Changeset 440

Timestamp:

Mar 16, 2010, 11:33:22 AM (14 years ago)

Author:

gav

Message:

Add Person import feature.
Commit has a small amount of cross over code to the commits will follow.

Location:

trunk/grails-app

Files:

• conf/Config.groovy (modified) (2 diffs)
• controllers/PersonController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (2 diffs)
• services/PersonCsvService.groovy (added)
• views/person/importPersons.gsp (added)
• views/person/list.gsp (modified) (1 diff)

trunk/grails-app/conf/Config.groovy

@@ -104 +104 @@
             warn "grails.app.controller"
             info "grails.app.service.AssetCsvService"
+            info "grails.app.service.PersonCsvService"
             info "grails.app.service.InventoryCsvService"
             break
@@ -306 +307 @@
             [order:91, controller:'productionReferenceDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
         ]
+    ],
+    [order:170, controller:'costCodeDetailed', title:'costCode', action:'list',
+        subItems: [
+            [order:10, controller:'costCodeDetailed', title:'Cost Code List', action:'list', isVisible: { true }],
+            [order:20, controller:'costCodeDetailed', title:'Create', action:'create', isVisible: { true }],
+            [order:90, controller:'costCodeDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
+            [order:91, controller:'costCodeDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+        ]
     ]
 ]

trunk/grails-app/controllers/PersonController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 @Secured(['ROLE_Manager','ROLE_AppAdmin'])
 class PersonController extends BaseAppAdminController {
 
+    def filterService
+    def personCsvService
     def authenticateService
-    def filterService
 
     // the delete, save and update actions only accept POST requests
@@ -12 +14 @@
     def index = {
         redirect action: list, params: params
+    }
+
+    /**
+    * Disaply the import view.
+    */
+    def importPersons = {
+    }
+
+    /**
+    * Handle the import save.
+    */
+    def importPersonsSave = {
+        def result = personCsvService.importPersons(request)
+
+        if(!result.error) {
+            response.contentType = ConfigurationHolder.config.grails.mime.types["text"]
+            response.setHeader("Content-disposition", "attachment; filename=LoginNamesAndPasswords.txt")
+            render result.loginNamesAndPasswords
+            return
+        }
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+        redirect(action: importPersons)
+    }
+
+    /**
+    * Export a csv template.
+    * NOTE: IE has a 'validating' bug in dev mode that causes the export to take a long time!
+    * This does not appear to be a problem once deployed to Tomcat.
+    */
+    def exportPersonsTemplate = {
+        response.contentType = ConfigurationHolder.config.grails.mime.types["csv"]
+        response.setHeader("Content-disposition", "attachment; filename=personsTemplate.csv")
+        def s = personCsvService.buildPersonsTemplate()
+        render s
     }
 

trunk/grails-app/i18n/messages.properties

@@ -7 +7 @@
 inventory.import.success=Inventory imported.
 inventory.import.failure=Could not create inventory from supplied file, failed on line {0}, see {1}.
+
+inventoryItemPurchase.import.success=Inventory item purchases imported.
+inventoryItemPurchase.import.failure=Could not create inventory item purchases from supplied file, failed on line {0}, see {1}.
+
+person.import.success=Person list imported.
+person.import.failure=Could not create persons from supplied file, failed on line {0}, see {1}.
 
 asset.copy.subItem.create.failure=Could not complete operation, as sub item failed to save.
@@ -138 +144 @@
 inventoryMovement.still.associated=Could not complete operation as inventory movements are still associated with this item.
 
+inventoryItemPurchase.invoiceNumber.required=An invoice number must be supplied to approve payment.
+inventoryItemPurchase.delete.failure.received.exists=Could not delete, items have been received.
+inventoryItemPurchase.delete.failure.payment.approved=Could not delete, payment has been approved.
+
 assignedGroup.task.not.found=Please select a task and then ''Add Assigned Group''.
 assignedPerson.task.not.found=Please select a task and then ''Add Assigned Person''.

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

@@ -29 +29 @@
             Results:${personTotal}
         </div>
+
+        <jsUtil:toggleControl toggleId="options"
+                                                imageId="optionsImg"
+                                                closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
+                                                openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
+                                                text="${g.message(code: 'default.options.text')}"
+                                                />
+
+        <div id="options" style="display:none;">
+            <g:form method="post" >
+                <g:hiddenField name="params" value="${filterParams}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="max">Persons:</label>
+                                </td>
+                                <td valign="top" class="value">
+                                    <g:link action="exportPersonsTemplate">
+                                        Template
+                                    </g:link>
+                                    /
+                                    <g:link action="importPersons">
+                                        Import
+                                    </g:link>
+                                </td>
+                            </tr>
+
+                        </tbody>
+                    </table>
+                </div>
+            </g:form>
+        </div>
+
+        <br />
 
         <div class="list">