Changeset 273
- Timestamp:
- Jan 15, 2010, 1:18:09 PM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/Site.groovy
r268 r273 5 5 Boolean isActive = true 6 6 7 // static hasMany = [inventoryStores: InventoryStore, systemSections: SystemSection]8 7 static hasMany = [sections: Section, 9 siteExtendedAttributes: SiteExtendedAttribute] 8 siteExtendedAttributes: SiteExtendedAttribute, 9 inventoryStores: InventoryStore] 10 10 11 11 // static belongsTo = [] -
trunk/grails-app/views/sectionDetailed/create.gsp
r178 r273 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>Create S ystemSection</title>7 <title>Create Section</title> 8 8 </head> 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">S ystemSection List</g:link></span>11 <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span> 12 12 </div> 13 13 <div class="body"> 14 <h1>Create S ystemSection</h1>14 <h1>Create Section</h1> 15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> 17 17 </g:if> 18 <g:hasErrors bean="${s ystemSectionInstance}">18 <g:hasErrors bean="${sectionInstance}"> 19 19 <div class="errors"> 20 <g:renderErrors bean="${s ystemSectionInstance}" as="list" />20 <g:renderErrors bean="${sectionInstance}" as="list" /> 21 21 </div> 22 22 </g:hasErrors> … … 30 30 <label for="name">Name:</label> 31 31 </td> 32 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'name','errors')}">33 <input type="text" id="name" name="name" value="${fieldValue(bean:systemSectionInstance,field:'name')}"/>32 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'name','errors')}"> 33 <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:sectionInstance,field:'name')}"/> 34 34 </td> 35 </tr> 35 </tr> 36 36 37 37 <tr class="prop"> … … 39 39 <label for="description">Description:</label> 40 40 </td> 41 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'description','errors')}">42 <input type="text" id="description" name="description" value="${fieldValue(bean:systemSectionInstance,field:'description')}"/>41 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'description','errors')}"> 42 <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:sectionInstance,field:'description')}"/> 43 43 </td> 44 </tr> 44 </tr> 45 45 46 46 <tr class="prop"> 47 47 <td valign="top" class="name"> 48 <label for=" costCode">Cost Code:</label>48 <label for="isActive">Is Active:</label> 49 49 </td> 50 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'costCode','errors')}">51 < input type="text" id="costCode" name="costCode" value="${fieldValue(bean:systemSectionInstance,field:'costCode')}"/>50 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'isActive','errors')}"> 51 <g:checkBox name="isActive" value="${sectionInstance?.isActive}" ></g:checkBox> 52 52 </td> 53 53 </tr> … … 57 57 <label for="department">Department:</label> 58 58 </td> 59 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'department','errors')}">60 <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${s ystemSectionInstance?.department?.id}" ></g:select>59 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'department','errors')}"> 60 <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${sectionInstance?.department?.id}" ></g:select> 61 61 </td> 62 62 </tr> … … 66 66 <label for="site">Site:</label> 67 67 </td> 68 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'site','errors')}">69 <g:select optionKey="id" from="${Site.list()}" name="site.id" value="${s ystemSectionInstance?.site?.id}" ></g:select>68 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'site','errors')}"> 69 <g:select optionKey="id" from="${Site.list()}" name="site.id" value="${sectionInstance?.site?.id}" ></g:select> 70 70 </td> 71 71 </tr> 72 73 <tr class="prop">74 <td valign="top" class="name">75 <label for="isActive">Is Active:</label>76 </td>77 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'isActive','errors')}">78 <g:checkBox name="isActive" value="${systemSectionInstance?.isActive}" ></g:checkBox>79 </td>80 </tr>81 72 82 73 </tbody> -
trunk/grails-app/views/sectionDetailed/edit.gsp
r178 r273 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>Edit S ystemSection</title>7 <title>Edit Section</title> 8 8 </head> 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">S ystemSection List</g:link></span>12 <span class="menuButton"><g:link class="create" action="create">New S ystemSection</g:link></span>11 <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span> 13 13 </div> 14 14 <div class="body"> 15 <h1>Edit S ystemSection</h1>15 <h1>Edit Section</h1> 16 16 <g:if test="${flash.message}"> 17 17 <div class="message">${flash.message}</div> 18 18 </g:if> 19 <g:hasErrors bean="${s ystemSectionInstance}">19 <g:hasErrors bean="${sectionInstance}"> 20 20 <div class="errors"> 21 <g:renderErrors bean="${s ystemSectionInstance}" as="list" />21 <g:renderErrors bean="${sectionInstance}" as="list" /> 22 22 </div> 23 23 </g:hasErrors> 24 24 <g:form method="post" > 25 <input type="hidden" name="id" value="${s ystemSectionInstance?.id}" />26 <input type="hidden" name="version" value="${s ystemSectionInstance?.version}" />25 <input type="hidden" name="id" value="${sectionInstance?.id}" /> 26 <input type="hidden" name="version" value="${sectionInstance?.version}" /> 27 27 <div class="dialog"> 28 28 <table> … … 33 33 <label for="name">Name:</label> 34 34 </td> 35 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'name','errors')}">36 <input type="text" id="name" name="name" value="${fieldValue(bean:systemSectionInstance,field:'name')}"/>35 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'name','errors')}"> 36 <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:sectionInstance,field:'name')}"/> 37 37 </td> 38 </tr> 38 </tr> 39 39 40 40 <tr class="prop"> … … 42 42 <label for="description">Description:</label> 43 43 </td> 44 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'description','errors')}">45 <input type="text" id="description" name="description" value="${fieldValue(bean:systemSectionInstance,field:'description')}"/>44 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'description','errors')}"> 45 <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:sectionInstance,field:'description')}"/> 46 46 </td> 47 </tr> 47 </tr> 48 48 49 49 <tr class="prop"> 50 50 <td valign="top" class="name"> 51 <label for=" costCode">Cost Code:</label>51 <label for="isActive">Is Active:</label> 52 52 </td> 53 <td valign="top" class="value ${hasErrors(bean:s ystemSectionInstance,field:'costCode','errors')}">54 < input type="text" id="costCode" name="costCode" value="${fieldValue(bean:systemSectionInstance,field:'costCode')}"/>53 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'isActive','errors')}"> 54 <g:checkBox name="isActive" value="${sectionInstance?.isActive}" ></g:checkBox> 55 55 </td> 56 </tr> 56 </tr> 57 58 <tr class="prop"> 59 <td valign="top" class="name"> 60 <label for="assets">Assets:</label> 61 </td> 62 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'assets','errors')}"> 63 64 <ul> 65 <g:each var="a" in="${sectionInstance?.assets?}"> 66 <li><g:link controller="asset" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 67 </g:each> 68 </ul> 69 <g:link controller="asset" params="['section.id':sectionInstance?.id]" action="create">Add Asset</g:link> 70 71 </td> 72 </tr> 57 73 58 74 <tr class="prop"> … … 60 76 <label for="department">Department:</label> 61 77 </td> 62 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'department','errors')}"> 63 <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${systemSectionInstance?.department?.id}" ></g:select> 78 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'department','errors')}"> 79 <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${sectionInstance?.department?.id}" ></g:select> 80 </td> 81 </tr> 82 83 <tr class="prop"> 84 <td valign="top" class="name"> 85 <label for="maintenanceActions">Maintenance Actions:</label> 86 </td> 87 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'maintenanceActions','errors')}"> 88 89 <ul> 90 <g:each var="m" in="${sectionInstance?.maintenanceActions?}"> 91 <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li> 92 </g:each> 93 </ul> 94 <g:link controller="maintenanceAction" params="['section.id':sectionInstance?.id]" action="create">Add MaintenanceAction</g:link> 95 96 </td> 97 </tr> 98 99 <tr class="prop"> 100 <td valign="top" class="name"> 101 <label for="sectionExtendedAttributes">Section Extended Attributes:</label> 102 </td> 103 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'sectionExtendedAttributes','errors')}"> 104 105 <ul> 106 <g:each var="s" in="${sectionInstance?.sectionExtendedAttributes?}"> 107 <li><g:link controller="sectionExtendedAttribute" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 108 </g:each> 109 </ul> 110 <g:link controller="sectionExtendedAttribute" params="['section.id':sectionInstance?.id]" action="create">Add SectionExtendedAttribute</g:link> 111 64 112 </td> 65 113 </tr> … … 69 117 <label for="site">Site:</label> 70 118 </td> 71 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'site','errors')}"> 72 <g:select optionKey="id" from="${Site.list()}" name="site.id" value="${systemSectionInstance?.site?.id}" ></g:select> 73 </td> 74 </tr> 75 76 <tr class="prop"> 77 <td valign="top" class="name"> 78 <label for="isActive">Is Active:</label> 79 </td> 80 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'isActive','errors')}"> 81 <g:checkBox name="isActive" value="${systemSectionInstance?.isActive}" ></g:checkBox> 82 </td> 83 </tr> 84 85 <tr class="prop"> 86 <td valign="top" class="name"> 87 <label for="assets">Assets:</label> 88 </td> 89 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'assets','errors')}"> 90 91 <ul> 92 <g:each var="a" in="${systemSectionInstance?.assets?}"> 93 <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 94 </g:each> 95 </ul> 96 <g:link controller="assetDetailed" params="['systemSection.id':systemSectionInstance?.id]" action="create">Add Asset</g:link> 97 98 </td> 99 </tr> 100 101 <tr class="prop"> 102 <td valign="top" class="name"> 103 <label for="maintenanceActions">Maintenance Actions:</label> 104 </td> 105 <td valign="top" class="value ${hasErrors(bean:systemSectionInstance,field:'maintenanceActions','errors')}"> 106 107 <ul> 108 <g:each var="m" in="${systemSectionInstance?.maintenanceActions?}"> 109 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li> 110 </g:each> 111 </ul> 112 <g:link controller="maintenanceActionDetailed" params="['systemSection.id':systemSectionInstance?.id]" action="create">Add MaintenanceAction</g:link> 113 119 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'site','errors')}"> 120 <g:select optionKey="id" from="${Site.list()}" name="site.id" value="${sectionInstance?.site?.id}" ></g:select> 114 121 </td> 115 122 </tr> -
trunk/grails-app/views/sectionDetailed/list.gsp
r178 r273 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>S ystemSection List</title>7 <title>Section List</title> 8 8 </head> 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><g:link class="create" action="create">New S ystemSection</g:link></span>11 <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span> 12 12 </div> 13 13 <div class="body"> 14 <h1>S ystemSection List</h1>14 <h1>Section List</h1> 15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> … … 23 23 <g:sortableColumn property="id" title="Id" /> 24 24 25 <g:sortableColumn property="name" title="Name" /> 26 25 27 <g:sortableColumn property="description" title="Description" /> 26 28 27 29 <g:sortableColumn property="isActive" title="Is Active" /> 28 30 29 < g:sortableColumn property="name" title="Name" />30 31 <th>Department</th> 32 31 33 <th>Site</th> 32 34 … … 34 36 </thead> 35 37 <tbody> 36 <g:each in="${s ystemSectionInstanceList}" status="i" var="systemSectionInstance">38 <g:each in="${sectionInstanceList}" status="i" var="sectionInstance"> 37 39 <tr class="${(i % 2) == 0 ? 'odd' : 'even'}"> 38 40 39 <td><g:link action="show" id="${s ystemSectionInstance.id}">${fieldValue(bean:systemSectionInstance, field:'id')}</g:link></td>41 <td><g:link action="show" id="${sectionInstance.id}">${fieldValue(bean:sectionInstance, field:'id')}</g:link></td> 40 42 41 <td>${fieldValue(bean:s ystemSectionInstance, field:'description')}</td>43 <td>${fieldValue(bean:sectionInstance, field:'name')}</td> 42 44 43 <td>${fieldValue(bean:s ystemSectionInstance, field:'isActive')}</td>45 <td>${fieldValue(bean:sectionInstance, field:'description')}</td> 44 46 45 <td>${fieldValue(bean:s ystemSectionInstance, field:'name')}</td>47 <td>${fieldValue(bean:sectionInstance, field:'isActive')}</td> 46 48 47 <td>${fieldValue(bean:systemSectionInstance, field:'site')}</td> 49 <td>${fieldValue(bean:sectionInstance, field:'department')}</td> 50 51 <td>${fieldValue(bean:sectionInstance, field:'site')}</td> 48 52 49 53 </tr> … … 53 57 </div> 54 58 <div class="paginateButtons"> 55 <g:paginate total="${s ystemSectionInstanceTotal}" />59 <g:paginate total="${sectionInstanceTotal}" /> 56 60 </div> 57 61 </div> -
trunk/grails-app/views/sectionDetailed/show.gsp
r178 r273 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>Show S ystemSection</title>7 <title>Show Section</title> 8 8 </head> 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">S ystemSection List</g:link></span>12 <span class="menuButton"><g:link class="create" action="create">New S ystemSection</g:link></span>11 <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span> 13 13 </div> 14 14 <div class="body"> 15 <h1>Show S ystemSection</h1>15 <h1>Show Section</h1> 16 16 <g:if test="${flash.message}"> 17 17 <div class="message">${flash.message}</div> … … 25 25 <td valign="top" class="name">Id:</td> 26 26 27 <td valign="top" class="value">${fieldValue(bean:s ystemSectionInstance, field:'id')}</td>27 <td valign="top" class="value">${fieldValue(bean:sectionInstance, field:'id')}</td> 28 28 29 29 </tr> … … 32 32 <td valign="top" class="name">Name:</td> 33 33 34 <td valign="top" class="value">${fieldValue(bean:s ystemSectionInstance, field:'name')}</td>34 <td valign="top" class="value">${fieldValue(bean:sectionInstance, field:'name')}</td> 35 35 36 36 </tr> … … 39 39 <td valign="top" class="name">Description:</td> 40 40 41 <td valign="top" class="value">${fieldValue(bean:systemSectionInstance, field:'description')}</td> 42 43 </tr> 44 45 <tr class="prop"> 46 <td valign="top" class="name">Cost Code:</td> 47 48 <td valign="top" class="value">${fieldValue(bean:systemSectionInstance, field:'costCode')}</td> 49 50 </tr> 51 52 <tr class="prop"> 53 <td valign="top" class="name">Department:</td> 54 55 <td valign="top" class="value"><g:link controller="department" action="show" id="${systemSectionInstance?.department?.id}">${systemSectionInstance?.department?.encodeAsHTML()}</g:link></td> 56 57 </tr> 58 59 <tr class="prop"> 60 <td valign="top" class="name">Site:</td> 61 62 <td valign="top" class="value"><g:link controller="site" action="show" id="${systemSectionInstance?.site?.id}">${systemSectionInstance?.site?.encodeAsHTML()}</g:link></td> 41 <td valign="top" class="value">${fieldValue(bean:sectionInstance, field:'description')}</td> 63 42 64 43 </tr> … … 67 46 <td valign="top" class="name">Is Active:</td> 68 47 69 <td valign="top" class="value">${fieldValue(bean:s ystemSectionInstance, field:'isActive')}</td>48 <td valign="top" class="value">${fieldValue(bean:sectionInstance, field:'isActive')}</td> 70 49 71 50 </tr> … … 76 55 <td valign="top" style="text-align:left;" class="value"> 77 56 <ul> 78 <g:each var="a" in="${s ystemSectionInstance.assets}">79 <li><g:link controller="asset Detailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>57 <g:each var="a" in="${sectionInstance.assets}"> 58 <li><g:link controller="asset" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 80 59 </g:each> 81 60 </ul> 82 61 </td> 62 63 </tr> 64 65 <tr class="prop"> 66 <td valign="top" class="name">Department:</td> 67 68 <td valign="top" class="value"><g:link controller="department" action="show" id="${sectionInstance?.department?.id}">${sectionInstance?.department?.encodeAsHTML()}</g:link></td> 83 69 84 70 </tr> … … 89 75 <td valign="top" style="text-align:left;" class="value"> 90 76 <ul> 91 <g:each var="m" in="${s ystemSectionInstance.maintenanceActions}">92 <li><g:link controller="maintenanceAction Detailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>77 <g:each var="m" in="${sectionInstance.maintenanceActions}"> 78 <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li> 93 79 </g:each> 94 80 </ul> 95 81 </td> 82 83 </tr> 84 85 <tr class="prop"> 86 <td valign="top" class="name">Section Extended Attributes:</td> 87 88 <td valign="top" style="text-align:left;" class="value"> 89 <ul> 90 <g:each var="s" in="${sectionInstance.sectionExtendedAttributes}"> 91 <li><g:link controller="sectionExtendedAttribute" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 92 </g:each> 93 </ul> 94 </td> 95 96 </tr> 97 98 <tr class="prop"> 99 <td valign="top" class="name">Site:</td> 100 101 <td valign="top" class="value"><g:link controller="site" action="show" id="${sectionInstance?.site?.id}">${sectionInstance?.site?.encodeAsHTML()}</g:link></td> 96 102 97 103 </tr> … … 102 108 <div class="buttons"> 103 109 <g:form> 104 <input type="hidden" name="id" value="${s ystemSectionInstance?.id}" />110 <input type="hidden" name="id" value="${sectionInstance?.id}" /> 105 111 <span class="button"><g:actionSubmit class="edit" value="Edit" /></span> 106 112 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> -
trunk/grails-app/views/site/edit.gsp
r268 r273 58 58 <tr class="prop"> 59 59 <td valign="top" class="name"> 60 <label for="inventoryStores">Inventory Stores:</label> 61 </td> 62 <td valign="top" class="value ${hasErrors(bean:siteInstance,field:'inventoryStores','errors')}"> 63 64 <ul> 65 <g:each var="i" in="${siteInstance?.inventoryStores?}"> 66 <li><g:link controller="inventoryStore" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 67 </g:each> 68 </ul> 69 <g:link controller="inventoryStore" params="['site.id':siteInstance?.id]" action="create">Add InventoryStore</g:link> 70 71 </td> 72 </tr> 73 74 <tr class="prop"> 75 <td valign="top" class="name"> 60 76 <label for="sections">Sections:</label> 61 77 </td> -
trunk/grails-app/views/site/show.gsp
r268 r273 51 51 52 52 <tr class="prop"> 53 <td valign="top" class="name">Inventory Stores:</td> 54 55 <td valign="top" style="text-align:left;" class="value"> 56 <ul> 57 <g:each var="i" in="${siteInstance.inventoryStores}"> 58 <li><g:link controller="inventoryStore" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 59 </g:each> 60 </ul> 61 </td> 62 63 </tr> 64 65 <tr class="prop"> 53 66 <td valign="top" class="name">Sections:</td> 54 67
Note: See TracChangeset
for help on using the changeset viewer.