Index: trunk/grails-app/views/asset/create.gsp
===================================================================
--- trunk/grails-app/views/asset/create.gsp	(revision 118)
+++ trunk/grails-app/views/asset/create.gsp	(revision 122)
@@ -56,40 +56,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lifeplan">Lifeplan:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'lifeplan','errors')}">
-                                    <g:select optionKey="id" from="${LifePlan.list()}" name="lifeplan.id" value="${assetInstance?.lifeplan?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="locationLongText">Location Long Text:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'locationLongText','errors')}">
-                                    <input type="text" id="locationLongText" name="locationLongText" value="${fieldValue(bean:assetInstance,field:'locationLongText')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="manufacturedDate">Manufactured Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'manufacturedDate','errors')}">
-                                    <g:datePicker name="manufacturedDate" value="${assetInstance?.manufacturedDate}" ></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="modelNumber">Model Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'modelNumber','errors')}">
-                                    <input type="text" id="modelNumber" name="modelNumber" value="${fieldValue(bean:assetInstance,field:'modelNumber')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="name">Name:</label>
                                 </td>
@@ -101,26 +65,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="purchaseCost">Purchase Cost:</label>
+                                    <label for="systemSection">System Section:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'purchaseCost','errors')}">
-                                    <input type="text" id="purchaseCost" name="purchaseCost" value="${fieldValue(bean:assetInstance,field:'purchaseCost')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="riskPriorityNumber">Risk Priority Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'riskPriorityNumber','errors')}">
-                                    <input type="text" id="riskPriorityNumber" name="riskPriorityNumber" value="${fieldValue(bean:assetInstance,field:'riskPriorityNumber')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="serialNumber">Serial Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'serialNumber','errors')}">
-                                    <input type="text" id="serialNumber" name="serialNumber" value="${fieldValue(bean:assetInstance,field:'serialNumber')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'systemSection','errors')}">
+                                    <g:select optionKey="id" from="${SystemSection.list()}" name="systemSection.id" value="${assetInstance?.systemSection?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/asset/edit.gsp
===================================================================
--- trunk/grails-app/views/asset/edit.gsp	(revision 118)
+++ trunk/grails-app/views/asset/edit.gsp	(revision 122)
@@ -59,35 +59,15 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lifeplan">Lifeplan:</label>
+                                    <label for="maintenanceActions">Maintenance Actions:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'lifeplan','errors')}">
-                                    <g:select optionKey="id" from="${LifePlan.list()}" name="lifeplan.id" value="${assetInstance?.lifeplan?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="locationLongText">Location Long Text:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'locationLongText','errors')}">
-                                    <input type="text" id="locationLongText" name="locationLongText" value="${fieldValue(bean:assetInstance,field:'locationLongText')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="manufacturedDate">Manufactured Date:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'manufacturedDate','errors')}">
-                                    <g:datePicker name="manufacturedDate" value="${assetInstance?.manufacturedDate}" ></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="modelNumber">Model Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'modelNumber','errors')}">
-                                    <input type="text" id="modelNumber" name="modelNumber" value="${fieldValue(bean:assetInstance,field:'modelNumber')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'maintenanceActions','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${assetInstance?.maintenanceActions?}">
+    <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="maintenanceAction" params="['asset.id':assetInstance?.id]" action="create">Add MaintenanceAction</g:link>
+
                                 </td>
                             </tr> 
@@ -104,26 +84,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="purchaseCost">Purchase Cost:</label>
+                                    <label for="systemSection">System Section:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'purchaseCost','errors')}">
-                                    <input type="text" id="purchaseCost" name="purchaseCost" value="${fieldValue(bean:assetInstance,field:'purchaseCost')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="riskPriorityNumber">Risk Priority Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'riskPriorityNumber','errors')}">
-                                    <input type="text" id="riskPriorityNumber" name="riskPriorityNumber" value="${fieldValue(bean:assetInstance,field:'riskPriorityNumber')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="serialNumber">Serial Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'serialNumber','errors')}">
-                                    <input type="text" id="serialNumber" name="serialNumber" value="${fieldValue(bean:assetInstance,field:'serialNumber')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'systemSection','errors')}">
+                                    <g:select optionKey="id" from="${SystemSection.list()}" name="systemSection.id" value="${assetInstance?.systemSection?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/asset/list.gsp
===================================================================
--- trunk/grails-app/views/asset/list.gsp	(revision 118)
+++ trunk/grails-app/views/asset/list.gsp	(revision 122)
@@ -30,8 +30,8 @@
                    	        <g:sortableColumn property="isActive" title="Is Active" />
                         
-                   	        <th>Lifeplan</th>
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                   	        <th>System Section</th>
                    	    
-                   	        <g:sortableColumn property="locationLongText" title="Location Long Text" />
-                        
                         </tr>
                     </thead>
@@ -48,7 +48,7 @@
                             <td>${fieldValue(bean:assetInstance, field:'isActive')}</td>
                         
-                            <td>${fieldValue(bean:assetInstance, field:'lifeplan')}</td>
+                            <td>${fieldValue(bean:assetInstance, field:'name')}</td>
                         
-                            <td>${fieldValue(bean:assetInstance, field:'locationLongText')}</td>
+                            <td>${fieldValue(bean:assetInstance, field:'systemSection')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/asset/show.gsp
===================================================================
--- trunk/grails-app/views/asset/show.gsp	(revision 118)
+++ trunk/grails-app/views/asset/show.gsp	(revision 122)
@@ -52,28 +52,13 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Lifeplan:</td>
+                            <td valign="top" class="name">Maintenance Actions:</td>
                             
-                            <td valign="top" class="value"><g:link controller="lifePlan" action="show" id="${assetInstance?.lifeplan?.id}">${assetInstance?.lifeplan?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Location Long Text:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'locationLongText')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Manufactured Date:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'manufacturedDate')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Model Number:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'modelNumber')}</td>
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="m" in="${assetInstance.maintenanceActions}">
+                                    <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>
@@ -87,21 +72,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Purchase Cost:</td>
+                            <td valign="top" class="name">System Section:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'purchaseCost')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Risk Priority Number:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'riskPriorityNumber')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Serial Number:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'serialNumber')}</td>
+                            <td valign="top" class="value"><g:link controller="systemSection" action="show" id="${assetInstance?.systemSection?.id}">${assetInstance?.systemSection?.encodeAsHTML()}</g:link></td>
                             
                         </tr>