Index: /trunk/grails-app/controllers/AddressDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AddressDetailedController.groovy (revision 397) +++ /trunk/grails-app/controllers/AddressDetailedController.groovy (revision 397) @@ -0,0 +1,111 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +@Secured(['ROLE_AppAdmin', 'ROLE_Manager']) +class AddressDetailedController extends BaseController { + + def addressService + + @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AppUser']) + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AppUser']) + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ addressInstanceList: Address.list( params ), addressInstanceTotal: Address.count() ] + } + + @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AppUser']) + def show = { + def addressInstance = Address.get( params.id ) + + if(!addressInstance) { + flash.message = "Address not found with id ${params.id}" + redirect(action:list) + } + else { return [ addressInstance : addressInstance ] } + } + + def delete = { + def addressInstance = Address.get( params.id ) + if(addressInstance) { + try { + addressInstance.delete(flush:true) + flash.message = "Address ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "Address ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "Address not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def addressInstance = Address.get( params.id ) + + if(!addressInstance) { + flash.message = "Address not found with id ${params.id}" + redirect(action:list) + } + else { + return [ addressInstance : addressInstance ] + } + } + + def update = { + def addressInstance = Address.get( params.id ) + if(addressInstance) { + if(params.version) { + def version = params.version.toLong() + if(addressInstance.version > version) { + + addressInstance.errors.rejectValue("version", "address.optimistic.locking.failure", "Another user has updated this Address while you were editing.") + render(view:'edit',model:[addressInstance:addressInstance]) + return + } + } + addressInstance.properties = params + if(!addressInstance.hasErrors() && addressInstance.save(flush: true)) { + flash.message = "Address ${params.id} updated" + redirect(action:show,id:addressInstance.id) + } + else { + render(view:'edit',model:[addressInstance:addressInstance]) + } + } + else { + flash.message = "Address not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def result = addressService.create(params) + + if(!result.error) + return [addressInstance: result.addressInstance] + + flash.errorMessage = g.message(code: result.error.code, args: result.error.args) + redirect(action: list) + } + + def save = { + def result = addressService.save(params) + + if(!result.error) { + flash.message = g.message(code: "default.create.success", args: ["Address", result.addressInstance.id]) + redirect(action:show, id: result.addressInstance.id) + return + } + + render(view:'create', model:[addressInstance: result.addressInstance]) + } + +} Index: /trunk/grails-app/domain/Address.groovy =================================================================== --- /trunk/grails-app/domain/Address.groovy (revision 397) +++ /trunk/grails-app/domain/Address.groovy (revision 397) @@ -0,0 +1,38 @@ +class Address { + + AddressType addressType + + Manufacturer manufacturer + Supplier supplier + Person person + Site site + + String street1 = '' + String street2 = '' + String city = '' + String state = '' + String postCode = '' + String country = '' + +// hasMany = [] + + static belongsTo = [Manufacturer, Supplier, Person, Site] + + static constraints = { + street1(blank:false,maxSize:50) + street2(maxSize:50) + city(blank:false,maxSize:50) + state(blank:false,maxSize:50) + postCode(blank:false,maxSize:50) + country(blank:false,maxSize:50) + manufacturer(nullable:true) + supplier(nullable:true) + person(nullable:true) + site(nullable:true) + } + + String toString() { + "${this.addressType}: ${this.street1}, ${this.city}" + } + +} Index: /trunk/grails-app/domain/AddressType.groovy =================================================================== --- /trunk/grails-app/domain/AddressType.groovy (revision 397) +++ /trunk/grails-app/domain/AddressType.groovy (revision 397) @@ -0,0 +1,16 @@ +class AddressType { + String name + String description = "" + boolean isActive = true + +// static hasMany = [ : ] + + static constraints = { + name(maxSize:50,unique:true,blank:false) + description(maxSize:100) + } + + String toString() { + "${this.name}" + } +} Index: /trunk/grails-app/domain/Manufacturer.groovy =================================================================== --- /trunk/grails-app/domain/Manufacturer.groovy (revision 396) +++ /trunk/grails-app/domain/Manufacturer.groovy (revision 397) @@ -5,5 +5,5 @@ boolean isActive = true - static hasMany = [inventoryItems: InventoryItem] + static hasMany = [inventoryItems: InventoryItem, addresses: Address] static belongsTo = [InventoryItem] Index: /trunk/grails-app/domain/Person.groovy =================================================================== --- /trunk/grails-app/domain/Person.groovy (revision 396) +++ /trunk/grails-app/domain/Person.groovy (revision 397) @@ -5,5 +5,6 @@ taskModifications: TaskModification, entries: Entry, - tasks: Task] + tasks: Task, + addresses: Address] static belongsTo = [Authority] Index: /trunk/grails-app/domain/Site.groovy =================================================================== --- /trunk/grails-app/domain/Site.groovy (revision 396) +++ /trunk/grails-app/domain/Site.groovy (revision 397) @@ -8,5 +8,6 @@ static hasMany = [sections: Section, siteExtendedAttributes: SiteExtendedAttribute, - inventoryStores: InventoryStore] + inventoryStores: InventoryStore, + addresses: Address] // static belongsTo = [] Index: /trunk/grails-app/domain/Supplier.groovy =================================================================== --- /trunk/grails-app/domain/Supplier.groovy (revision 396) +++ /trunk/grails-app/domain/Supplier.groovy (revision 397) @@ -5,5 +5,5 @@ boolean isActive = true - static hasMany = [inventoryItems: InventoryItem] + static hasMany = [inventoryItems: InventoryItem, addresses: Address] static belongsTo = [InventoryItem] Index: /trunk/grails-app/i18n/messages.properties =================================================================== --- /trunk/grails-app/i18n/messages.properties (revision 396) +++ /trunk/grails-app/i18n/messages.properties (revision 397) @@ -1,2 +1,4 @@ +address.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create an address. + asset.tree.import.success=Asset tree imported. asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}. Index: /trunk/grails-app/services/AddressService.groovy =================================================================== --- /trunk/grails-app/services/AddressService.groovy (revision 397) +++ /trunk/grails-app/services/AddressService.groovy (revision 397) @@ -0,0 +1,79 @@ +/** + * Provides a service class with methods to interact with Address domain class. + * Address stores the address for various objects in the database. + */ +class AddressService { + + boolean transactional = false + + def getAddress() { + """${this.street1} + ${this.street2} + ${this.city} + ${this.state} + ${this.postCode} + ${this.country}""" + + } + + def create(params) { + def result = [:] + def fail = { Map m -> + result.error = [ code: m.code, args: ["Address", params.id] ] + return result + } + + if(!checkForOwner(params)) + return fail(code:"address.owner.not.found") + + result.addressInstance = new Address() + result.addressInstance.properties = params + + // success + return result + } + + def save(params) { + def result = [:] + def fail = { Map m -> + if(result.addressInstance && m.field) + result.addressInstance.errors.rejectValue(m.field, m.code) + result.error = [ code: m.code, args: ["Address", params.id] ] + return result + } + + if(!checkForOwner(params)) + return fail(code:"address.owner.not.found") + + result.addressInstance = new Address(params) + + if(result.addressInstance.hasErrors() || !result.addressInstance.save(flush: true)) + return fail(code:"default.create.failure") + + // success + return result + } + + private checkForOwner(params) { + def manufacturerInstance + def supplierInstance + def personInstance + def siteInstance + + if(params.manufacturer?.id) + manufacturerInstance = Manufacturer.get(params.manufacturer.id) + if(params.supplier?.id) + supplierInstance = Supplier.get(params.supplier.id) + if(params.person?.id) + personInstance = Person.get(params.person.id) + if(params.site?.id) + siteInstance = Site.get(params.site?.id) + + if(!manufacturerInstance && !supplierInstance && !personInstance && !siteInstance) + return false + + return true + } + + +} // end of class Index: /trunk/grails-app/services/CreateDataService.groovy =================================================================== --- /trunk/grails-app/services/CreateDataService.groovy (revision 396) +++ /trunk/grails-app/services/CreateDataService.groovy (revision 397) @@ -58,6 +58,7 @@ createBaseUnitsOfMeasure() createBasePeriods() - createBaseSupplierType() - createBaseManufacturerType() + createBaseSupplierTypes() + createBaseManufacturerTypes() + createBaseAddressTypes() // Tasks @@ -470,5 +471,5 @@ } - def createBaseSupplierType() { + def createBaseSupplierTypes() { // SupplierType @@ -486,5 +487,5 @@ } - def createBaseManufacturerType() { + def createBaseManufacturerTypes() { // ManufacturerType @@ -501,4 +502,35 @@ saveAndTest(manufacturerTypeInstance) + } + + def createBaseAddressTypes() { + + // AddressType + def addressTypeInstance + + // AddressType #1 + addressTypeInstance = new AddressType(name: "Postal", + description: "A postal address.") + saveAndTest(addressTypeInstance) + + // AddressType #2 + addressTypeInstance = new AddressType(name: "Physical", + description: "A physical address.") + saveAndTest(addressTypeInstance) + + // AddressType #3 + addressTypeInstance = new AddressType(name: "Postal & Physical", + description: "An address that is both the postal and physical address.") + saveAndTest(addressTypeInstance) + + // AddressType #4 + addressTypeInstance = new AddressType(name: "Invoice", + description: "An address to send invoices to.") + saveAndTest(addressTypeInstance) + + // AddressType #5 + addressTypeInstance = new AddressType(name: "Delivery", + description: "An address to send deliveries to.") + saveAndTest(addressTypeInstance) } Index: /trunk/grails-app/views/addressDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/addressDetailed/create.gsp (revision 397) +++ /trunk/grails-app/views/addressDetailed/create.gsp (revision 397) @@ -0,0 +1,155 @@ + + + + + + + Create Address + + +
+

Create Address

+
+
+ +
${flash.message}
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + ${addressInstance.manufacturer.encodeAsHTML()} + +
+ + + + ${addressInstance.supplier.encodeAsHTML()} + +
+ + + + ${addressInstance.person.encodeAsHTML()} + +
+ + + + ${addressInstance.site.encodeAsHTML()} + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/addressDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/addressDetailed/edit.gsp (revision 397) +++ /trunk/grails-app/views/addressDetailed/edit.gsp (revision 397) @@ -0,0 +1,153 @@ + + + + + + + Edit Address + + +
+

Edit Address

+
+
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + ${addressInstance.manufacturer.encodeAsHTML()} + +
+ + + + ${addressInstance.supplier.encodeAsHTML()} + +
+ + + + ${addressInstance.person.encodeAsHTML()} + +
+ + + + ${addressInstance.site.encodeAsHTML()} + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + + +
+ +
+ + Index: /trunk/grails-app/views/addressDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/addressDetailed/list.gsp (revision 397) +++ /trunk/grails-app/views/addressDetailed/list.gsp (revision 397) @@ -0,0 +1,68 @@ + + + + + + + Address List + + +
+

Address List

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:addressInstance, field:'id')}${fieldValue(bean:addressInstance, field:'street1')}${fieldValue(bean:addressInstance, field:'street2')}${fieldValue(bean:addressInstance, field:'city')}${fieldValue(bean:addressInstance, field:'state')}${fieldValue(bean:addressInstance, field:'postCode')} + + Show + +
+
+
+ +
+
+ + Index: /trunk/grails-app/views/addressDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/addressDetailed/show.gsp (revision 397) +++ /trunk/grails-app/views/addressDetailed/show.gsp (revision 397) @@ -0,0 +1,124 @@ + + + + + + + Show Address + + +
+

Show Address

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:addressInstance, field:'id')}
Manufacturer:${addressInstance.manufacturer.encodeAsHTML()}
Supplier:${addressInstance.supplier.encodeAsHTML()}
Person:${addressInstance.person.encodeAsHTML()}
Site:${addressInstance.site.encodeAsHTML()}
Address Type:${addressInstance?.addressType?.encodeAsHTML()}
Street1:${fieldValue(bean:addressInstance, field:'street1')}
Street2:${fieldValue(bean:addressInstance, field:'street2')}
City:${fieldValue(bean:addressInstance, field:'city')}
State:${fieldValue(bean:addressInstance, field:'state')}
Post Code:${fieldValue(bean:addressInstance, field:'postCode')}
Country:${fieldValue(bean:addressInstance, field:'country')}
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/manufacturerDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/manufacturerDetailed/edit.gsp (revision 396) +++ /trunk/grails-app/views/manufacturerDetailed/edit.gsp (revision 397) @@ -63,4 +63,20 @@ + + + + + + + + Add Address + + Index: /trunk/grails-app/views/manufacturerDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/manufacturerDetailed/show.gsp (revision 396) +++ /trunk/grails-app/views/manufacturerDetailed/show.gsp (revision 397) @@ -57,4 +57,17 @@ + Addresses: + + + + + + + + Inventory Items: Index: /trunk/grails-app/views/person/edit.gsp =================================================================== --- /trunk/grails-app/views/person/edit.gsp (revision 396) +++ /trunk/grails-app/views/person/edit.gsp (revision 397) @@ -98,4 +98,20 @@ + + + + + + Add Address + + + + Index: /trunk/grails-app/views/person/show.gsp =================================================================== --- /trunk/grails-app/views/person/show.gsp (revision 396) +++ /trunk/grails-app/views/person/show.gsp (revision 397) @@ -60,4 +60,17 @@ + Addresses: + + + + + + + + Employee ID: ${person.employeeID} Index: /trunk/grails-app/views/siteDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/siteDetailed/edit.gsp (revision 396) +++ /trunk/grails-app/views/siteDetailed/edit.gsp (revision 397) @@ -73,5 +73,21 @@ -Add InventoryStore +Add Inventory Store + + + + + + + + + + + +Add Address Index: /trunk/grails-app/views/siteDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/siteDetailed/show.gsp (revision 396) +++ /trunk/grails-app/views/siteDetailed/show.gsp (revision 397) @@ -68,4 +68,17 @@ + Addresses: + + + + + + + + Sections: Index: /trunk/grails-app/views/supplierDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/supplierDetailed/edit.gsp (revision 396) +++ /trunk/grails-app/views/supplierDetailed/edit.gsp (revision 397) @@ -63,5 +63,21 @@ - + + + + + + + + Add Address + + + Inventory Items: Index: /trunk/grails-app/views/supplierDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/supplierDetailed/show.gsp (revision 396) +++ /trunk/grails-app/views/supplierDetailed/show.gsp (revision 397) @@ -57,4 +57,17 @@ + Addresses: + + + + + + + + Inventory Items: