Changeset 432 for trunk/grails-app
- Timestamp:
- Mar 7, 2010, 12:06:07 PM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/services/TaskService.groovy
r431 r432 675 675 result.taskInstance.approved = true 676 676 result.taskInstance.leadPerson = authService.currentUser 677 result.taskInstance.targetCompletionDate = result.taskInstance.targetStartDate 677 678 678 679 if(result.taskInstance.hasErrors() || !result.taskInstance.save()) … … 695 696 entryType: EntryType.get(1), 696 697 comment: params.entryFault.comment, 698 dateDone: result.taskInstance.targetStartDate, 697 699 productionReference: productionReference, 698 700 durationHour: params.entryFault.durationHour, … … 703 705 def causeParams = [task: result.taskInstance, 704 706 entryType: EntryType.get(2), 707 dateDone: result.taskInstance.targetStartDate, 705 708 comment: params.entryCause.comment] 706 709 def causeResult = saveEntry(causeParams) … … 710 713 entryType: EntryType.get(3), 711 714 comment: params.entryWorkDone.comment, 715 dateDone: result.taskInstance.targetStartDate, 712 716 durationHour: params.entryWorkDone.durationHour, 713 717 durationMinute: params.entryWorkDone.durationMinute] -
trunk/grails-app/views/entryDetailed/create.gsp
r431 r432 50 50 </g:if> 51 51 <g:elseif test="${entryInstance?.entryType?.id == 2}"> 52 <g:helpBalloon code="entry.comment.cause" /> 53 </g:elseif> 54 <g:elseif test="${entryInstance?.entryType?.id == 3}"> 52 55 <g:helpBalloon code="entry.comment.work.done" /> 53 56 </g:elseif> … … 81 84 </tr> 82 85 </g:if> 83 84 <tr class="prop">85 <td valign="top" class="name">86 <label for="durationHour">Duration:</label>87 </td>88 86 89 <td valign="top" class="value"> 90 <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 91 type="text" id="durationHour" name="durationHour" 92 value="${fieldValue(bean:entryInstance,field:'durationHour')}" /> 93 : 94 <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 95 type="text" id="durationMinute" name="durationMinute" 96 value="${fieldValue(bean:entryInstance,field:'durationMinute')}" /> 97 <g:helpBalloon code="entry.duration" /> 98 </td> 99 </tr> 87 <g:if test="${entryInstance?.entryType?.id != 2}"> 88 <tr class="prop"> 89 <td valign="top" class="name"> 90 <label for="durationHour">Duration:</label> 91 </td> 92 93 <td valign="top" class="value"> 94 <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 95 type="text" id="durationHour" name="durationHour" 96 value="${fieldValue(bean:entryInstance,field:'durationHour')}" /> 97 : 98 <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 99 type="text" id="durationMinute" name="durationMinute" 100 value="${fieldValue(bean:entryInstance,field:'durationMinute')}" /> 101 <g:helpBalloon code="entry.duration" /> 102 </td> 103 </tr> 104 </g:if> 100 105 101 106 </tbody> -
trunk/grails-app/views/entryDetailed/edit.gsp
r431 r432 72 72 </tr> 73 73 </g:if> 74 75 <tr class="prop">76 <td valign="top" class="name">77 <label for="durationHour">Duration:</label>78 </td>79 74 80 <td valign="top" class="value"> 81 <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 82 type="text" id="durationHour" name="durationHour" 83 value="${fieldValue(bean:entryInstance,field:'durationHour')}" /> 84 : 85 <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 86 type="text" id="durationMinute" name="durationMinute" 87 value="${fieldValue(bean:entryInstance,field:'durationMinute')}" /> 88 <g:helpBalloon code="entry.duration" /> 89 </td> 90 </tr> 75 <g:if test="${entryInstance?.entryType?.id != 2}"> 76 <tr class="prop"> 77 <td valign="top" class="name"> 78 <label for="durationHour">Duration:</label> 79 </td> 80 81 <td valign="top" class="value"> 82 <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 83 type="text" id="durationHour" name="durationHour" 84 value="${fieldValue(bean:entryInstance,field:'durationHour')}" /> 85 : 86 <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 87 type="text" id="durationMinute" name="durationMinute" 88 value="${fieldValue(bean:entryInstance,field:'durationMinute')}" /> 89 <g:helpBalloon code="entry.duration" /> 90 </td> 91 </tr> 92 </g:if> 91 93 92 94 <tr class="prop">
Note: See TracChangeset
for help on using the changeset viewer.