Changeset 431 for trunk/grails-app/views/taskDetailed
- Timestamp:
- Mar 5, 2010, 12:45:43 PM (14 years ago)
- Location:
- trunk/grails-app/views/taskDetailed
- Files:
-
- 2 edited
-
createImmediateCallout.gsp (modified) (4 diffs)
-
show.gsp (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp
r418 r431 13 13 <div class="body"> 14 14 <g:render template="/shared/messages" /> 15 <g:hasErrors bean="${taskInstance}"> 16 <div class="errors"> 17 <g:renderErrors bean="${taskInstance}" as="list" /> 18 </div> 19 </g:hasErrors> 20 <g:hasErrors bean="${entryFaultInstance}"> 21 <div class="errors"> 22 <g:renderErrors bean="${entryFaultInstance}" as="list" /> 23 </div> 24 </g:hasErrors> 25 <g:hasErrors bean="${entryCauseInstance}"> 26 <div class="errors"> 27 <g:renderErrors bean="${entryCauseInstance}" as="list" /> 28 </div> 29 </g:hasErrors> 30 <g:hasErrors bean="${entryWorkDoneInstance}"> 31 <div class="errors"> 32 <g:renderErrors bean="${entryWorkDoneInstance}" as="list" /> 33 </div> 15 16 <g:hasErrors> 17 <div class="errors"> 18 <ul> 19 <g:eachError bean="${taskInstance}"> 20 <li><g:message error="${it}" /></li> 21 </g:eachError> 22 <g:eachError bean="${entryFaultInstance}"> 23 <li><g:message error="${it}" /></li> 24 </g:eachError> 25 <g:eachError bean="${entryCauseInstance}"> 26 <li><g:message error="${it}" /></li> 27 </g:eachError> 28 <g:eachError bean="${entryWorkDoneInstance}"> 29 <li><g:message error="${it}" /></li> 30 </g:eachError> 31 </ul> 32 </div> 34 33 </g:hasErrors> 35 34 … … 45 44 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}"> 46 45 <input type="text" class="description" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/> 47 <g:helpBalloon class="helpballoon" code="task.description" /> 46 <g:helpBalloon class="helpballoon" code="task.description.immediateCallout" /> 47 </td> 48 </tr> 49 50 <tr class="prop"> 51 <td valign="top" class="name"> 52 <label for="targetStartDate">Date:</label> 53 </td> 54 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}"> 55 <richui:dateChooser name="targetStartDate" format="dd-MM-yyyy" value="${taskInstance.targetStartDate}" /> 56 <g:helpBalloon class="helpballoon" code="task.targetStartDate.immediateCallout" /> 57 </td> 58 </tr> 59 60 <tr class="prop"> 61 <td valign="top" class="name"> 62 <label for="primaryAsset">Asset:</label> 63 </td> 64 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}"> 65 <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select> 66 <g:helpBalloon code="task.primaryAsset" /> 67 </td> 68 </tr> 69 70 <tr class="prop"> 71 <td valign="top" class="name"> 72 <label for="productionReference">Production:</label> 73 </td> 74 <td valign="top" class="value ${hasErrors(bean:entryFaultInstance,field:'productionReference','errors')}"> 75 <g:select optionKey="id" 76 from="${ProductionReference.findAllByIsActive(true)}" 77 name="entryFault.productionReference.id" 78 value="${entryFaultInstance?.productionReference?.id}" 79 noSelection="['null':'--None--']"> 80 </g:select> 81 <g:helpBalloon code="entry.productionReference.fault" /> 48 82 </td> 49 83 </tr> … … 62 96 type="text" id="entryFault.durationMinute" name="entryFault.durationMinute" 63 97 value="${fieldValue(bean:entryFaultInstance,field:'durationMinute')}" /> 64 <g:helpBalloon code="entry.duration " />98 <g:helpBalloon code="entry.duration.fault" /> 65 99 </td> 66 100 </tr> … … 113 147 </tr> 114 148 115 <tr class="prop">116 <td valign="top" class="name">117 <label for="primaryAsset">Primary Asset:</label>118 </td>119 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">120 <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>121 <g:helpBalloon code="task.primaryAsset" />122 </td>123 </tr>124 125 <tr class="prop">126 <td valign="top" class="name">127 <label for="associatedAssets">Associated Assets:</label>128 </td>129 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">130 <g:select id="associatedAssets" name="associatedAssets"131 from="${Asset.list()}"132 size="5" multiple="yes" optionKey="id"133 value="${taskInstance?.associatedAssets?.id}" noSelection="['':'--None--']"/>134 <g:helpBalloon code="task.associatedAssets" />135 </td>136 </tr>137 138 149 </tbody> 139 150 </table> -
trunk/grails-app/views/taskDetailed/show.gsp
r418 r431 62 62 <td valign="top" class="name">Parent Task:</td> 63 63 64 <td valign="top" class="value"><g:link controller="taskDetailed" action="show" id="${taskInstance.parentTask.id}">${taskInstance.parentTask.encodeAsHTML()}</g:link></td> 64 <td valign="top" class="value"> 65 <g:link controller="taskDetailed" action="show" id="${taskInstance.parentTask.id}"> 66 ${taskInstance.parentTask.encodeAsHTML()} 67 </g:link> 68 </td> 65 69 66 70 </tr> … … 77 81 <td valign="top" class="name">Target Start:</td> 78 82 79 <td valign="top" class="value"><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td> 83 <td valign="top" class="value"> 84 <g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/> 85 </td> 80 86 81 87 </tr> … … 84 90 <td valign="top" class="name">Target Completion:</td> 85 91 86 <td valign="top" class="value"><g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd-MMM-yyyy"/></td> 92 <td valign="top" class="value"> 93 <g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd-MMM-yyyy"/> 94 </td> 87 95 88 96 </tr> … … 236 244 <g:else> 237 245 <span class="button"><g:actionSubmit class="flag" value="Unresolved" action="setAttentionFlag"/></span> 246 <g:helpBalloon class="helpballoon" code="task.status.unresolved" /> 238 247 </g:else> 239 248 240 249 <span class="button"><g:actionSubmit class="complete" value="Resolved" action="complete"/></span> 250 <g:helpBalloon class="helpballoon" code="task.status.resolved" /> 241 251 242 252 <g:if test="${taskInstance.approved}" > … … 272 282 <tr> 273 283 <th>Comment</th> 274 <th>Date Done</th> 284 <th>Date</th> 285 <th>Production</th> 275 286 <th>Down Time</th> 276 287 <th>Entered By</th> … … 282 293 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 283 294 284 <td style="width:65%">${entry.comment }</td>295 <td style="width:65%">${entry.comment.encodeAsHTML()}</td> 285 296 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td> 297 <td> 298 <g:if test="${entry.productionReference}"> 299 ${entry.productionReference.encodeAsHTML()} 300 </g:if> 301 <g:else> 302 <g:message code="default.none.text" /> 303 </g:else> 304 </td> 286 305 <td>${entry.durationHour}:${entry.durationMinute}</td> 287 <td>${entry.enteredBy }</td>306 <td>${entry.enteredBy.encodeAsHTML()}</td> 288 307 289 308 <td> … … 332 351 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 333 352 334 <td style="width:65%">${entry.comment }</td>353 <td style="width:65%">${entry.comment.encodeAsHTML()}</td> 335 354 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td> 336 <td>${entry.enteredBy }</td>355 <td>${entry.enteredBy.encodeAsHTML()}</td> 337 356 338 357 <td> … … 382 401 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 383 402 384 <td width="65%">${entry.comment }</td>403 <td width="65%">${entry.comment.encodeAsHTML()}</td> 385 404 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td> 386 405 <td>${entry.durationHour}:${entry.durationMinute}</td> 387 <td>${entry.enteredBy }</td>406 <td>${entry.enteredBy.encodeAsHTML()}</td> 388 407 389 408 <td>
Note: See TracChangeset
for help on using the changeset viewer.
