Index: /trunk/grails-app/conf/BootStrap.groovy =================================================================== --- /trunk/grails-app/conf/BootStrap.groovy (revision 267) +++ /trunk/grails-app/conf/BootStrap.groovy (revision 268) @@ -13,7 +13,7 @@ { case "development": - createDataService.ensureSystemAndAdminAccess() - createDataService.createBaseData() - createDataService.createDemoData() + //createDataService.ensureSystemAndAdminAccess() + //createDataService.createBaseData() + //createDataService.createDemoData() break case "test": Index: /trunk/grails-app/controllers/AssetSubItemController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetSubItemController.groovy (revision 267) +++ /trunk/grails-app/controllers/AssetSubItemController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class AssetTypeController extends BaseAppAdminController { +class AssetSubItemController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ assetTypeInstanceList: AssetType.list( params ), assetTypeInstanceTotal: AssetType.count() ] + [ assetSubItemInstanceList: AssetSubItem.list( params ), assetSubItemInstanceTotal: AssetSubItem.count() ] } def show = { - def assetTypeInstance = AssetType.get( params.id ) + def assetSubItemInstance = AssetSubItem.get( params.id ) - if(!assetTypeInstance) { - flash.message = "AssetType not found with id ${params.id}" + if(!assetSubItemInstance) { + flash.message = "AssetSubItem not found with id ${params.id}" redirect(action:list) } - else { return [ assetTypeInstance : assetTypeInstance ] } + else { return [ assetSubItemInstance : assetSubItemInstance ] } } def delete = { - def assetTypeInstance = AssetType.get( params.id ) - if(assetTypeInstance) { + def assetSubItemInstance = AssetSubItem.get( params.id ) + if(assetSubItemInstance) { try { - assetTypeInstance.delete(flush:true) - flash.message = "AssetType ${params.id} deleted" + assetSubItemInstance.delete(flush:true) + flash.message = "AssetSubItem ${params.id} deleted" redirect(action:list) } catch(org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "AssetType ${params.id} could not be deleted" + flash.message = "AssetSubItem ${params.id} could not be deleted" redirect(action:show,id:params.id) } } else { - flash.message = "AssetType not found with id ${params.id}" + flash.message = "AssetSubItem not found with id ${params.id}" redirect(action:list) } @@ -43,38 +43,38 @@ def edit = { - def assetTypeInstance = AssetType.get( params.id ) + def assetSubItemInstance = AssetSubItem.get( params.id ) - if(!assetTypeInstance) { - flash.message = "AssetType not found with id ${params.id}" + if(!assetSubItemInstance) { + flash.message = "AssetSubItem not found with id ${params.id}" redirect(action:list) } else { - return [ assetTypeInstance : assetTypeInstance ] + return [ assetSubItemInstance : assetSubItemInstance ] } } def update = { - def assetTypeInstance = AssetType.get( params.id ) - if(assetTypeInstance) { + def assetSubItemInstance = AssetSubItem.get( params.id ) + if(assetSubItemInstance) { if(params.version) { def version = params.version.toLong() - if(assetTypeInstance.version > version) { + if(assetSubItemInstance.version > version) { - assetTypeInstance.errors.rejectValue("version", "assetType.optimistic.locking.failure", "Another user has updated this AssetType while you were editing.") - render(view:'edit',model:[assetTypeInstance:assetTypeInstance]) + assetSubItemInstance.errors.rejectValue("version", "assetSubItem.optimistic.locking.failure", "Another user has updated this AssetSubItem while you were editing.") + render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance]) return } } - assetTypeInstance.properties = params - if(!assetTypeInstance.hasErrors() && assetTypeInstance.save(flush: true)) { - flash.message = "AssetType ${params.id} updated" - redirect(action:show,id:assetTypeInstance.id) + assetSubItemInstance.properties = params + if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) { + flash.message = "AssetSubItem ${params.id} updated" + redirect(action:show,id:assetSubItemInstance.id) } else { - render(view:'edit',model:[assetTypeInstance:assetTypeInstance]) + render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance]) } } else { - flash.message = "AssetType not found with id ${params.id}" + flash.message = "AssetSubItem not found with id ${params.id}" redirect(action:list) } @@ -82,17 +82,17 @@ def create = { - def assetTypeInstance = new AssetType() - assetTypeInstance.properties = params - return ['assetTypeInstance':assetTypeInstance] + def assetSubItemInstance = new AssetSubItem() + assetSubItemInstance.properties = params + return ['assetSubItemInstance':assetSubItemInstance] } def save = { - def assetTypeInstance = new AssetType(params) - if(!assetTypeInstance.hasErrors() && assetTypeInstance.save(flush: true)) { - flash.message = "AssetType ${assetTypeInstance.id} created" - redirect(action:show,id:assetTypeInstance.id) + def assetSubItemInstance = new AssetSubItem(params) + if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) { + flash.message = "AssetSubItem ${assetSubItemInstance.id} created" + redirect(action:show,id:assetSubItemInstance.id) } else { - render(view:'create',model:[assetTypeInstance:assetTypeInstance]) + render(view:'create',model:[assetSubItemInstance:assetSubItemInstance]) } } Index: /trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy (revision 268) +++ /trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class AssetSubItemExtendedAttributeController extends BaseAppAdminController { + + 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'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ assetSubItemExtendedAttributeInstanceList: AssetSubItemExtendedAttribute.list( params ), assetSubItemExtendedAttributeInstanceTotal: AssetSubItemExtendedAttribute.count() ] + } + + def show = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + + if(!assetSubItemExtendedAttributeInstance) { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ assetSubItemExtendedAttributeInstance : assetSubItemExtendedAttributeInstance ] } + } + + def delete = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + if(assetSubItemExtendedAttributeInstance) { + try { + assetSubItemExtendedAttributeInstance.delete(flush:true) + flash.message = "AssetSubItemExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "AssetSubItemExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + + if(!assetSubItemExtendedAttributeInstance) { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ assetSubItemExtendedAttributeInstance : assetSubItemExtendedAttributeInstance ] + } + } + + def update = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + if(assetSubItemExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(assetSubItemExtendedAttributeInstance.version > version) { + + assetSubItemExtendedAttributeInstance.errors.rejectValue("version", "assetSubItemExtendedAttribute.optimistic.locking.failure", "Another user has updated this AssetSubItemExtendedAttribute while you were editing.") + render(view:'edit',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + return + } + } + assetSubItemExtendedAttributeInstance.properties = params + if(!assetSubItemExtendedAttributeInstance.hasErrors() && assetSubItemExtendedAttributeInstance.save(flush: true)) { + flash.message = "AssetSubItemExtendedAttribute ${params.id} updated" + redirect(action:show,id:assetSubItemExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + } + } + else { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def assetSubItemExtendedAttributeInstance = new AssetSubItemExtendedAttribute() + assetSubItemExtendedAttributeInstance.properties = params + return ['assetSubItemExtendedAttributeInstance':assetSubItemExtendedAttributeInstance] + } + + def save = { + def assetSubItemExtendedAttributeInstance = new AssetSubItemExtendedAttribute(params) + if(!assetSubItemExtendedAttributeInstance.hasErrors() && assetSubItemExtendedAttributeInstance.save(flush: true)) { + flash.message = "AssetSubItemExtendedAttribute ${assetSubItemExtendedAttributeInstance.id} created" + redirect(action:show,id:assetSubItemExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + } + } +} Index: /trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy =================================================================== --- /trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy (revision 268) +++ /trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class DepartmentExtendedAttributeController extends BaseAppAdminController { + + 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'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ departmentExtendedAttributeInstanceList: DepartmentExtendedAttribute.list( params ), departmentExtendedAttributeInstanceTotal: DepartmentExtendedAttribute.count() ] + } + + def show = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + + if(!departmentExtendedAttributeInstance) { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ departmentExtendedAttributeInstance : departmentExtendedAttributeInstance ] } + } + + def delete = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + if(departmentExtendedAttributeInstance) { + try { + departmentExtendedAttributeInstance.delete(flush:true) + flash.message = "DepartmentExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "DepartmentExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + + if(!departmentExtendedAttributeInstance) { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ departmentExtendedAttributeInstance : departmentExtendedAttributeInstance ] + } + } + + def update = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + if(departmentExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(departmentExtendedAttributeInstance.version > version) { + + departmentExtendedAttributeInstance.errors.rejectValue("version", "departmentExtendedAttribute.optimistic.locking.failure", "Another user has updated this DepartmentExtendedAttribute while you were editing.") + render(view:'edit',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + return + } + } + departmentExtendedAttributeInstance.properties = params + if(!departmentExtendedAttributeInstance.hasErrors() && departmentExtendedAttributeInstance.save(flush: true)) { + flash.message = "DepartmentExtendedAttribute ${params.id} updated" + redirect(action:show,id:departmentExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + } + } + else { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def departmentExtendedAttributeInstance = new DepartmentExtendedAttribute() + departmentExtendedAttributeInstance.properties = params + return ['departmentExtendedAttributeInstance':departmentExtendedAttributeInstance] + } + + def save = { + def departmentExtendedAttributeInstance = new DepartmentExtendedAttribute(params) + if(!departmentExtendedAttributeInstance.hasErrors() && departmentExtendedAttributeInstance.save(flush: true)) { + flash.message = "DepartmentExtendedAttribute ${departmentExtendedAttributeInstance.id} created" + redirect(action:show,id:departmentExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + } + } +} Index: /trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy (revision 267) +++ /trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class AssetExtendedAttributeTypeController extends BaseAppAdminController { +class ExtendedAttributeTypeController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ assetExtendedAttributeTypeInstanceList: AssetExtendedAttributeType.list( params ), assetExtendedAttributeTypeInstanceTotal: AssetExtendedAttributeType.count() ] + [ extendedAttributeTypeInstanceList: ExtendedAttributeType.list( params ), extendedAttributeTypeInstanceTotal: ExtendedAttributeType.count() ] } def show = { - def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id ) + def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id ) - if(!assetExtendedAttributeTypeInstance) { - flash.message = "AssetExtendedAttributeType not found with id ${params.id}" + if(!extendedAttributeTypeInstance) { + flash.message = "ExtendedAttributeType not found with id ${params.id}" redirect(action:list) } - else { return [ assetExtendedAttributeTypeInstance : assetExtendedAttributeTypeInstance ] } + else { return [ extendedAttributeTypeInstance : extendedAttributeTypeInstance ] } } def delete = { - def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id ) - if(assetExtendedAttributeTypeInstance) { + def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id ) + if(extendedAttributeTypeInstance) { try { - assetExtendedAttributeTypeInstance.delete(flush:true) - flash.message = "AssetExtendedAttributeType ${params.id} deleted" + extendedAttributeTypeInstance.delete(flush:true) + flash.message = "ExtendedAttributeType ${params.id} deleted" redirect(action:list) } catch(org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "AssetExtendedAttributeType ${params.id} could not be deleted" + flash.message = "ExtendedAttributeType ${params.id} could not be deleted" redirect(action:show,id:params.id) } } else { - flash.message = "AssetExtendedAttributeType not found with id ${params.id}" + flash.message = "ExtendedAttributeType not found with id ${params.id}" redirect(action:list) } @@ -43,38 +43,38 @@ def edit = { - def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id ) + def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id ) - if(!assetExtendedAttributeTypeInstance) { - flash.message = "AssetExtendedAttributeType not found with id ${params.id}" + if(!extendedAttributeTypeInstance) { + flash.message = "ExtendedAttributeType not found with id ${params.id}" redirect(action:list) } else { - return [ assetExtendedAttributeTypeInstance : assetExtendedAttributeTypeInstance ] + return [ extendedAttributeTypeInstance : extendedAttributeTypeInstance ] } } def update = { - def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id ) - if(assetExtendedAttributeTypeInstance) { + def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id ) + if(extendedAttributeTypeInstance) { if(params.version) { def version = params.version.toLong() - if(assetExtendedAttributeTypeInstance.version > version) { + if(extendedAttributeTypeInstance.version > version) { - assetExtendedAttributeTypeInstance.errors.rejectValue("version", "assetExtendedAttributeType.optimistic.locking.failure", "Another user has updated this AssetExtendedAttributeType while you were editing.") - render(view:'edit',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance]) + extendedAttributeTypeInstance.errors.rejectValue("version", "extendedAttributeType.optimistic.locking.failure", "Another user has updated this ExtendedAttributeType while you were editing.") + render(view:'edit',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance]) return } } - assetExtendedAttributeTypeInstance.properties = params - if(!assetExtendedAttributeTypeInstance.hasErrors() && assetExtendedAttributeTypeInstance.save(flush: true)) { - flash.message = "AssetExtendedAttributeType ${params.id} updated" - redirect(action:show,id:assetExtendedAttributeTypeInstance.id) + extendedAttributeTypeInstance.properties = params + if(!extendedAttributeTypeInstance.hasErrors() && extendedAttributeTypeInstance.save(flush: true)) { + flash.message = "ExtendedAttributeType ${params.id} updated" + redirect(action:show,id:extendedAttributeTypeInstance.id) } else { - render(view:'edit',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance]) + render(view:'edit',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance]) } } else { - flash.message = "AssetExtendedAttributeType not found with id ${params.id}" + flash.message = "ExtendedAttributeType not found with id ${params.id}" redirect(action:list) } @@ -82,17 +82,17 @@ def create = { - def assetExtendedAttributeTypeInstance = new AssetExtendedAttributeType() - assetExtendedAttributeTypeInstance.properties = params - return ['assetExtendedAttributeTypeInstance':assetExtendedAttributeTypeInstance] + def extendedAttributeTypeInstance = new ExtendedAttributeType() + extendedAttributeTypeInstance.properties = params + return ['extendedAttributeTypeInstance':extendedAttributeTypeInstance] } def save = { - def assetExtendedAttributeTypeInstance = new AssetExtendedAttributeType(params) - if(!assetExtendedAttributeTypeInstance.hasErrors() && assetExtendedAttributeTypeInstance.save(flush: true)) { - flash.message = "AssetExtendedAttributeType ${assetExtendedAttributeTypeInstance.id} created" - redirect(action:show,id:assetExtendedAttributeTypeInstance.id) + def extendedAttributeTypeInstance = new ExtendedAttributeType(params) + if(!extendedAttributeTypeInstance.hasErrors() && extendedAttributeTypeInstance.save(flush: true)) { + flash.message = "ExtendedAttributeType ${extendedAttributeTypeInstance.id} created" + redirect(action:show,id:extendedAttributeTypeInstance.id) } else { - render(view:'create',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance]) + render(view:'create',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance]) } } Index: /trunk/grails-app/controllers/SectionController.groovy =================================================================== --- /trunk/grails-app/controllers/SectionController.groovy (revision 267) +++ /trunk/grails-app/controllers/SectionController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class SystemSectionController extends BaseAppAdminController { +class SectionController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ systemSectionInstanceList: SystemSection.list( params ), systemSectionInstanceTotal: SystemSection.count() ] + [ sectionInstanceList: Section.list( params ), sectionInstanceTotal: Section.count() ] } def show = { - def systemSectionInstance = SystemSection.get( params.id ) + def sectionInstance = Section.get( params.id ) - if(!systemSectionInstance) { - flash.message = "SystemSection not found with id ${params.id}" + if(!sectionInstance) { + flash.message = "Section not found with id ${params.id}" redirect(action:list) } - else { return [ systemSectionInstance : systemSectionInstance ] } + else { return [ sectionInstance : sectionInstance ] } } def delete = { - def systemSectionInstance = SystemSection.get( params.id ) - if(systemSectionInstance) { + def sectionInstance = Section.get( params.id ) + if(sectionInstance) { try { - systemSectionInstance.delete(flush:true) - flash.message = "SystemSection ${params.id} deleted" + sectionInstance.delete(flush:true) + flash.message = "Section ${params.id} deleted" redirect(action:list) } catch(org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "SystemSection ${params.id} could not be deleted" + flash.message = "Section ${params.id} could not be deleted" redirect(action:show,id:params.id) } } else { - flash.message = "SystemSection not found with id ${params.id}" + flash.message = "Section not found with id ${params.id}" redirect(action:list) } @@ -43,38 +43,38 @@ def edit = { - def systemSectionInstance = SystemSection.get( params.id ) + def sectionInstance = Section.get( params.id ) - if(!systemSectionInstance) { - flash.message = "SystemSection not found with id ${params.id}" + if(!sectionInstance) { + flash.message = "Section not found with id ${params.id}" redirect(action:list) } else { - return [ systemSectionInstance : systemSectionInstance ] + return [ sectionInstance : sectionInstance ] } } def update = { - def systemSectionInstance = SystemSection.get( params.id ) - if(systemSectionInstance) { + def sectionInstance = Section.get( params.id ) + if(sectionInstance) { if(params.version) { def version = params.version.toLong() - if(systemSectionInstance.version > version) { + if(sectionInstance.version > version) { - systemSectionInstance.errors.rejectValue("version", "systemSection.optimistic.locking.failure", "Another user has updated this SystemSection while you were editing.") - render(view:'edit',model:[systemSectionInstance:systemSectionInstance]) + sectionInstance.errors.rejectValue("version", "section.optimistic.locking.failure", "Another user has updated this Section while you were editing.") + render(view:'edit',model:[sectionInstance:sectionInstance]) return } } - systemSectionInstance.properties = params - if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) { - flash.message = "SystemSection ${params.id} updated" - redirect(action:show,id:systemSectionInstance.id) + sectionInstance.properties = params + if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) { + flash.message = "Section ${params.id} updated" + redirect(action:show,id:sectionInstance.id) } else { - render(view:'edit',model:[systemSectionInstance:systemSectionInstance]) + render(view:'edit',model:[sectionInstance:sectionInstance]) } } else { - flash.message = "SystemSection not found with id ${params.id}" + flash.message = "Section not found with id ${params.id}" redirect(action:list) } @@ -82,17 +82,17 @@ def create = { - def systemSectionInstance = new SystemSection() - systemSectionInstance.properties = params - return ['systemSectionInstance':systemSectionInstance] + def sectionInstance = new Section() + sectionInstance.properties = params + return ['sectionInstance':sectionInstance] } def save = { - def systemSectionInstance = new SystemSection(params) - if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) { - flash.message = "SystemSection ${systemSectionInstance.id} created" - redirect(action:show,id:systemSectionInstance.id) + def sectionInstance = new Section(params) + if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) { + flash.message = "Section ${sectionInstance.id} created" + redirect(action:show,id:sectionInstance.id) } else { - render(view:'create',model:[systemSectionInstance:systemSectionInstance]) + render(view:'create',model:[sectionInstance:sectionInstance]) } } Index: /trunk/grails-app/controllers/SectionDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SectionDetailedController.groovy (revision 267) +++ /trunk/grails-app/controllers/SectionDetailedController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class SystemSectionDetailedController extends BaseController { +class SectionDetailedController extends BaseController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ systemSectionInstanceList: SystemSection.list( params ), systemSectionInstanceTotal: SystemSection.count() ] + [ sectionInstanceList: Section.list( params ), sectionInstanceTotal: Section.count() ] } def show = { - def systemSectionInstance = SystemSection.get( params.id ) + def sectionInstance = Section.get( params.id ) - if(!systemSectionInstance) { - flash.message = "SystemSection not found with id ${params.id}" + if(!sectionInstance) { + flash.message = "Section not found with id ${params.id}" redirect(action:list) } - else { return [ systemSectionInstance : systemSectionInstance ] } + else { return [ sectionInstance : sectionInstance ] } } def delete = { - def systemSectionInstance = SystemSection.get( params.id ) - if(systemSectionInstance) { + def sectionInstance = Section.get( params.id ) + if(sectionInstance) { try { - systemSectionInstance.delete(flush:true) - flash.message = "SystemSection ${params.id} deleted" + sectionInstance.delete(flush:true) + flash.message = "Section ${params.id} deleted" redirect(action:list) } catch(org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "SystemSection ${params.id} could not be deleted" + flash.message = "Section ${params.id} could not be deleted" redirect(action:show,id:params.id) } } else { - flash.message = "SystemSection not found with id ${params.id}" + flash.message = "Section not found with id ${params.id}" redirect(action:list) } @@ -43,38 +43,38 @@ def edit = { - def systemSectionInstance = SystemSection.get( params.id ) + def sectionInstance = Section.get( params.id ) - if(!systemSectionInstance) { - flash.message = "SystemSection not found with id ${params.id}" + if(!sectionInstance) { + flash.message = "Section not found with id ${params.id}" redirect(action:list) } else { - return [ systemSectionInstance : systemSectionInstance ] + return [ sectionInstance : sectionInstance ] } } def update = { - def systemSectionInstance = SystemSection.get( params.id ) - if(systemSectionInstance) { + def sectionInstance = Section.get( params.id ) + if(sectionInstance) { if(params.version) { def version = params.version.toLong() - if(systemSectionInstance.version > version) { + if(sectionInstance.version > version) { - systemSectionInstance.errors.rejectValue("version", "systemSection.optimistic.locking.failure", "Another user has updated this SystemSection while you were editing.") - render(view:'edit',model:[systemSectionInstance:systemSectionInstance]) + sectionInstance.errors.rejectValue("version", "section.optimistic.locking.failure", "Another user has updated this Section while you were editing.") + render(view:'edit',model:[sectionInstance:sectionInstance]) return } } - systemSectionInstance.properties = params - if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) { - flash.message = "SystemSection ${params.id} updated" - redirect(action:show,id:systemSectionInstance.id) + sectionInstance.properties = params + if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) { + flash.message = "Section ${params.id} updated" + redirect(action:show,id:sectionInstance.id) } else { - render(view:'edit',model:[systemSectionInstance:systemSectionInstance]) + render(view:'edit',model:[sectionInstance:sectionInstance]) } } else { - flash.message = "SystemSection not found with id ${params.id}" + flash.message = "Section not found with id ${params.id}" redirect(action:list) } @@ -82,17 +82,17 @@ def create = { - def systemSectionInstance = new SystemSection() - systemSectionInstance.properties = params - return ['systemSectionInstance':systemSectionInstance] + def sectionInstance = new Section() + sectionInstance.properties = params + return ['sectionInstance':sectionInstance] } def save = { - def systemSectionInstance = new SystemSection(params) - if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) { - flash.message = "SystemSection ${systemSectionInstance.id} created" - redirect(action:show,id:systemSectionInstance.id) + def sectionInstance = new Section(params) + if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) { + flash.message = "Section ${sectionInstance.id} created" + redirect(action:show,id:sectionInstance.id) } else { - render(view:'create',model:[systemSectionInstance:systemSectionInstance]) + render(view:'create',model:[sectionInstance:sectionInstance]) } } Index: /trunk/grails-app/controllers/SectionExtendedAttributeController.groovy =================================================================== --- /trunk/grails-app/controllers/SectionExtendedAttributeController.groovy (revision 268) +++ /trunk/grails-app/controllers/SectionExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class SectionExtendedAttributeController extends BaseAppAdminController { + + 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'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ sectionExtendedAttributeInstanceList: SectionExtendedAttribute.list( params ), sectionExtendedAttributeInstanceTotal: SectionExtendedAttribute.count() ] + } + + def show = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + + if(!sectionExtendedAttributeInstance) { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ sectionExtendedAttributeInstance : sectionExtendedAttributeInstance ] } + } + + def delete = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + if(sectionExtendedAttributeInstance) { + try { + sectionExtendedAttributeInstance.delete(flush:true) + flash.message = "SectionExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "SectionExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + + if(!sectionExtendedAttributeInstance) { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ sectionExtendedAttributeInstance : sectionExtendedAttributeInstance ] + } + } + + def update = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + if(sectionExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(sectionExtendedAttributeInstance.version > version) { + + sectionExtendedAttributeInstance.errors.rejectValue("version", "sectionExtendedAttribute.optimistic.locking.failure", "Another user has updated this SectionExtendedAttribute while you were editing.") + render(view:'edit',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + return + } + } + sectionExtendedAttributeInstance.properties = params + if(!sectionExtendedAttributeInstance.hasErrors() && sectionExtendedAttributeInstance.save(flush: true)) { + flash.message = "SectionExtendedAttribute ${params.id} updated" + redirect(action:show,id:sectionExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + } + } + else { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def sectionExtendedAttributeInstance = new SectionExtendedAttribute() + sectionExtendedAttributeInstance.properties = params + return ['sectionExtendedAttributeInstance':sectionExtendedAttributeInstance] + } + + def save = { + def sectionExtendedAttributeInstance = new SectionExtendedAttribute(params) + if(!sectionExtendedAttributeInstance.hasErrors() && sectionExtendedAttributeInstance.save(flush: true)) { + flash.message = "SectionExtendedAttribute ${sectionExtendedAttributeInstance.id} created" + redirect(action:show,id:sectionExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + } + } +} Index: /trunk/grails-app/controllers/SiteExtendedAttributeController.groovy =================================================================== --- /trunk/grails-app/controllers/SiteExtendedAttributeController.groovy (revision 268) +++ /trunk/grails-app/controllers/SiteExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class SiteExtendedAttributeController extends BaseAppAdminController { + + 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'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ siteExtendedAttributeInstanceList: SiteExtendedAttribute.list( params ), siteExtendedAttributeInstanceTotal: SiteExtendedAttribute.count() ] + } + + def show = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + + if(!siteExtendedAttributeInstance) { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ siteExtendedAttributeInstance : siteExtendedAttributeInstance ] } + } + + def delete = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + if(siteExtendedAttributeInstance) { + try { + siteExtendedAttributeInstance.delete(flush:true) + flash.message = "SiteExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "SiteExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + + if(!siteExtendedAttributeInstance) { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ siteExtendedAttributeInstance : siteExtendedAttributeInstance ] + } + } + + def update = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + if(siteExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(siteExtendedAttributeInstance.version > version) { + + siteExtendedAttributeInstance.errors.rejectValue("version", "siteExtendedAttribute.optimistic.locking.failure", "Another user has updated this SiteExtendedAttribute while you were editing.") + render(view:'edit',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + return + } + } + siteExtendedAttributeInstance.properties = params + if(!siteExtendedAttributeInstance.hasErrors() && siteExtendedAttributeInstance.save(flush: true)) { + flash.message = "SiteExtendedAttribute ${params.id} updated" + redirect(action:show,id:siteExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + } + } + else { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def siteExtendedAttributeInstance = new SiteExtendedAttribute() + siteExtendedAttributeInstance.properties = params + return ['siteExtendedAttributeInstance':siteExtendedAttributeInstance] + } + + def save = { + def siteExtendedAttributeInstance = new SiteExtendedAttribute(params) + if(!siteExtendedAttributeInstance.hasErrors() && siteExtendedAttributeInstance.save(flush: true)) { + flash.message = "SiteExtendedAttribute ${siteExtendedAttributeInstance.id} created" + redirect(action:show,id:siteExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + } + } +} Index: /trunk/grails-app/domain/Asset.groovy =================================================================== --- /trunk/grails-app/domain/Asset.groovy (revision 267) +++ /trunk/grails-app/domain/Asset.groovy (revision 268) @@ -1,19 +1,21 @@ class Asset { - SystemSection systemSection - AssetType assetType + Section section String name String description = "" - String costCode = "" boolean isActive = true - static hasMany = [maintenanceActions: MaintenanceAction, + static hasMany = [assetSubItems: AssetSubItem, + maintenanceActions: MaintenanceAction, assetExtendedAttributes: AssetExtendedAttribute] - static belongsTo = [SystemSection, AssetType] + static belongsTo = [Section] static constraints = { - name(unique:true, blank:false) + name(maxSize:50, unique:true, blank:false) + description(maxSize:100) + isActive() + section() } Index: /trunk/grails-app/domain/AssetExtendedAttribute.groovy =================================================================== --- /trunk/grails-app/domain/AssetExtendedAttribute.groovy (revision 267) +++ /trunk/grails-app/domain/AssetExtendedAttribute.groovy (revision 268) @@ -1,6 +1,6 @@ class AssetExtendedAttribute { + ExtendedAttributeType extendedAttributeType Asset asset - AssetExtendedAttributeType assetExtendedAttributeType String value @@ -11,10 +11,11 @@ static belongsTo = [Asset] -// static constraints = { -// -// } + static constraints = { + value(maxSize:100) + isActive() + } String toString() { - "${assetExtendedAttributeType.name}: ${this.value}" + "${extendedAttributeType.name}: ${this.value}" } } Index: /trunk/grails-app/domain/AssetSubItem.groovy =================================================================== --- /trunk/grails-app/domain/AssetSubItem.groovy (revision 267) +++ /trunk/grails-app/domain/AssetSubItem.groovy (revision 268) @@ -1,18 +1,24 @@ -class AssetType { +class AssetSubItem { + + Asset asset + AssetSubItem parentItem String name String description = "" - String costCode = "" boolean isActive = true - static hasMany = [assets: Asset, - assemblies: Assembly, - maintenanceActions: MaintenanceAction] + static hasMany = [subItems: AssetSubItem, + maintenanceActions: MaintenanceAction, + assetSubItemExtendedAttributes: AssetSubItemExtendedAttribute] -// static belongsTo = [] + static belongsTo = [Asset, AssetSubItem] -// static constraints = { -// -// } + static constraints = { + name(maxSize:50, blank:false) + description(maxSize:100) + isActive() + asset(nullable:true) + parentItem(nullable:true) + } String toString() { Index: /trunk/grails-app/domain/AssetSubItemExtendedAttribute.groovy =================================================================== --- /trunk/grails-app/domain/AssetSubItemExtendedAttribute.groovy (revision 268) +++ /trunk/grails-app/domain/AssetSubItemExtendedAttribute.groovy (revision 268) @@ -0,0 +1,22 @@ +class AssetSubItemExtendedAttribute { + + ExtendedAttributeType extendedAttributeType + AssetSubItem assetSubItem + + String value + boolean isActive = true + +// static hasMany = [] + + static belongsTo = [AssetSubItem] + + static constraints = { + value(maxSize:100) + isActive() + } + + String toString() { + "${extendedAttributeType.name}: ${this.value}" + } +} + Index: /trunk/grails-app/domain/Department.groovy =================================================================== --- /trunk/grails-app/domain/Department.groovy (revision 267) +++ /trunk/grails-app/domain/Department.groovy (revision 268) @@ -3,15 +3,15 @@ String name String description = "" - String costCode = "" boolean isActive = true - static hasMany = [systemSections: SystemSection, persons: Person] + static hasMany = [sections: Section, + departmentExtendedAttributes: DepartmentExtendedAttribute, + persons: Person] // static belongsTo = [] static constraints = { - name() - description() - costCode() + name(maxSize:50, unique:true, blank:false) + description(maxSize:100) isActive() } Index: /trunk/grails-app/domain/DepartmentExtendedAttribute.groovy =================================================================== --- /trunk/grails-app/domain/DepartmentExtendedAttribute.groovy (revision 268) +++ /trunk/grails-app/domain/DepartmentExtendedAttribute.groovy (revision 268) @@ -0,0 +1,22 @@ +class DepartmentExtendedAttribute { + + ExtendedAttributeType extendedAttributeType + Department department + + String value + boolean isActive = true + +// static hasMany = [] + + static belongsTo = [Department] + + static constraints = { + value(maxSize:100) + isActive() + } + + String toString() { + "${extendedAttributeType.name}: ${this.value}" + } +} + Index: /trunk/grails-app/domain/ExtendedAttributeType.groovy =================================================================== --- /trunk/grails-app/domain/ExtendedAttributeType.groovy (revision 267) +++ /trunk/grails-app/domain/ExtendedAttributeType.groovy (revision 268) @@ -1,3 +1,3 @@ -class AssetExtendedAttributeType { +class ExtendedAttributeType { String name @@ -5,11 +5,13 @@ boolean isActive = true - static hasMany = [assetExtendedAttributes: AssetExtendedAttribute] +// static hasMany = [] // static belongsTo = [] -// static constraints = { -// -// } + static constraints = { + name(maxSize:50,unique:true,blank:false) + description(maxSize:100) + isActive() + } String toString() { Index: /trunk/grails-app/domain/MaintenanceAction.groovy =================================================================== --- /trunk/grails-app/domain/MaintenanceAction.groovy (revision 267) +++ /trunk/grails-app/domain/MaintenanceAction.groovy (revision 268) @@ -3,10 +3,7 @@ TaskProcedure taskProcedure MaintenancePolicy maintenancePolicy - SystemSection systemSection + Section section Asset asset - AssetType assetType - Assembly assembly - SubAssembly subAssembly - ComponentItem componentItem + AssetSubItem assetSubItem String description @@ -20,12 +17,12 @@ static constraints = { + section(nullable:true) + asset(nullable:true) + assetSubItem(nullable:true) maintenancePolicy(nullable:true) - systemSection(nullable:true) - asset(nullable:true) - assetType(nullable:true) - assembly(nullable:true) - subAssembly(nullable:true) - componentItem(nullable:true) procedureStepNumber(nullable:true) + description() + reasoning() + isActive() } Index: /trunk/grails-app/domain/MaintenancePolicy.groovy =================================================================== --- /trunk/grails-app/domain/MaintenancePolicy.groovy (revision 267) +++ /trunk/grails-app/domain/MaintenancePolicy.groovy (revision 268) @@ -5,10 +5,13 @@ boolean isActive = true - static hasMany = [maintenanceActions: MaintenanceAction] +// static hasMany = [maintenanceActions: MaintenanceAction] // static belongsTo = [] -// static constraints = { -// } + static constraints = { + name(maxSize:50, unique:true, blank:false) + description(maxSize:100) + isActive() + } String toString() { Index: /trunk/grails-app/domain/Section.groovy =================================================================== --- /trunk/grails-app/domain/Section.groovy (revision 268) +++ /trunk/grails-app/domain/Section.groovy (revision 268) @@ -0,0 +1,26 @@ +class Section { + + Site site + Department department + + String name + String description = "" + boolean isActive = true + + static hasMany = [assets: Asset, + maintenanceActions: MaintenanceAction, + sectionExtendedAttributes: SectionExtendedAttribute] + + static belongsTo = [Site] + + static constraints = { + name(maxSize:50, unique:true, blank:false) + description(maxSize:100) + isActive() + } + + String toString() { + "${this.name}" + } +} + Index: /trunk/grails-app/domain/SectionExtendedAttribute.groovy =================================================================== --- /trunk/grails-app/domain/SectionExtendedAttribute.groovy (revision 268) +++ /trunk/grails-app/domain/SectionExtendedAttribute.groovy (revision 268) @@ -0,0 +1,22 @@ +class SectionExtendedAttribute { + + ExtendedAttributeType extendedAttributeType + Section section + + String value + boolean isActive = true + +// static hasMany = [] + + static belongsTo = [Section] + + static constraints = { + value(maxSize:100) + isActive() + } + + String toString() { + "${extendedAttributeType.name}: ${this.value}" + } +} + Index: /trunk/grails-app/domain/Site.groovy =================================================================== --- /trunk/grails-app/domain/Site.groovy (revision 267) +++ /trunk/grails-app/domain/Site.groovy (revision 268) @@ -3,14 +3,16 @@ String name String description = "" - String costCode = "" Boolean isActive = true - static hasMany = [inventoryStores: InventoryStore, systemSections: SystemSection] +// static hasMany = [inventoryStores: InventoryStore, systemSections: SystemSection] + static hasMany = [sections: Section, + siteExtendedAttributes: SiteExtendedAttribute] // static belongsTo = [] static constraints = { - name(maxSize:50,unique:true,blank:false) + name(maxSize:50, unique:true, blank:false) description(maxSize:100) + isActive() } Index: /trunk/grails-app/domain/SiteExtendedAttribute.groovy =================================================================== --- /trunk/grails-app/domain/SiteExtendedAttribute.groovy (revision 268) +++ /trunk/grails-app/domain/SiteExtendedAttribute.groovy (revision 268) @@ -0,0 +1,22 @@ +class SiteExtendedAttribute { + + ExtendedAttributeType extendedAttributeType + Site site + + String value + boolean isActive = true + +// static hasMany = [] + + static belongsTo = [Site] + + static constraints = { + value(maxSize:100) + isActive() + } + + String toString() { + "${extendedAttributeType.name}: ${this.value}" + } +} + Index: unk/grails-app/domain/SystemSection.groovy =================================================================== --- /trunk/grails-app/domain/SystemSection.groovy (revision 267) +++ (revision ) @@ -1,23 +1,0 @@ -class SystemSection { - - Site site - Department department - - String name - String description = "" - String costCode = "" - boolean isActive = true - - static hasMany = [assets: Asset, maintenanceActions: MaintenanceAction] - - static belongsTo = [Site] - -// static constraints = { -// -// } - - String toString() { - "${this.name}" - } -} - Index: /trunk/grails-app/services/CreateDataService.groovy =================================================================== --- /trunk/grails-app/services/CreateDataService.groovy (revision 267) +++ /trunk/grails-app/services/CreateDataService.groovy (revision 268) @@ -60,4 +60,5 @@ createBaseSupplierType() createBaseManufacturerType() + createBaseExtenededAttributeTypes() // Tasks @@ -76,5 +77,4 @@ // Assets - createBaseAssetExtenededAttributeTypes() // Record that data has been created. @@ -128,9 +128,6 @@ createDemoTaskProcedure() createDemoMaintenanceActions() - createDemoSystemSections() - createDemoAssetTypes() - createDemoAssemblies() - createDemoSubAssemblies() - createDemoComponentItems() + createDemoSections() + createDemoAssetSubItems() createDemoAssets() createDemoAssetExtenedAttributes() @@ -993,164 +990,130 @@ } - def createDemoSystemSections() { - - //SystemSection - def systemSectionInstance - - //SystemSection #1 - systemSectionInstance = new SystemSection(name: "Press Section", + def createDemoSections() { + + //Section + def sectionInstance + + //Section #1 + sectionInstance = new Section(name: "Press Section", site: Site.get(1), department: Department.get(1)) - saveAndTest(systemSectionInstance) - - //SystemSection #2 - systemSectionInstance = new SystemSection(name: "RO System", + saveAndTest(sectionInstance) + + //Section #2 + sectionInstance = new Section(name: "RO System", site: Site.get(2), department: Department.get(2)) - saveAndTest(systemSectionInstance) - - //SystemSection #3 - systemSectionInstance = new SystemSection(name: "Auxilliray Section", + saveAndTest(sectionInstance) + + //Section #3 + sectionInstance = new Section(name: "Auxilliray Section", site: Site.get(1), department: Department.get(1)) - saveAndTest(systemSectionInstance) - } - - def createDemoAssetTypes() { - - //AssetType - def assetTypeInstance - - //AssetType #1 - assetTypeInstance = new AssetType(name: "Print Unit") - saveAndTest(assetTypeInstance) - - //AssetType #2 - assetTypeInstance = new AssetType(name: "Reactor Tower") - saveAndTest(assetTypeInstance) - } - - def createDemoAssemblies() { - - //Assembly - def assemblyInstance - - //Assembly #1 - assemblyInstance = new Assembly(name: "Print Couple", - assetType: AssetType.get(1)) - saveAndTest(assemblyInstance) -// assemblyInstance.addToMaintenanceActions(MaintenanceAction.get(1)) - - //Assembly #2 - assemblyInstance = new Assembly(name: "Agitator", - assetType: AssetType.get(2)) - saveAndTest(assemblyInstance) - } - - def createDemoSubAssemblies() { - - //SubAssembly - def subAssemblyInstance - - //SubAssembly #1 - subAssemblyInstance = new SubAssembly(name: "Cylinder", - assembly: Assembly.get(1)) - saveAndTest(subAssemblyInstance) - - //SubAssembly #2 - subAssemblyInstance = new SubAssembly(name: "Gearmotor", - assembly: Assembly.get(2)) - saveAndTest(subAssemblyInstance) - } - - def createDemoComponentItems() { - - //ComponentItem - def componentItemInstance - - //ComponentItem #1 - componentItemInstance = new ComponentItem(name: "Bearing", - subAssembly: SubAssembly.get(1)) - saveAndTest(componentItemInstance) - - //ComponentItem #2 - componentItemInstance = new ComponentItem(name: "Drive shaft oil seal", - subAssembly: SubAssembly.get(2)) - saveAndTest(componentItemInstance) + saveAndTest(sectionInstance) + } + + def createDemoAssetSubItems() { + +// //AssetSubItem +// def assetSubItemInstance +// +// //AssetSubItem #1 +// assetSubItemInstance = new AssetSubItem(name: "Print Unit") +// saveAndTest(assetSubItemInstance) +// +// //AssetSubItem #2 +// assetSubItemInstance = new AssetSubItem(name: "Reactor Tower") +// saveAndTest(assetSubItemInstance) } def createDemoAssets() { - //Asset - def assetInstance - - //Asset #1 - assetInstance = new Asset(name: "Print Unit 22", - assetType: AssetType.get(1), - systemSection: SystemSection.get(1)) - saveAndTest(assetInstance) -// assetInstance.addToMaintenanceActions(MaintenanceAction.get(1)) - - //Asset #2 - assetInstance = new Asset(name: "Print Unit 21", - assetType: AssetType.get(1), - systemSection: SystemSection.get(1)) - saveAndTest(assetInstance) - - //Asset #3 - assetInstance = new Asset(name: "Print Unit 23", - assetType: AssetType.get(1), - systemSection: SystemSection.get(1)) - saveAndTest(assetInstance) - - //Asset #4 - assetInstance = new Asset(name: "RO 1", - assetType: AssetType.get(2), - systemSection: SystemSection.get(2)) - saveAndTest(assetInstance) - } - - def createBaseAssetExtenededAttributeTypes() { - - //AssetExtendedAttributeType - def assetExtendedAttributeInstanceType - - //AssetExtendedAttributeType #1 - assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Model Number") - saveAndTest(assetExtendedAttributeInstanceType) - - //AssetExtendedAttributeType #2 - assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Purchase Cost") - saveAndTest(assetExtendedAttributeInstanceType) - - //AssetExtendedAttributeType #3 - assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Serial Number") - saveAndTest(assetExtendedAttributeInstanceType) - - //AssetExtendedAttributeType #4 - assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Manufactured Date") - saveAndTest(assetExtendedAttributeInstanceType) - - //AssetExtendedAttributeType #5 - assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Location Description") - saveAndTest(assetExtendedAttributeInstanceType) +// //Asset +// def assetInstance +// +// //Asset #1 +// assetInstance = new Asset(name: "Print Unit 22", +// section: Section.get(1)) +// saveAndTest(assetInstance) +// // assetInstance.addToMaintenanceActions(MaintenanceAction.get(1)) +// +// //Asset #2 +// assetInstance = new Asset(name: "Print Unit 21", +// assetSubItem: AssetSubItem.get(1), +// section: Section.get(1)) +// saveAndTest(assetInstance) +// +// //Asset #3 +// assetInstance = new Asset(name: "Print Unit 23", +// assetSubItem: AssetSubItem.get(1), +// section: Section.get(1)) +// saveAndTest(assetInstance) +// +// //Asset #4 +// assetInstance = new Asset(name: "RO 1", +// assetSubItem: AssetSubItem.get(2), +// section: Section.get(2)) +// saveAndTest(assetInstance) + } + + def createBaseExtenededAttributeTypes() { + + //ExtendedAttributeType + def extendedAttributeTypeInstance + + //ExtendedAttributeType #1 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Model Number") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #2 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Purchase Cost") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #3 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Serial Number") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #4 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufactured Date") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #5 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Location Description") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #6 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Centre") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #7 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Code") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #8 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufacturer's Number") + saveAndTest(extendedAttributeTypeInstance) + + //ExtendedAttributeType #9 + extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Inventory Number") + saveAndTest(extendedAttributeTypeInstance) } def createDemoAssetExtenedAttributes() { - //AssetExtendedAttribute - def assetExtendedAttributeInstance - - //AssetExtendedAttribute #1 - assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2", - asset: Asset.get(1), - assetExtendedAttributeType: AssetExtendedAttributeType.get(1)) - saveAndTest(assetExtendedAttributeInstance) - - //AssetExtendedAttribute #2 - assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5", - asset: Asset.get(1), - assetExtendedAttributeType: AssetExtendedAttributeType.get(5)) - saveAndTest(assetExtendedAttributeInstance) +// //AssetExtendedAttribute +// def assetExtendedAttributeInstance +// +// //AssetExtendedAttribute #1 +// assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2", +// asset: Asset.get(1), +// assetExtendedAttributeType: ExtendedAttributeType.get(1)) +// saveAndTest(assetExtendedAttributeInstance) +// +// //AssetExtendedAttribute #2 +// assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5", +// asset: Asset.get(1), +// assetExtendedAttributeType: ExtendedAttributeType.get(5)) +// saveAndTest(assetExtendedAttributeInstance) } Index: /trunk/grails-app/views/asset/create.gsp =================================================================== --- /trunk/grails-app/views/asset/create.gsp (revision 267) +++ /trunk/grails-app/views/asset/create.gsp (revision 268) @@ -31,23 +31,5 @@ - - - - - - - - - - - - - - - - - - - + @@ -58,5 +40,5 @@ - + @@ -73,8 +55,8 @@ - + - - + + Index: /trunk/grails-app/views/asset/edit.gsp =================================================================== --- /trunk/grails-app/views/asset/edit.gsp (revision 267) +++ /trunk/grails-app/views/asset/edit.gsp (revision 268) @@ -34,5 +34,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,35 +83,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +Add AssetSubItem + @@ -106,13 +113,4 @@ - - - - - - - - - Index: /trunk/grails-app/views/asset/list.gsp =================================================================== --- /trunk/grails-app/views/asset/list.gsp (revision 267) +++ /trunk/grails-app/views/asset/list.gsp (revision 268) @@ -25,12 +25,10 @@ - Asset Type - - - + Section + @@ -43,11 +41,9 @@ ${fieldValue(bean:assetInstance, field:'name')} - ${fieldValue(bean:assetInstance, field:'assetType')} - - ${fieldValue(bean:assetInstance, field:'costCode')} - ${fieldValue(bean:assetInstance, field:'description')} ${fieldValue(bean:assetInstance, field:'isActive')} + + ${fieldValue(bean:assetInstance, field:'section')} Index: /trunk/grails-app/views/asset/show.gsp =================================================================== --- /trunk/grails-app/views/asset/show.gsp (revision 267) +++ /trunk/grails-app/views/asset/show.gsp (revision 268) @@ -37,4 +37,25 @@ + Description: + + ${fieldValue(bean:assetInstance, field:'description')} + + + + + Is Active: + + ${fieldValue(bean:assetInstance, field:'isActive')} + + + + + Section: + + ${assetInstance?.section?.encodeAsHTML()} + + + + Asset Extended Attributes: @@ -50,28 +71,13 @@ - Asset Type: + Asset Sub Item: - ${assetInstance?.assetType?.encodeAsHTML()} - - - - - Cost Code: - - ${fieldValue(bean:assetInstance, field:'costCode')} - - - - - Description: - - ${fieldValue(bean:assetInstance, field:'description')} - - - - - Is Active: - - ${fieldValue(bean:assetInstance, field:'isActive')} + +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+ @@ -90,11 +96,4 @@ - - System Section: - - ${assetInstance?.systemSection?.encodeAsHTML()} - - - Index: /trunk/grails-app/views/assetExtendedAttribute/create.gsp =================================================================== --- /trunk/grails-app/views/assetExtendedAttribute/create.gsp (revision 267) +++ /trunk/grails-app/views/assetExtendedAttribute/create.gsp (revision 268) @@ -28,17 +28,8 @@ - + - - - - - - - - - - - + + @@ -55,8 +46,17 @@ - + - - + + + + + + + + + + + Index: /trunk/grails-app/views/assetExtendedAttribute/edit.gsp =================================================================== --- /trunk/grails-app/views/assetExtendedAttribute/edit.gsp (revision 267) +++ /trunk/grails-app/views/assetExtendedAttribute/edit.gsp (revision 268) @@ -31,17 +31,8 @@ - + - - - - - - - - - - - + + @@ -58,8 +49,17 @@ - + - - + + + + + + + + + + + Index: /trunk/grails-app/views/assetExtendedAttribute/list.gsp =================================================================== --- /trunk/grails-app/views/assetExtendedAttribute/list.gsp (revision 267) +++ /trunk/grails-app/views/assetExtendedAttribute/list.gsp (revision 268) @@ -23,12 +23,12 @@ + + + + Asset - Asset Extended Attribute Type + Extended Attribute Type - - - - @@ -39,11 +39,11 @@ ${fieldValue(bean:assetExtendedAttributeInstance, field:'id')} - ${fieldValue(bean:assetExtendedAttributeInstance, field:'asset')} - - ${fieldValue(bean:assetExtendedAttributeInstance, field:'assetExtendedAttributeType')} + ${fieldValue(bean:assetExtendedAttributeInstance, field:'value')} ${fieldValue(bean:assetExtendedAttributeInstance, field:'isActive')} - ${fieldValue(bean:assetExtendedAttributeInstance, field:'value')} + ${fieldValue(bean:assetExtendedAttributeInstance, field:'asset')} + + ${fieldValue(bean:assetExtendedAttributeInstance, field:'extendedAttributeType')} Index: /trunk/grails-app/views/assetExtendedAttribute/show.gsp =================================================================== --- /trunk/grails-app/views/assetExtendedAttribute/show.gsp (revision 267) +++ /trunk/grails-app/views/assetExtendedAttribute/show.gsp (revision 268) @@ -30,14 +30,7 @@ - Asset: + Value: - ${assetExtendedAttributeInstance?.asset?.encodeAsHTML()} - - - - - Asset Extended Attribute Type: - - ${assetExtendedAttributeInstance?.assetExtendedAttributeType?.encodeAsHTML()} + ${fieldValue(bean:assetExtendedAttributeInstance, field:'value')} @@ -51,7 +44,14 @@ - Value: + Asset: - ${fieldValue(bean:assetExtendedAttributeInstance, field:'value')} + ${assetExtendedAttributeInstance?.asset?.encodeAsHTML()} + + + + + Extended Attribute Type: + + ${assetExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()} Index: /trunk/grails-app/views/assetSubItem/create.gsp =================================================================== --- /trunk/grails-app/views/assetSubItem/create.gsp (revision 267) +++ /trunk/grails-app/views/assetSubItem/create.gsp (revision 268) @@ -5,18 +5,18 @@ - Create AssetType + Create AssetSubItem
- AssetType List + AssetSubItem List
-

Create AssetType

+

Create AssetSubItem

${flash.message}
 - +
- +
@@ -28,8 +28,8 @@ - + - - + + @@ -39,6 +39,6 @@ - - + + @@ -48,6 +48,6 @@ - - + + @@ -55,8 +55,17 @@ - + - - + + + + + + + + + + + Index: /trunk/grails-app/views/assetSubItem/edit.gsp =================================================================== --- /trunk/grails-app/views/assetSubItem/edit.gsp (revision 267) +++ /trunk/grails-app/views/assetSubItem/edit.gsp (revision 268) @@ -5,24 +5,24 @@ - Edit AssetType + Edit AssetSubItem
- AssetType List - New AssetType + AssetSubItem List + New AssetSubItem
-

Edit AssetType

+

Edit AssetSubItem

${flash.message}
 - +
- +
- - + +
@@ -31,40 +31,8 @@ - - - - - - - - - - - @@ -74,6 +42,6 @@ - @@ -83,6 +51,40 @@ - + + + + + + + + + + + + + + + @@ -92,12 +94,12 @@ - @@ -106,8 +108,15 @@ - Index: /trunk/grails-app/views/assetSubItem/list.gsp =================================================================== --- /trunk/grails-app/views/assetSubItem/list.gsp (revision 267) +++ /trunk/grails-app/views/assetSubItem/list.gsp (revision 268) @@ -5,12 +5,12 @@ - AssetType List + AssetSubItem List
- New AssetType + New AssetSubItem
-

AssetType List

+

AssetSubItem List

${flash.message}
@@ -23,5 +23,5 @@ - + @@ -29,21 +29,25 @@ - - +
+ + + - + - + - + - + - + - + + + @@ -53,5 +57,5 @@
- +
Index: /trunk/grails-app/views/assetSubItem/show.gsp =================================================================== --- /trunk/grails-app/views/assetSubItem/show.gsp (revision 267) +++ /trunk/grails-app/views/assetSubItem/show.gsp (revision 268) @@ -5,13 +5,13 @@ - Show AssetType + Show AssetSubItem
- AssetType List - New AssetType + AssetSubItem List + New AssetSubItem
-

Show AssetType

+

Show AssetSubItem

${flash.message}
@@ -25,38 +25,12 @@
- + - + - - - - - - - - - - - - - - - + @@ -65,5 +39,5 @@ - + @@ -72,5 +46,32 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -81,5 +82,5 @@ - + - + @@ -101,5 +108,5 @@
- + Index: /trunk/grails-app/views/assetSubItemExtendedAttribute/create.gsp =================================================================== --- /trunk/grails-app/views/assetSubItemExtendedAttribute/create.gsp (revision 268) +++ /trunk/grails-app/views/assetSubItemExtendedAttribute/create.gsp (revision 268) @@ -0,0 +1,73 @@ + + + + + + + Create AssetSubItemExtendedAttribute + + +
+ AssetSubItemExtendedAttribute List +
+
+

Create AssetSubItemExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + +
+
- + - -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add Assembly - -
- - - -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add Asset - -
- - - + +
- + +
- + + +
+ + + +
+ + + +
+ + + +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+Add AssetSubItemExtendedAttribute +
+
    - +
  • ${m?.encodeAsHTML()}
    •
-Add MaintenanceAction +Add MaintenanceAction
- + - + + +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+Add AssetSubItem +
AssetParent Item
${fieldValue(bean:assetTypeInstance, field:'id')}${fieldValue(bean:assetSubItemInstance, field:'id')}${fieldValue(bean:assetTypeInstance, field:'costCode')}${fieldValue(bean:assetSubItemInstance, field:'name')}${fieldValue(bean:assetTypeInstance, field:'description')}${fieldValue(bean:assetSubItemInstance, field:'description')}${fieldValue(bean:assetTypeInstance, field:'isActive')}${fieldValue(bean:assetSubItemInstance, field:'isActive')}${fieldValue(bean:assetTypeInstance, field:'name')}${fieldValue(bean:assetSubItemInstance, field:'asset')}${fieldValue(bean:assetSubItemInstance, field:'parentItem')}
Id:${fieldValue(bean:assetTypeInstance, field:'id')}${fieldValue(bean:assetSubItemInstance, field:'id')}
Assemblies:Name: -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-
Assets: -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-
Cost Code:${fieldValue(bean:assetTypeInstance, field:'costCode')}${fieldValue(bean:assetSubItemInstance, field:'name')}
Description:${fieldValue(bean:assetTypeInstance, field:'description')}${fieldValue(bean:assetSubItemInstance, field:'description')}
Is Active:${fieldValue(bean:assetTypeInstance, field:'isActive')}${fieldValue(bean:assetSubItemInstance, field:'isActive')}
Asset:${assetSubItemInstance?.asset?.encodeAsHTML()}
Parent Item:${assetSubItemInstance?.parentItem?.encodeAsHTML()}
Asset Sub Item Extended Attributes: +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+
    - +
  • ${m?.encodeAsHTML()}
    •  @@ -90,7 +91,13 @@
Name:Sub Items:${fieldValue(bean:assetTypeInstance, field:'name')} +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/assetSubItemExtendedAttribute/edit.gsp =================================================================== --- /trunk/grails-app/views/assetSubItemExtendedAttribute/edit.gsp (revision 268) +++ /trunk/grails-app/views/assetSubItemExtendedAttribute/edit.gsp (revision 268) @@ -0,0 +1,77 @@ + + + + + + + Edit AssetSubItemExtendedAttribute + + +
+ AssetSubItemExtendedAttribute List + New AssetSubItemExtendedAttribute +
+
+

Edit AssetSubItemExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ +
+ + Index: /trunk/grails-app/views/assetSubItemExtendedAttribute/list.gsp =================================================================== --- /trunk/grails-app/views/assetSubItemExtendedAttribute/list.gsp (revision 268) +++ /trunk/grails-app/views/assetSubItemExtendedAttribute/list.gsp (revision 268) @@ -0,0 +1,59 @@ + + + + + + + AssetSubItemExtendedAttribute List + + +
+ New AssetSubItemExtendedAttribute +
+
+

AssetSubItemExtendedAttribute List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Asset Sub ItemExtended Attribute Type
${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'id')}${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'value')}${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'isActive')}${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'assetSubItem')}${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'extendedAttributeType')}
+
+
+ +
+
+ + Index: /trunk/grails-app/views/assetSubItemExtendedAttribute/show.gsp =================================================================== --- /trunk/grails-app/views/assetSubItemExtendedAttribute/show.gsp (revision 268) +++ /trunk/grails-app/views/assetSubItemExtendedAttribute/show.gsp (revision 268) @@ -0,0 +1,71 @@ + + + + + + + Show AssetSubItemExtendedAttribute + + +
+ AssetSubItemExtendedAttribute List + New AssetSubItemExtendedAttribute +
+
+

Show AssetSubItemExtendedAttribute

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'id')}
Value:${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'value')}
Is Active:${fieldValue(bean:assetSubItemExtendedAttributeInstance, field:'isActive')}
Asset Sub Item:${assetSubItemExtendedAttributeInstance?.assetSubItem?.encodeAsHTML()}
Extended Attribute Type:${assetSubItemExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()}
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/department/create.gsp =================================================================== --- /trunk/grails-app/views/department/create.gsp (revision 267) +++ /trunk/grails-app/views/department/create.gsp (revision 268) @@ -31,5 +31,5 @@ - + @@ -40,14 +40,5 @@ - - - - - - - - - - + Index: /trunk/grails-app/views/department/edit.gsp =================================================================== --- /trunk/grails-app/views/department/edit.gsp (revision 267) +++ /trunk/grails-app/views/department/edit.gsp (revision 268) @@ -34,5 +34,5 @@ - + @@ -43,14 +43,5 @@ - - - - - - - - - - + @@ -67,14 +58,14 @@ - + - +
    - -
  • ${p?.encodeAsHTML()}
    • + +
  • ${d?.encodeAsHTML()}
    •
-Add Person +Add DepartmentExtendedAttribute @@ -83,14 +74,14 @@ - + - +
    - -
  • ${s?.encodeAsHTML()}
    • + +
  • ${s?.encodeAsHTML()}
    •
-Add SystemSection +Add Section Index: /trunk/grails-app/views/department/list.gsp =================================================================== --- /trunk/grails-app/views/department/list.gsp (revision 267) +++ /trunk/grails-app/views/department/list.gsp (revision 268) @@ -27,6 +27,4 @@ - - @@ -43,6 +41,4 @@ ${fieldValue(bean:departmentInstance, field:'description')} - ${fieldValue(bean:departmentInstance, field:'costCode')} - ${fieldValue(bean:departmentInstance, field:'isActive')} Index: /trunk/grails-app/views/department/show.gsp =================================================================== --- /trunk/grails-app/views/department/show.gsp (revision 267) +++ /trunk/grails-app/views/department/show.gsp (revision 268) @@ -44,11 +44,4 @@ - Cost Code: - - ${fieldValue(bean:departmentInstance, field:'costCode')} - - - - Is Active: @@ -58,10 +51,10 @@ - Persons: + Department Extended Attributes:
    - -
  • ${p?.encodeAsHTML()}
    • + +
  • ${d?.encodeAsHTML()}
    •
@@ -71,10 +64,10 @@ - System Sections: + Sections:
    - -
  • ${s?.encodeAsHTML()}
    • + +
  • ${s?.encodeAsHTML()}
    •
Index: /trunk/grails-app/views/departmentExtendedAttribute/create.gsp =================================================================== --- /trunk/grails-app/views/departmentExtendedAttribute/create.gsp (revision 268) +++ /trunk/grails-app/views/departmentExtendedAttribute/create.gsp (revision 268) @@ -0,0 +1,73 @@ + + + + + + + Create DepartmentExtendedAttribute + + +
+ DepartmentExtendedAttribute List +
+
+

Create DepartmentExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/departmentExtendedAttribute/edit.gsp =================================================================== --- /trunk/grails-app/views/departmentExtendedAttribute/edit.gsp (revision 268) +++ /trunk/grails-app/views/departmentExtendedAttribute/edit.gsp (revision 268) @@ -0,0 +1,77 @@ + + + + + + + Edit DepartmentExtendedAttribute + + +
+ DepartmentExtendedAttribute List + New DepartmentExtendedAttribute +
+
+

Edit DepartmentExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ +
+ + Index: /trunk/grails-app/views/departmentExtendedAttribute/list.gsp =================================================================== --- /trunk/grails-app/views/departmentExtendedAttribute/list.gsp (revision 268) +++ /trunk/grails-app/views/departmentExtendedAttribute/list.gsp (revision 268) @@ -0,0 +1,59 @@ + + + + + + + DepartmentExtendedAttribute List + + +
+ New DepartmentExtendedAttribute +
+
+

DepartmentExtendedAttribute List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DepartmentExtended Attribute Type
${fieldValue(bean:departmentExtendedAttributeInstance, field:'id')}${fieldValue(bean:departmentExtendedAttributeInstance, field:'value')}${fieldValue(bean:departmentExtendedAttributeInstance, field:'isActive')}${fieldValue(bean:departmentExtendedAttributeInstance, field:'department')}${fieldValue(bean:departmentExtendedAttributeInstance, field:'extendedAttributeType')}
+
+
+ +
+
+ + Index: /trunk/grails-app/views/departmentExtendedAttribute/show.gsp =================================================================== --- /trunk/grails-app/views/departmentExtendedAttribute/show.gsp (revision 268) +++ /trunk/grails-app/views/departmentExtendedAttribute/show.gsp (revision 268) @@ -0,0 +1,71 @@ + + + + + + + Show DepartmentExtendedAttribute + + +
+ DepartmentExtendedAttribute List + New DepartmentExtendedAttribute +
+
+

Show DepartmentExtendedAttribute

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:departmentExtendedAttributeInstance, field:'id')}
Value:${fieldValue(bean:departmentExtendedAttributeInstance, field:'value')}
Is Active:${fieldValue(bean:departmentExtendedAttributeInstance, field:'isActive')}
Department:${departmentExtendedAttributeInstance?.department?.encodeAsHTML()}
Extended Attribute Type:${departmentExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()}
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/extendedAttributeType/create.gsp =================================================================== --- /trunk/grails-app/views/extendedAttributeType/create.gsp (revision 267) +++ /trunk/grails-app/views/extendedAttributeType/create.gsp (revision 268) @@ -5,18 +5,18 @@ - Create AssetExtendedAttributeType + Create ExtendedAttributeType
- AssetExtendedAttributeType List + ExtendedAttributeType List
-

Create AssetExtendedAttributeType

+

Create ExtendedAttributeType

${flash.message}
 - +
- +
@@ -28,8 +28,17 @@ + + + + + + + + + - - + + @@ -39,15 +48,6 @@ - - - - - - - - - - - + + Index: /trunk/grails-app/views/extendedAttributeType/edit.gsp =================================================================== --- /trunk/grails-app/views/extendedAttributeType/edit.gsp (revision 267) +++ /trunk/grails-app/views/extendedAttributeType/edit.gsp (revision 268) @@ -5,24 +5,24 @@ - Edit AssetExtendedAttributeType + Edit ExtendedAttributeType
- AssetExtendedAttributeType List - New AssetExtendedAttributeType + ExtendedAttributeType List + New ExtendedAttributeType
-

Edit AssetExtendedAttributeType

+

Edit ExtendedAttributeType

${flash.message}
 - +
- +
- - + +
@@ -31,15 +31,8 @@ - @@ -49,6 +42,6 @@ - @@ -58,15 +51,6 @@ - - - - - - Index: /trunk/grails-app/views/extendedAttributeType/list.gsp =================================================================== --- /trunk/grails-app/views/extendedAttributeType/list.gsp (revision 267) +++ /trunk/grails-app/views/extendedAttributeType/list.gsp (revision 268) @@ -5,12 +5,12 @@ - AssetExtendedAttributeType List + ExtendedAttributeType List
- New AssetExtendedAttributeType + New ExtendedAttributeType
-

AssetExtendedAttributeType List

+

ExtendedAttributeType List

${flash.message}
@@ -23,23 +23,23 @@ + + - -
- + - + - + - + - + @@ -49,5 +49,5 @@
- +
Index: /trunk/grails-app/views/extendedAttributeType/show.gsp =================================================================== --- /trunk/grails-app/views/extendedAttributeType/show.gsp (revision 267) +++ /trunk/grails-app/views/extendedAttributeType/show.gsp (revision 268) @@ -5,13 +5,13 @@ - Show AssetExtendedAttributeType + Show ExtendedAttributeType
- AssetExtendedAttributeType List - New AssetExtendedAttributeType + ExtendedAttributeType List + New ExtendedAttributeType
-

Show AssetExtendedAttributeType

+

Show ExtendedAttributeType

${flash.message}
@@ -25,18 +25,12 @@
- + - + - + @@ -45,5 +39,5 @@ - + @@ -52,12 +46,5 @@ - - - - - - - - + @@ -68,5 +55,5 @@
- + Index: /trunk/grails-app/views/maintenanceAction/create.gsp =================================================================== --- /trunk/grails-app/views/maintenanceAction/create.gsp (revision 267) +++ /trunk/grails-app/views/maintenanceAction/create.gsp (revision 268) @@ -28,17 +28,8 @@
- - - - - - @@ -55,8 +46,8 @@ - @@ -64,26 +55,8 @@ - - - - - - - - - - - @@ -109,8 +82,8 @@ - @@ -118,8 +91,8 @@ - Index: /trunk/grails-app/views/maintenanceAction/edit.gsp =================================================================== --- /trunk/grails-app/views/maintenanceAction/edit.gsp (revision 267) +++ /trunk/grails-app/views/maintenanceAction/edit.gsp (revision 268) @@ -31,17 +31,8 @@ - - - - - - @@ -58,8 +49,8 @@ - @@ -67,26 +58,8 @@ - - - - - - - - - - - @@ -112,8 +85,8 @@ - @@ -121,8 +94,8 @@ - Index: /trunk/grails-app/views/maintenanceAction/list.gsp =================================================================== --- /trunk/grails-app/views/maintenanceAction/list.gsp (revision 267) +++ /trunk/grails-app/views/maintenanceAction/list.gsp (revision 268) @@ -23,14 +23,14 @@ - - - + - + - + + + @@ -41,13 +41,13 @@ - - - + - + - + + + Index: /trunk/grails-app/views/maintenanceAction/show.gsp =================================================================== --- /trunk/grails-app/views/maintenanceAction/show.gsp (revision 267) +++ /trunk/grails-app/views/maintenanceAction/show.gsp (revision 268) @@ -30,14 +30,7 @@ - + - - - - - - - - + @@ -51,28 +44,14 @@ - + - + - + - - - - - - - - - - - - - - - + @@ -93,14 +72,14 @@ - + - + - + - + Index: /trunk/grails-app/views/maintenancePolicy/create.gsp =================================================================== --- /trunk/grails-app/views/maintenancePolicy/create.gsp (revision 267) +++ /trunk/grails-app/views/maintenancePolicy/create.gsp (revision 268) @@ -28,8 +28,17 @@ + + + + + @@ -41,13 +50,4 @@ - - - - - Index: /trunk/grails-app/views/maintenancePolicy/edit.gsp =================================================================== --- /trunk/grails-app/views/maintenancePolicy/edit.gsp (revision 267) +++ /trunk/grails-app/views/maintenancePolicy/edit.gsp (revision 268) @@ -31,8 +31,17 @@ + + + + + @@ -63,13 +72,4 @@ - - - - -
- + - -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add AssetExtendedAttribute - + 		+
- + +
- -
- - - + +
${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'id')}${fieldValue(bean:extendedAttributeTypeInstance, field:'id')}${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'description')}${fieldValue(bean:extendedAttributeTypeInstance, field:'name')}${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'isActive')}${fieldValue(bean:extendedAttributeTypeInstance, field:'description')}${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'name')}${fieldValue(bean:extendedAttributeTypeInstance, field:'isActive')}
Id:${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'id')}${fieldValue(bean:extendedAttributeTypeInstance, field:'id')}
Asset Extended Attributes:Name: -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
- 		${fieldValue(bean:extendedAttributeTypeInstance, field:'name')}
Description:${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'description')}${fieldValue(bean:extendedAttributeTypeInstance, field:'description')}
Is Active:${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'isActive')}
Name:${fieldValue(bean:assetExtendedAttributeTypeInstance, field:'name')}${fieldValue(bean:extendedAttributeTypeInstance, field:'isActive')}
- + - -
- - - + +
- + - + +
- + - -
- - - -
- - - + +
- + - + +
- + - + +
- + - -
- - - + +
- + - + +
- + - -
- - - -
- - - + +
- + - + +
- + - + +
Maintenance PolicySystem SectionSection AssetAsset TypeAsset Sub ItemAssemblyMaintenance Policy
${fieldValue(bean:maintenanceActionInstance, field:'id')}${fieldValue(bean:maintenanceActionInstance, field:'maintenancePolicy')}${fieldValue(bean:maintenanceActionInstance, field:'systemSection')}${fieldValue(bean:maintenanceActionInstance, field:'section')} ${fieldValue(bean:maintenanceActionInstance, field:'asset')}${fieldValue(bean:maintenanceActionInstance, field:'assetType')}${fieldValue(bean:maintenanceActionInstance, field:'assetSubItem')}${fieldValue(bean:maintenanceActionInstance, field:'assembly')}${fieldValue(bean:maintenanceActionInstance, field:'maintenancePolicy')}${fieldValue(bean:maintenanceActionInstance, field:'procedureStepNumber')}
Maintenance Policy:Section:${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()}
System Section:${maintenanceActionInstance?.systemSection?.encodeAsHTML()}${maintenanceActionInstance?.section?.encodeAsHTML()}
Asset Type:Asset Sub Item:${maintenanceActionInstance?.assetType?.encodeAsHTML()}${maintenanceActionInstance?.assetSubItem?.encodeAsHTML()}
Assembly:Maintenance Policy:${maintenanceActionInstance?.assembly?.encodeAsHTML()}
Sub Assembly:${maintenanceActionInstance?.subAssembly?.encodeAsHTML()}
Component Item:${maintenanceActionInstance?.componentItem?.encodeAsHTML()}${maintenanceActionInstance?.maintenancePolicy?.encodeAsHTML()}
Is Active:Reasoning:${fieldValue(bean:maintenanceActionInstance, field:'isActive')}${fieldValue(bean:maintenanceActionInstance, field:'reasoning')}
Reasoning:Is Active:${fieldValue(bean:maintenanceActionInstance, field:'reasoning')}${fieldValue(bean:maintenanceActionInstance, field:'isActive')}
+ + + +
- +
-
- - -
+ + + +
- +
- - - -
Index: /trunk/grails-app/views/maintenancePolicy/list.gsp =================================================================== --- /trunk/grails-app/views/maintenancePolicy/list.gsp (revision 267) +++ /trunk/grails-app/views/maintenancePolicy/list.gsp (revision 268) @@ -23,9 +23,9 @@ + + - - @@ -37,9 +37,9 @@ ${fieldValue(bean:maintenancePolicyInstance, field:'id')} + ${fieldValue(bean:maintenancePolicyInstance, field:'name')} + ${fieldValue(bean:maintenancePolicyInstance, field:'description')} ${fieldValue(bean:maintenancePolicyInstance, field:'isActive')} - - ${fieldValue(bean:maintenancePolicyInstance, field:'name')} Index: /trunk/grails-app/views/maintenancePolicy/show.gsp =================================================================== --- /trunk/grails-app/views/maintenancePolicy/show.gsp (revision 267) +++ /trunk/grails-app/views/maintenancePolicy/show.gsp (revision 268) @@ -30,4 +30,11 @@ + Name: + + ${fieldValue(bean:maintenancePolicyInstance, field:'name')} + + + + Description: @@ -56,11 +63,4 @@ - - Name: - - ${fieldValue(bean:maintenancePolicyInstance, field:'name')} - - - Index: /trunk/grails-app/views/section/create.gsp =================================================================== --- /trunk/grails-app/views/section/create.gsp (revision 267) +++ /trunk/grails-app/views/section/create.gsp (revision 268) @@ -5,18 +5,18 @@ - Create SystemSection + Create Section
- SystemSection List + Section List
-

Create SystemSection

+

Create Section

${flash.message}
 - +
- +
@@ -28,8 +28,26 @@ - + - - + + + + + + + + + + + + + + + + + + + + @@ -39,33 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -75,6 +66,6 @@ - - + + Index: /trunk/grails-app/views/section/edit.gsp =================================================================== --- /trunk/grails-app/views/section/edit.gsp (revision 267) +++ /trunk/grails-app/views/section/edit.gsp (revision 268) @@ -5,24 +5,24 @@ - Edit SystemSection + Edit Section
- SystemSection List - New SystemSection + Section List + New Section
-

Edit SystemSection

+

Edit Section

${flash.message}
 - +
- +
- - + +
@@ -31,15 +31,8 @@ - @@ -47,8 +40,33 @@ - + + + + + + + + + + @@ -58,24 +76,6 @@ - - - - - - - - - - - @@ -85,12 +85,12 @@ - @@ -99,8 +99,15 @@ - @@ -110,6 +117,6 @@ - Index: /trunk/grails-app/views/section/list.gsp =================================================================== --- /trunk/grails-app/views/section/list.gsp (revision 267) +++ /trunk/grails-app/views/section/list.gsp (revision 268) @@ -5,12 +5,12 @@ - SystemSection List + Section List
- New SystemSection + New Section
-

SystemSection List

+

Section List

${flash.message}
@@ -23,31 +23,31 @@ - + -
- - - + + + + - + - + - + - + - + - + - + @@ -57,5 +57,5 @@
- +
Index: /trunk/grails-app/views/section/show.gsp =================================================================== --- /trunk/grails-app/views/section/show.gsp (revision 267) +++ /trunk/grails-app/views/section/show.gsp (revision 268) @@ -5,13 +5,13 @@ - Show SystemSection + Show Section
- SystemSection List - New SystemSection + Section List + New Section
-

Show SystemSection

+

Show Section

${flash.message}
@@ -25,5 +25,26 @@
- + + + + + + + + + + + + + + + + + + + + + + @@ -34,5 +55,5 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -75,5 +75,5 @@ - + - + @@ -93,5 +99,5 @@ - + @@ -102,5 +108,5 @@
- + Index: /trunk/grails-app/views/sectionExtendedAttribute/create.gsp =================================================================== --- /trunk/grails-app/views/sectionExtendedAttribute/create.gsp (revision 268) +++ /trunk/grails-app/views/sectionExtendedAttribute/create.gsp (revision 268) @@ -0,0 +1,73 @@ + + + + + + + Create SectionExtendedAttribute + + +
+ SectionExtendedAttribute List +
+
+

Create SectionExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + +
+
- + - -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add Asset - + 		+
- + - + + +
+ + + +
+ + + +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+Add Asset +
- -
- - - -
- - - + +
+
    - +
  • ${m?.encodeAsHTML()}
    •
-Add MaintenanceAction +Add MaintenanceAction
- + - + + +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+Add SectionExtendedAttribute +
- + +
DepartmentDepartmentSite
${fieldValue(bean:systemSectionInstance, field:'id')}${fieldValue(bean:sectionInstance, field:'id')}${fieldValue(bean:systemSectionInstance, field:'costCode')}${fieldValue(bean:sectionInstance, field:'name')}${fieldValue(bean:systemSectionInstance, field:'department')}${fieldValue(bean:sectionInstance, field:'description')}${fieldValue(bean:systemSectionInstance, field:'description')}${fieldValue(bean:sectionInstance, field:'isActive')}${fieldValue(bean:systemSectionInstance, field:'isActive')}${fieldValue(bean:sectionInstance, field:'department')}${fieldValue(bean:systemSectionInstance, field:'name')}${fieldValue(bean:sectionInstance, field:'site')}
Id:${fieldValue(bean:systemSectionInstance, field:'id')}${fieldValue(bean:sectionInstance, field:'id')}
Name:${fieldValue(bean:sectionInstance, field:'name')}
Description:${fieldValue(bean:sectionInstance, field:'description')}
Is Active:${fieldValue(bean:sectionInstance, field:'isActive')}
    - +
  • ${a?.encodeAsHTML()}
    •  @@ -43,28 +64,7 @@
Cost Code:${fieldValue(bean:systemSectionInstance, field:'costCode')}
Department:${systemSectionInstance?.department?.encodeAsHTML()}
Description:${fieldValue(bean:systemSectionInstance, field:'description')}
Is Active:${fieldValue(bean:systemSectionInstance, field:'isActive')}${sectionInstance?.department?.encodeAsHTML()}
    - +
  • ${m?.encodeAsHTML()}
    •  @@ -84,7 +84,13 @@
Name:Section Extended Attributes:${fieldValue(bean:systemSectionInstance, field:'name')} +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
Site:${systemSectionInstance?.site?.encodeAsHTML()}${sectionInstance?.site?.encodeAsHTML()}
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/sectionExtendedAttribute/edit.gsp =================================================================== --- /trunk/grails-app/views/sectionExtendedAttribute/edit.gsp (revision 268) +++ /trunk/grails-app/views/sectionExtendedAttribute/edit.gsp (revision 268) @@ -0,0 +1,77 @@ + + + + + + + Edit SectionExtendedAttribute + + +
+ SectionExtendedAttribute List + New SectionExtendedAttribute +
+
+

Edit SectionExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ +
+ + Index: /trunk/grails-app/views/sectionExtendedAttribute/list.gsp =================================================================== --- /trunk/grails-app/views/sectionExtendedAttribute/list.gsp (revision 268) +++ /trunk/grails-app/views/sectionExtendedAttribute/list.gsp (revision 268) @@ -0,0 +1,59 @@ + + + + + + + SectionExtendedAttribute List + + +
+ New SectionExtendedAttribute +
+
+

SectionExtendedAttribute List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Extended Attribute TypeSection
${fieldValue(bean:sectionExtendedAttributeInstance, field:'id')}${fieldValue(bean:sectionExtendedAttributeInstance, field:'value')}${fieldValue(bean:sectionExtendedAttributeInstance, field:'isActive')}${fieldValue(bean:sectionExtendedAttributeInstance, field:'extendedAttributeType')}${fieldValue(bean:sectionExtendedAttributeInstance, field:'section')}
+
+
+ +
+
+ + Index: /trunk/grails-app/views/sectionExtendedAttribute/show.gsp =================================================================== --- /trunk/grails-app/views/sectionExtendedAttribute/show.gsp (revision 268) +++ /trunk/grails-app/views/sectionExtendedAttribute/show.gsp (revision 268) @@ -0,0 +1,71 @@ + + + + + + + Show SectionExtendedAttribute + + +
+ SectionExtendedAttribute List + New SectionExtendedAttribute +
+
+

Show SectionExtendedAttribute

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:sectionExtendedAttributeInstance, field:'id')}
Value:${fieldValue(bean:sectionExtendedAttributeInstance, field:'value')}
Is Active:${fieldValue(bean:sectionExtendedAttributeInstance, field:'isActive')}
Extended Attribute Type:${sectionExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()}
Section:${sectionExtendedAttributeInstance?.section?.encodeAsHTML()}
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/site/create.gsp =================================================================== --- /trunk/grails-app/views/site/create.gsp (revision 267) +++ /trunk/grails-app/views/site/create.gsp (revision 268) @@ -46,13 +46,4 @@ - - - - - - - - - Index: /trunk/grails-app/views/site/edit.gsp =================================================================== --- /trunk/grails-app/views/site/edit.gsp (revision 267) +++ /trunk/grails-app/views/site/edit.gsp (revision 268) @@ -49,29 +49,4 @@ - - - - - - - - - - - - - -
    - -
  • ${i?.encodeAsHTML()}
    • -     -
-Add InventoryStore - - - - - - @@ -83,14 +58,30 @@ - + - +
    - -
  • ${s?.encodeAsHTML()}
    • + +
  • ${s?.encodeAsHTML()}
    •
-Add SystemSection +Add Section + + + + + + + + + + +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+Add SiteExtendedAttribute Index: /trunk/grails-app/views/site/list.gsp =================================================================== --- /trunk/grails-app/views/site/list.gsp (revision 267) +++ /trunk/grails-app/views/site/list.gsp (revision 268) @@ -27,6 +27,4 @@ - - @@ -43,6 +41,4 @@ ${fieldValue(bean:siteInstance, field:'description')} - ${fieldValue(bean:siteInstance, field:'costCode')} - ${fieldValue(bean:siteInstance, field:'isActive')} Index: /trunk/grails-app/views/site/show.gsp =================================================================== --- /trunk/grails-app/views/site/show.gsp (revision 267) +++ /trunk/grails-app/views/site/show.gsp (revision 268) @@ -44,17 +44,17 @@ - Cost Code: + Is Active: - ${fieldValue(bean:siteInstance, field:'costCode')} + ${fieldValue(bean:siteInstance, field:'isActive')} - Inventory Stores: + Sections:
    - -
  • ${i?.encodeAsHTML()}
    • + +
  • ${s?.encodeAsHTML()}
    •
@@ -64,17 +64,10 @@ - Is Active: - - ${fieldValue(bean:siteInstance, field:'isActive')} - - - - - System Sections: + Site Extended Attributes:
    - -
  • ${s?.encodeAsHTML()}
    • + +
  • ${s?.encodeAsHTML()}
    •
Index: /trunk/grails-app/views/siteExtendedAttribute/create.gsp =================================================================== --- /trunk/grails-app/views/siteExtendedAttribute/create.gsp (revision 268) +++ /trunk/grails-app/views/siteExtendedAttribute/create.gsp (revision 268) @@ -0,0 +1,73 @@ + + + + + + + Create SiteExtendedAttribute + + +
+ SiteExtendedAttribute List +
+
+

Create SiteExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/siteExtendedAttribute/edit.gsp =================================================================== --- /trunk/grails-app/views/siteExtendedAttribute/edit.gsp (revision 268) +++ /trunk/grails-app/views/siteExtendedAttribute/edit.gsp (revision 268) @@ -0,0 +1,77 @@ + + + + + + + Edit SiteExtendedAttribute + + +
+ SiteExtendedAttribute List + New SiteExtendedAttribute +
+
+

Edit SiteExtendedAttribute

+ +
${flash.message}
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ +
+ + Index: /trunk/grails-app/views/siteExtendedAttribute/list.gsp =================================================================== --- /trunk/grails-app/views/siteExtendedAttribute/list.gsp (revision 268) +++ /trunk/grails-app/views/siteExtendedAttribute/list.gsp (revision 268) @@ -0,0 +1,59 @@ + + + + + + + SiteExtendedAttribute List + + +
+ New SiteExtendedAttribute +
+
+

SiteExtendedAttribute List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Extended Attribute TypeSite
${fieldValue(bean:siteExtendedAttributeInstance, field:'id')}${fieldValue(bean:siteExtendedAttributeInstance, field:'value')}${fieldValue(bean:siteExtendedAttributeInstance, field:'isActive')}${fieldValue(bean:siteExtendedAttributeInstance, field:'extendedAttributeType')}${fieldValue(bean:siteExtendedAttributeInstance, field:'site')}
+
+
+ +
+
+ + Index: /trunk/grails-app/views/siteExtendedAttribute/show.gsp =================================================================== --- /trunk/grails-app/views/siteExtendedAttribute/show.gsp (revision 268) +++ /trunk/grails-app/views/siteExtendedAttribute/show.gsp (revision 268) @@ -0,0 +1,71 @@ + + + + + + + Show SiteExtendedAttribute + + +
+ SiteExtendedAttribute List + New SiteExtendedAttribute +
+
+

Show SiteExtendedAttribute

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:siteExtendedAttributeInstance, field:'id')}
Value:${fieldValue(bean:siteExtendedAttributeInstance, field:'value')}
Is Active:${fieldValue(bean:siteExtendedAttributeInstance, field:'isActive')}
Extended Attribute Type:${siteExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()}
Site:${siteExtendedAttributeInstance?.site?.encodeAsHTML()}
+
+
+ + + + + +
+
+ +