Changeset 798 for trunk/grails-app/views
- Timestamp:
- Feb 8, 2011, 11:00:27 PM (14 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 3 deleted
- 5 edited
- 6 copied
-
layouts/main.gsp (modified) (1 diff)
-
maintenanceActionDetailed (deleted)
-
shared/_assetTreeCompact.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/shared/_assetTreeCompact.gsp)
-
taskDetailed/show.gsp (modified) (4 diffs)
-
taskProcedure (deleted)
-
taskProcedureDetailed/_documentReference.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_documentReference.gsp)
-
taskProcedureDetailed/_documentReferences.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_documentReferences.gsp)
-
taskProcedureDetailed/_maintenanceAction.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceAction.gsp)
-
taskProcedureDetailed/_maintenanceActions.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp)
-
taskProcedureDetailed/_taskProcedure.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp)
-
taskProcedureDetailed/create.gsp (modified) (3 diffs)
-
taskProcedureDetailed/edit.gsp (modified) (2 diffs)
-
taskProcedureDetailed/list.gsp (modified) (4 diffs)
-
taskProcedureDetailed/show.gsp (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/layouts/main.gsp
r711 r798 5 5 <link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" /> 6 6 <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" /> 7 <g:javascript library="jquery" /> 7 8 <g:javascript library="prototype/prototype" /> 8 9 <g:javascript library="prototype/effects" /> -
trunk/grails-app/views/taskDetailed/show.gsp
r736 r798 513 513 <tr class="prop"> 514 514 <td valign="top" class="name">Procedure Id:</td> 515 516 <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'id')}</td> 517 518 </tr> 519 520 <tr class="prop"> 521 <td valign="top" class="name">Name:</td> 522 523 <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'name')}</td> 524 525 </tr> 526 527 <tr class="prop"> 528 <td valign="top" class="name">Description:</td> 529 530 <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'description')}</td> 531 532 </tr> 533 534 <tr class="prop"> 535 <td valign="top" class="name">Is Active:</td> 536 537 <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td> 538 515 <td valign="top" class="value"> 516 ${fieldValue(bean:taskProcedureInstance, field:'id')} 517 </td> 518 </tr> 519 520 <tr class="prop"> 521 <td valign="top" class="name">Linked Task:</td> 522 <td valign="top" class="value"> 523 <g:link controller="taskDetailed" 524 action="show" 525 id="${taskProcedureInstance.linkedTask.id}"> 526 ${taskProcedureInstance.linkedTask.encodeAsHTML()} 527 </g:link> 528 </td> 529 </tr> 530 531 <tr class="prop"> 532 <td valign="top" class="name">Linked Asset:</td> 533 <td valign="top" class="value"> 534 <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureInstance.linkedTask.primaryAsset]" /> 535 </td> 536 </tr> 537 538 <tr class="prop"> 539 <td valign="top" class="name">Version:</td> 540 <td valign="top" class="value"> 541 ${fieldValue(bean:taskProcedureInstance, field:'version')} 542 </td> 543 </tr> 544 545 <tr class="prop"> 546 <td valign="top" class="name">Last Updated:</td> 547 <td valign="top" class="value"> 548 <g:formatDate date="${taskProcedureInstance.lastUpdated}" 549 format="EEE, dd-MMM-yyyy"/> 550 </td> 539 551 </tr> 540 552 … … 549 561 </div> 550 562 563 <br /> 564 565 <g:if test="${taskProcedureInstance.documentReferences}"> 566 <div class="list"> 567 <table> 568 <thead> 569 <tr> 570 <th>Document Reference</th> 571 <th>Location</th> 572 </tr> 573 </thead> 574 <tbody> 575 <g:each in="${taskProcedureInstance.documentReferences}" status="i" var="docRef"> 576 <tr class="${(i % 2) == 0 ? 'odd' : 'even'}"> 577 578 <td valign="top" class="name"> 579 ${fieldValue(bean:docRef, field:'name')} 580 </td> 581 582 <td valign="top" style="text-align:left;" class="value"> 583 <custom:easyUrl url="${docRef.location}" /> 584 </td> 585 586 </tr> 587 </g:each> 588 589 </tbody> 590 </table> 591 </div> 592 </g:if> 593 594 <br /> 595 551 596 <div class="list"> 552 597 <table> … … 554 599 <tr> 555 600 <th>Step</th> 601 <th>Assembly</th> 556 602 <th>Description</th> 557 <th>Reasoning</th> 558 <th>Asset</th> 559 <th>Sub Item</th> 603 <th>Page Ref</th> 604 <th>Condition</th> 560 605 </tr> 561 606 </thead> … … 569 614 570 615 <td valign="top" style="text-align:left;" class="value"> 616 <g:if test="${maintenanceAction.assetSubItem}"> 617 ${maintenanceAction.assetSubItem.parentItem?.encodeAsHTML()} 618 -- 619 ${maintenanceAction.assetSubItem.encodeAsHTML()} 620 </g:if> 621 </td> 622 623 <td valign="top" style="text-align:left;" class="value"> 571 624 ${fieldValue(bean:maintenanceAction, field:'description')} 572 625 </td> 573 626 574 627 <td valign="top" style="text-align:left;" class="value"> 575 ${fieldValue(bean:maintenanceAction, field:' reasoning')}628 ${fieldValue(bean:maintenanceAction, field:'pageRef')} 576 629 </td> 577 630 578 631 <td valign="top" style="text-align:left;" class="value"> 579 ${fieldValue(bean:maintenanceAction, field:'asset')}580 </td>581 582 <td valign="top" style="text-align:left;" class="value">583 ${fieldValue(bean:maintenanceAction, field:'assetSubItem')}584 632 </td> 585 633 -
trunk/grails-app/views/taskProcedureDetailed/create.gsp
r173 r798 7 7 <title>Create TaskProcedure</title> 8 8 <nav:resources override="true"/> 9 <g:javascript src="dynamicOneToMany.js" /> 9 10 </head> 10 11 <body> … … 13 14 </div> 14 15 <div class="body"> 15 <g:if test="${flash.message}"> 16 <div class="message">${flash.message}</div> 17 </g:if> 16 <g:render template="/shared/messages" /> 17 18 18 <g:hasErrors bean="${taskProcedureInstance}"> 19 <div class="errors">20 <g:renderErrors bean="${taskProcedureInstance}" as="list" />21 </div>19 <div class="errors"> 20 <g:renderErrors bean="${taskProcedureInstance}" as="list" /> 21 </div> 22 22 </g:hasErrors> 23 23 24 <g:form action="save" method="post" > 24 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />25 <input type="hidden" name="linkedTask.id" value="${taskProcedureInstance.linkedTask.id}" /> 25 26 26 <div class="dialog"> 27 <table> 28 <tbody> 27 <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" /> 29 28 30 <tr class="prop">31 <td valign="top" class="name">32 <label for="name">Name:</label>33 </td>34 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'name','errors')}">35 <input type="text" class="description" maxlength="75" id="name" name="name" value="${fieldValue(bean:taskProcedureInstance,field:'name')}"/>36 </td>37 </tr>38 39 <tr class="prop">40 <td valign="top" class="name">41 <label for="description">Description:</label>42 </td>43 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'description','errors')}">44 <input type="text" class="description" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskProcedureInstance,field:'description')}"/>45 </td>46 </tr>47 48 <tr class="prop">49 <td valign="top" class="name">50 <label for="isActive">Is Active:</label>51 </td>52 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'isActive','errors')}">53 <g:checkBox name="isActive" value="${taskProcedureInstance?.isActive}" ></g:checkBox>54 </td>55 </tr>56 57 <g:if test="${taskInstance}">58 <tr class="prop">59 <td valign="top" class="name">60 <label for="taskInstance">Linking with Task:</label>61 </td>62 <td valign="top" name="taskInstance" class="value">63 ${taskInstance}64 </td>65 </tr>66 </g:if>67 68 </tbody>69 </table>70 </div>71 29 <div class="buttons"> 72 30 <span class="button"><input class="save" type="submit" value="Create" /></span> … … 74 32 </g:form> 75 33 </div> 34 <table style="display:none;"> 35 <g:render template="documentReference" model="['docRef': null, 36 'i': '_clone']" /> 37 </table> 38 <table style="display:none;"> 39 <g:render template="maintenanceAction" model="['tp': null, 40 'ma': null, 41 'i': '_clone', 42 'assemblies': assemblies]" /> 43 </table> 76 44 </body> 77 45 </html> -
trunk/grails-app/views/taskProcedureDetailed/edit.gsp
r410 r798 7 7 <title>Edit TaskProcedure</title> 8 8 <nav:resources override="true"/> 9 <g:javascript src="dynamicOneToMany.js" /> 9 10 </head> 10 11 <body> … … 13 14 </div> 14 15 <div class="body"> 15 <g:if test="${flash.message}"> 16 <div class="message">${flash.message}</div> 17 </g:if> 16 <g:render template="/shared/messages" /> 17 18 18 <g:hasErrors bean="${taskProcedureInstance}"> 19 <div class="errors">20 <g:renderErrors bean="${taskProcedureInstance}" as="list" />21 </div>19 <div class="errors"> 20 <g:renderErrors bean="${taskProcedureInstance}" as="list" /> 21 </div> 22 22 </g:hasErrors> 23 23 24 <g:form method="post" > 24 25 <input type="hidden" name="id" value="${taskProcedureInstance?.id}" /> 25 26 <input type="hidden" name="version" value="${taskProcedureInstance?.version}" /> 26 <div class="dialog">27 <table>28 <tbody>29 30 <tr class="prop">31 <td valign="top" class="name">32 <label for="name">Name:</label>33 </td>34 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'name','errors')}">35 <input type="text" class="description" maxlength="75" id="name" name="name" value="${fieldValue(bean:taskProcedureInstance,field:'name')}"/>36 </td>37 </tr>38 39 <tr class="prop">40 <td valign="top" class="name">41 <label for="description">Description:</label>42 </td>43 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'description','errors')}">44 <input type="text" class="description" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskProcedureInstance,field:'description')}"/>45 </td>46 </tr>47 48 <tr class="prop">49 <td valign="top" class="name">50 <label for="isActive">Is Active:</label>51 </td>52 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'isActive','errors')}">53 <g:checkBox name="isActive" value="${taskProcedureInstance?.isActive}" ></g:checkBox>54 </td>55 </tr>56 57 <tr class="prop">58 <td valign="top" class="name">59 <label for="maintenanceActions">Maintenance Actions:</label>60 </td>61 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">62 63 <ul>64 <g:each var="m" in="${taskProcedureInstance?.maintenanceActions?}">65 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>66 </g:each>67 </ul>68 <g:link controller="maintenanceActionDetailed" params="['taskProcedure.id':taskProcedureInstance?.id]" action="create">+Add MaintenanceAction</g:link>69 27 70 </td> 71 </tr> 72 73 <tr class="prop"> 74 <td valign="top" class="name"> 75 <label for="tasks">Tasks:</label> 76 </td> 77 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'tasks','errors')}"> 78 79 <ul> 80 <g:each var="t" in="${taskProcedureInstance?.tasks?}"> 81 <li><g:link controller="taskDetailed" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li> 82 </g:each> 83 </ul> 84 <g:link controller="taskDetailed" params="['taskProcedure.id':taskProcedureInstance?.id]" action="create">+Add Task</g:link> 28 <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" /> 85 29 86 </td>87 </tr>88 89 </tbody>90 </table>91 </div>92 30 <div class="buttons"> 93 31 <span class="button"><g:actionSubmit class="save" value="Update" /></span> 32 <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span> 94 33 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> 95 34 </div> 96 35 </g:form> 97 36 </div> 37 <table style="display:none;"> 38 <g:render template="documentReference" model="['docRef': null, 39 'i': '_clone']" /> 40 </table> 41 <table style="display:none;"> 42 <g:render template="maintenanceAction" model="['tp': null, 43 'ma': null, 44 'i': '_clone', 45 'assemblies': assemblies]" /> 46 </table> 98 47 </body> 99 48 </html> -
trunk/grails-app/views/taskProcedureDetailed/list.gsp
r467 r798 37 37 <thead> 38 38 <tr> 39 39 40 40 <g:sortableColumn property="id" title="Id" params="${filterParams}" /> 41 42 <g:sortableColumn property="name" title="Name" params="${filterParams}" /> 43 44 <g:sortableColumn property="description" title="Description" params="${filterParams}" /> 45 46 <g:sortableColumn property="isActive" title="Is Active" params="${filterParams}" /> 41 <th>Description</th> 42 <th>Asset</th> 47 43 48 44 <th></th> 49 45 50 46 </tr> 51 47 </thead> … … 53 49 <g:each in="${taskProcedureInstanceList}" status="i" var="taskProcedureInstance"> 54 50 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskProcedureDetailed/show/${taskProcedureInstance.id}"'/> 55 51 56 52 <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td> 57 58 <td>${fieldValue(bean:taskProcedureInstance, field:'name')}</td> 59 60 <td>${fieldValue(bean:taskProcedureInstance, field:'description')}</td> 61 62 <td>${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td> 63 53 54 <td>${taskProcedureInstance.description.encodeAsHTML()}</td> 55 56 <td>${taskProcedureInstance.asset?.encodeAsHTML()}</td> 57 64 58 <td> 65 59 <g:link action="show" id="${taskProcedureInstance.id}"> … … 67 61 </g:link> 68 62 </td> 69 63 70 64 </tr> 71 65 </g:each> … … 83 77 action="list" 84 78 class="overlayPane" 85 excludeProperties="" /> 79 additionalProperties="id" 80 excludeProperties="" 81 associatedProperties="linkedTask.description" /> 86 82 </div> 87 83 </body>
Note: See TracChangeset
for help on using the changeset viewer.
