Index: /trunk/grails-app/controllers/ContactDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/ContactDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/ContactDetailedController.groovy (revision 402) @@ -0,0 +1,125 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +@Secured(['ROLE_AppAdmin', 'ROLE_Manager']) +class ContactDetailedController extends BaseController { + + def contactService + + @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) + [ contactInstanceList: Contact.list( params ), contactInstanceTotal: Contact.count() ] + } + + @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AppUser']) + def show = { + def contactInstance = Contact.get( params.id ) + + if(!contactInstance) { + flash.message = "Contact not found with id ${params.id}" + redirect(action:list) + } + else { return [ contactInstance : contactInstance ] } + } + + def delete = { + def result = contactService.delete(params) + + if(!result.error) { + if(result.ownerInstance) { + def c = getControllerName(result.ownerInstance) + flash.message = g.message(code: "default.delete.success", args: ["Contact", '']) + redirect(controller:c, action:'edit', id: result.ownerInstance.id) + return + } + flash.message = g.message(code: "default.delete.success", args: ["Contact", params.id]) + redirect(action:list) + return + } + + flash.message = g.message(code: result.error.code, args: result.error.args) + + if(result.error.code == "default.not.found") { + redirect(action:list) + return + } + + redirect(action:show, id: params.id) + } + + def edit = { + def contactInstance = Contact.get( params.id ) + + if(!contactInstance) { + flash.message = "Contact not found with id ${params.id}" + redirect(action:list) + } + else { + return [ contactInstance : contactInstance ] + } + } + + def update = { + def contactInstance = Contact.get( params.id ) + if(contactInstance) { + if(params.version) { + def version = params.version.toLong() + if(contactInstance.version > version) { + + contactInstance.errors.rejectValue("version", "default.optimistic.locking.failure") + render(view:'edit',model:[contactInstance:contactInstance]) + return + } + } + contactInstance.properties = params + if(!contactInstance.hasErrors() && contactInstance.save(flush: true)) { + flash.message = "Contact ${params.id} updated" + redirect(action:show,id:contactInstance.id) + } + else { + render(view:'edit',model:[contactInstance:contactInstance]) + } + } + else { + flash.message = "Contact not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def result = contactService.create(params) + + if(!result.error) + return [contactInstance: result.contactInstance] + + flash.errorMessage = g.message(code: result.error.code, args: result.error.args) + redirect(action: list) + } + + def save = { + def result = contactService.save(params) + + if(!result.error) { + def c = getControllerName(result.ownerInstance) + flash.message = g.message(code: "default.create.success", args: ["Contact", '']) + redirect(controller:c, action:'edit', id: result.ownerInstance.id) + return + } + + render(view:'create', model:[contactInstance: result.contactInstance]) + } + + private getControllerName(ownerInstance) { + if(ownerInstance.class.name == 'Person') + return "${ownerInstance.class.name[0].toLowerCase() + ownerInstance.class.name[1..-1]}" + else + return "${ownerInstance.class.name[0].toLowerCase() + ownerInstance.class.name[1..-1]}"+"Detailed" + } + +} Index: /trunk/grails-app/domain/Contact.groovy =================================================================== --- /trunk/grails-app/domain/Contact.groovy (revision 402) +++ /trunk/grails-app/domain/Contact.groovy (revision 402) @@ -0,0 +1,29 @@ +class Contact { + + ContactType contactType + + Manufacturer manufacturer + Supplier supplier + Person person + Site site + + String value + +// hasMany = [] + + static belongsTo = [Manufacturer, Supplier, Person, Site] + + static constraints = { + value(maxSize:50) + + manufacturer(nullable:true) + supplier(nullable:true) + person(nullable:true) + site(nullable:true) + } + + String toString() { + "${this.contactType}: ${this.value}" + } + +} Index: /trunk/grails-app/domain/ContactType.groovy =================================================================== --- /trunk/grails-app/domain/ContactType.groovy (revision 402) +++ /trunk/grails-app/domain/ContactType.groovy (revision 402) @@ -0,0 +1,16 @@ +class ContactType { + 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 401) +++ /trunk/grails-app/domain/Manufacturer.groovy (revision 402) @@ -5,5 +5,7 @@ boolean isActive = true - static hasMany = [inventoryItems: InventoryItem, addresses: Address] + static hasMany = [contacts: Contact, + addresses: Address, + inventoryItems: InventoryItem] static belongsTo = [InventoryItem] Index: /trunk/grails-app/domain/Person.groovy =================================================================== --- /trunk/grails-app/domain/Person.groovy (revision 401) +++ /trunk/grails-app/domain/Person.groovy (revision 402) @@ -6,4 +6,5 @@ entries: Entry, tasks: Task, + contacts: Contact, addresses: Address] @@ -15,5 +16,5 @@ String firstName String lastName - String employeeID + String employeeID = '' /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */ @@ -36,5 +37,5 @@ firstName(blank: false) lastName(blank: false) - employeeID(blank: true, nullable:true) + employeeID() description() department(nullable:true) @@ -45,5 +46,4 @@ pass(blank: false, minSize:4) //minSize:7 sessionTimeout(min:60, max:43200) - } Index: /trunk/grails-app/domain/Site.groovy =================================================================== --- /trunk/grails-app/domain/Site.groovy (revision 401) +++ /trunk/grails-app/domain/Site.groovy (revision 402) @@ -9,4 +9,5 @@ siteExtendedAttributes: SiteExtendedAttribute, inventoryStores: InventoryStore, + contacts: Contact, addresses: Address] Index: /trunk/grails-app/domain/Supplier.groovy =================================================================== --- /trunk/grails-app/domain/Supplier.groovy (revision 401) +++ /trunk/grails-app/domain/Supplier.groovy (revision 402) @@ -5,5 +5,7 @@ boolean isActive = true - static hasMany = [inventoryItems: InventoryItem, addresses: Address] + static hasMany = [contacts: Contact, + addresses: Address, + inventoryItems: InventoryItem] static belongsTo = [InventoryItem] Index: /trunk/grails-app/i18n/messages.properties =================================================================== --- /trunk/grails-app/i18n/messages.properties (revision 401) +++ /trunk/grails-app/i18n/messages.properties (revision 402) @@ -1,3 +1,4 @@ address.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create an address. +contact.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create contact details. asset.tree.import.success=Asset tree imported. Index: /trunk/grails-app/services/ContactService.groovy =================================================================== --- /trunk/grails-app/services/ContactService.groovy (revision 402) +++ /trunk/grails-app/services/ContactService.groovy (revision 402) @@ -0,0 +1,103 @@ +/** + * Provides a service class with methods to interact with the Contact domain class. + * Contact stores contact details for various objects in the database. + */ +class ContactService { + + boolean transactional = false + + def delete(params) { + def result = [:] + def fail = { Map m -> + result.error = [ code: m.code, args: ["Contact", params.id] ] + return result + } + + result.contactInstance = Contact.get(params.id) + + if(!result.contactInstance) + return fail(code:"default.not.found") + + result.ownerInstance = getOwner(result.contactInstance) + + try { + result.contactInstance.delete(flush:true) + return result //Success. + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + return fail(code:"default.delete.failure") + } + + } + + def create(params) { + def result = [:] + def fail = { Map m -> + result.error = [ code: m.code, args: ["Contact", params.id] ] + return result + } + + result.ownerInstance = getOwner(params) + if(!result.ownerInstance) + return fail(code:"contact.owner.not.found") + + result.contactInstance = new Contact() + result.contactInstance.properties = params + + // success + return result + } + + def save(params) { + def result = [:] + def fail = { Map m -> + if(result.contactInstance && m.field) + result.contactInstance.errors.rejectValue(m.field, m.code) + result.error = [ code: m.code, args: ["Contact", params.id] ] + return result + } + + result.ownerInstance = getOwner(params) + if(!result.ownerInstance) + return fail(code:"contact.owner.not.found") + + result.contactInstance = new Contact(params) + + if(result.contactInstance.hasErrors() || !result.contactInstance.save(flush: true)) + return fail(code:"default.create.failure") + + // success + return result + } + + private getOwner(Map params) { + def ownerInstance + + if(params.manufacturer?.id) + return ownerInstance = Manufacturer.get(params.manufacturer.id) + if(params.supplier?.id) + return ownerInstance = Supplier.get(params.supplier.id) + if(params.person?.id) + return ownerInstance = Person.get(params.person.id) + if(params.site?.id) + return ownerInstance = Site.get(params.site.id) + + return false + } + + private getOwner(Object object) { + def ownerInstance + + if(object.manufacturer) + return ownerInstance = object.manufacturer + if(object.supplier) + return ownerInstance = object.supplier + if(object.person) + return ownerInstance = object.person + if(object.site) + return ownerInstance = object.site + + return false + } + +} // end of class Index: /trunk/grails-app/services/CreateDataService.groovy =================================================================== --- /trunk/grails-app/services/CreateDataService.groovy (revision 401) +++ /trunk/grails-app/services/CreateDataService.groovy (revision 402) @@ -61,4 +61,5 @@ createBaseManufacturerTypes() createBaseAddressTypes() + createBaseContactTypes() // Tasks @@ -527,4 +528,55 @@ } + def createBaseContactTypes() { + + // ContactType + def contactTypeInstance + + // ContactType #1 + contactTypeInstance = new ContactType(name: "Email", + description: "Email address.") + saveAndTest(contactTypeInstance) + + // ContactType #2 + contactTypeInstance = new ContactType(name: "Alternate Email", + description: "Alternate email address.") + saveAndTest(contactTypeInstance) + + // ContactType #3 + contactTypeInstance = new ContactType(name: "Mobile", + description: "Modile phone number.") + saveAndTest(contactTypeInstance) + + // ContactType #4 + contactTypeInstance = new ContactType(name: "Work Phone", + description: "Work phone number.") + saveAndTest(contactTypeInstance) + + // ContactType #5 + contactTypeInstance = new ContactType(name: "Home Phone", + description: "Home phone number.") + saveAndTest(contactTypeInstance) + + // ContactType #6 + contactTypeInstance = new ContactType(name: "Work Fax", + description: "Work fax number.") + saveAndTest(contactTypeInstance) + + // ContactType #7 + contactTypeInstance = new ContactType(name: "Home Fax", + description: "Home fax number.") + saveAndTest(contactTypeInstance) + + // ContactType #8 + contactTypeInstance = new ContactType(name: "Web Site", + description: "Web site address.") + saveAndTest(contactTypeInstance) + + // ContactType #9 + contactTypeInstance = new ContactType(name: "Person", + description: "Contact person.") + saveAndTest(contactTypeInstance) + } + def createDemoSuppliers() { Index: /trunk/grails-app/views/contactDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/contactDetailed/create.gsp (revision 402) +++ /trunk/grails-app/views/contactDetailed/create.gsp (revision 402) @@ -0,0 +1,108 @@ + + + + + + + Create Contact + + +
+

Create Contact

+
+
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + ${contactInstance.manufacturer.encodeAsHTML()} + +
+ + + + ${contactInstance.supplier.encodeAsHTML()} + +
+ + + + ${contactInstance.person.encodeAsHTML()} + +
+ + + + ${contactInstance.site.encodeAsHTML()} + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/contactDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/contactDetailed/edit.gsp (revision 402) +++ /trunk/grails-app/views/contactDetailed/edit.gsp (revision 402) @@ -0,0 +1,112 @@ + + + + + + + Edit Contact + + +
+

Edit Contact

+
+
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + ${contactInstance.manufacturer.encodeAsHTML()} + +
+ + + + ${contactInstance.supplier.encodeAsHTML()} + +
+ + + + ${contactInstance.person.encodeAsHTML()} + +
+ + + + ${contactInstance.site.encodeAsHTML()} + +
+ + + +
+ + + +
+
+
+ + + +
+ +
+ + Index: /trunk/grails-app/views/contactDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/contactDetailed/list.gsp (revision 402) +++ /trunk/grails-app/views/contactDetailed/list.gsp (revision 402) @@ -0,0 +1,52 @@ + + + + + + + Contact List + + +
+

Contact List

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:contactInstance, field:'id')}${fieldValue(bean:contactInstance, field:'value')} + + Show + +
+
+
+ +
+
+ + Index: /trunk/grails-app/views/contactDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/contactDetailed/show.gsp (revision 402) +++ /trunk/grails-app/views/contactDetailed/show.gsp (revision 402) @@ -0,0 +1,82 @@ + + + + + + + Show Contact + + +
+

Show Contact

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:contactInstance, field:'id')}
Manufacturer:${contactInstance.manufacturer.encodeAsHTML()}
Supplier:${contactInstance.supplier.encodeAsHTML()}
Person:${contactInstance.person.encodeAsHTML()}
Site:${contactInstance.site.encodeAsHTML()}
Contact Type:${fieldValue(bean:contactInstance, field:'contactType')}
Value:${fieldValue(bean:contactInstance, field:'value')}
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/manufacturerDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/manufacturerDetailed/edit.gsp (revision 401) +++ /trunk/grails-app/views/manufacturerDetailed/edit.gsp (revision 402) @@ -66,4 +66,20 @@ + + + + + +Add Contact + + + + + @@ -76,5 +92,5 @@ - Add Address + +Add Address Index: /trunk/grails-app/views/manufacturerDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/manufacturerDetailed/show.gsp (revision 401) +++ /trunk/grails-app/views/manufacturerDetailed/show.gsp (revision 402) @@ -55,4 +55,18 @@ + + + Contact: + + + + + + + Index: /trunk/grails-app/views/person/edit.gsp =================================================================== --- /trunk/grails-app/views/person/edit.gsp (revision 401) +++ /trunk/grails-app/views/person/edit.gsp (revision 402) @@ -85,9 +85,25 @@ + + + + + +Add Contact + + + + + - Add Address + +Add Address Index: /trunk/grails-app/views/person/show.gsp =================================================================== --- /trunk/grails-app/views/person/show.gsp (revision 401) +++ /trunk/grails-app/views/person/show.gsp (revision 402) @@ -47,4 +47,17 @@ Description: ${person.description?.encodeAsHTML()} + + + + Contact: + + + + + Index: /trunk/grails-app/views/siteDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/siteDetailed/edit.gsp (revision 401) +++ /trunk/grails-app/views/siteDetailed/edit.gsp (revision 402) @@ -77,5 +77,21 @@ - + + + + + + + + +Add Contact + + + @@ -89,5 +105,5 @@ -Add Address ++Add Address Index: /trunk/grails-app/views/siteDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/siteDetailed/show.gsp (revision 401) +++ /trunk/grails-app/views/siteDetailed/show.gsp (revision 402) @@ -66,4 +66,17 @@ + + + Contact: + + + + + + Index: /trunk/grails-app/views/supplierDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/supplierDetailed/edit.gsp (revision 401) +++ /trunk/grails-app/views/supplierDetailed/edit.gsp (revision 402) @@ -66,4 +66,20 @@ + + + + + +Add Contact + + + + + @@ -76,5 +92,5 @@ - Add Address + +Add Address Index: /trunk/grails-app/views/supplierDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/supplierDetailed/show.gsp (revision 401) +++ /trunk/grails-app/views/supplierDetailed/show.gsp (revision 402) @@ -55,5 +55,18 @@ - + + + Contact: + + + + + + + Addresses: