Changeset 157
- Timestamp:
- Oct 21, 2009, 5:07:30 PM (16 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 8 edited
-
controllers/TaskRecurringScheduleDetailedController.groovy (modified) (6 diffs)
-
views/taskRecurringSchedule/create.gsp (modified) (6 diffs)
-
views/taskRecurringSchedule/edit.gsp (modified) (6 diffs)
-
views/taskRecurringSchedule/list.gsp (modified) (3 diffs)
-
views/taskRecurringSchedule/show.gsp (modified) (6 diffs)
-
views/taskRecurringScheduleDetailed/create.gsp (modified) (2 diffs)
-
views/taskRecurringScheduleDetailed/edit.gsp (modified) (2 diffs)
-
views/taskRecurringScheduleDetailed/show.gsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy
r137 r157 4 4 5 5 class TaskRecurringScheduleDetailedController extends BaseController { 6 7 def dateUtilService8 6 7 def dateUtilService 8 9 9 def index = { redirect(action:list,params:params) } 10 10 … … 21 21 22 22 if(!taskRecurringScheduleInstance) { 23 flash.message = " TaskRecurringSchedule not found with id ${params.id}"23 flash.message = "Recurring Schedule not found with id ${params.id}" 24 24 redirect(action:list) 25 25 } … … 32 32 try { 33 33 taskRecurringScheduleInstance.delete() 34 flash.message = " TaskRecurringSchedule ${params.id} deleted"34 flash.message = "Recurring Schedule ${params.id} deleted" 35 35 redirect(action:list) 36 36 } 37 37 catch(org.springframework.dao.DataIntegrityViolationException e) { 38 flash.message = " TaskRecurringSchedule ${params.id} could not be deleted"38 flash.message = "Recurring Schedule ${params.id} could not be deleted" 39 39 redirect(action:show,id:params.id) 40 40 } 41 41 } 42 42 else { 43 flash.message = " TaskRecurringSchedule not found with id ${params.id}"43 flash.message = "Recurring Schedule not found with id ${params.id}" 44 44 redirect(action:list) 45 45 } … … 50 50 51 51 if(!taskRecurringScheduleInstance) { 52 flash.message = " TaskRecurringSchedule not found with id ${params.id}"52 flash.message = "Recurring Schedule not found with id ${params.id}" 53 53 redirect(action:list) 54 54 } … … 59 59 60 60 def update = { 61 TaskRecurringSchedule.withTransaction { status ->62 63 def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id )64 if(taskRecurringScheduleInstance) {65 66 if(params.version) {67 def version = params.version.toLong()68 if(taskRecurringScheduleInstance.version > version) {69 taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this TaskRecurringSchedule while you were editing.")70 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])71 return72 }73 }74 75 Date originalDate = taskRecurringScheduleInstance.startDate76 taskRecurringScheduleInstance.properties = params // Domain object is now 'dirty'.77 Date newDate = taskRecurringScheduleInstance.startDate78 79 // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date.80 if(originalDate.getTime() != newDate.getTime())81 {82 if(newDate < dateUtilService.getToday())83 {84 status.setRollbackOnly() // Only allow the transaction to Rollback, preventing flush due to 'dirty'.85 taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture")86 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])87 return88 }89 }90 91 taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate92 taskRecurringScheduleInstance.setNextGenerationDate()93 taskRecurringScheduleInstance.setNextTargetCompletionDate()94 95 if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save())96 {97 flash.message = "TaskRecurringSchedule ${params.id} updated"98 redirect(action:show,id:taskRecurringScheduleInstance.id)99 }100 else101 {102 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])103 }104 }105 else106 {107 flash.message = "TaskRecurringSchedule not found with id ${params.id}"108 redirect(action:edit,id:params.id)109 }110 111 } // end withTransaction 112 } // end update()113 61 TaskRecurringSchedule.withTransaction { status -> 62 63 def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id ) 64 if(taskRecurringScheduleInstance) { 65 66 if(params.version) { 67 def version = params.version.toLong() 68 if(taskRecurringScheduleInstance.version > version) { 69 taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this Recurring Schedule while you were editing.") 70 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) 71 return 72 } 73 } 74 75 Date originalDate = taskRecurringScheduleInstance.startDate 76 taskRecurringScheduleInstance.properties = params // Domain object is now 'dirty'. 77 Date newDate = taskRecurringScheduleInstance.startDate 78 79 // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date. 80 if(originalDate.getTime() != newDate.getTime()) 81 { 82 if(newDate < dateUtilService.getToday()) 83 { 84 status.setRollbackOnly() // Only allow the transaction to Rollback, preventing flush due to 'dirty'. 85 taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") 86 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) 87 return 88 } 89 } 90 91 taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate 92 taskRecurringScheduleInstance.setNextGenerationDate() 93 taskRecurringScheduleInstance.setNextTargetCompletionDate() 94 95 if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) 96 { 97 flash.message = "Recurring Schedule ${params.id} updated" 98 redirect(action:show,id:taskRecurringScheduleInstance.id) 99 } 100 else 101 { 102 render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) 103 } 104 } 105 else 106 { 107 flash.message = "Recurring Schedule not found with id ${params.id}" 108 redirect(action:edit,id:params.id) 109 } 110 111 } // end withTransaction 112 } // end update() 113 114 114 def create = { 115 115 try { 116 116 def taskInstance = Task.get(params.taskInstance.id) 117 def taskRecurringScheduleInstance = new TaskRecurringSchedule()117 def taskRecurringScheduleInstance = new TaskRecurringSchedule() 118 118 taskRecurringScheduleInstance.task = taskInstance 119 119 return [taskRecurringScheduleInstance: taskRecurringScheduleInstance] … … 127 127 def save = { 128 128 def taskRecurringScheduleInstance = new TaskRecurringSchedule(params) 129 def taskInstance = Task.get(params.task.id)130 131 if(taskInstance.taskRecurringSchedule) {132 flash.message = "This task already has a recurring schedule"133 redirect(controller:"taskDetailed", action:"show", id: params.task.id)134 }135 else {136 137 if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) {138 taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture")139 }140 141 if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) {142 143 taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance144 145 if(taskInstance.save()) {146 flash.message = "TaskRecurringSchedule ${taskRecurringScheduleInstance.id} created"147 redirect(action:show,id:taskRecurringScheduleInstance.id)148 }149 else {150 flash.message = "Task could not be saved and therefore the Recurring Schedule has been disgarded, cause unknown."151 render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])152 }153 }154 else {155 render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])156 }157 }129 def taskInstance = Task.get(params.task.id) 130 131 if(taskInstance.taskRecurringSchedule) { 132 flash.message = "This task already has a recurring schedule" 133 redirect(controller:"taskDetailed", action:"show", id: params.task.id) 134 } 135 else { 136 137 if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) { 138 taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") 139 } 140 141 if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { 142 143 taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance 144 145 if(taskInstance.save()) { 146 flash.message = "Recurring Schedule ${taskRecurringScheduleInstance.id} created" 147 redirect(action:show,id:taskRecurringScheduleInstance.id) 148 } 149 else { 150 flash.message = "Task could not be saved and therefore the Recurring Schedule has been disgarded, cause unknown." 151 render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) 152 } 153 } 154 else { 155 render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) 156 } 157 } 158 158 159 159 } // end save() -
trunk/grails-app/views/taskRecurringSchedule/create.gsp
r151 r157 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${ resource(dir:'')}">Home</a></span>11 <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span> 12 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 13 13 </div> … … 29 29 <tr class="prop"> 30 30 <td valign="top" class="name"> 31 <label for="recurEvery">Recur Every:</label> 32 </td> 33 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"> 34 <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" /> 35 </td> 36 </tr> 37 38 <tr class="prop"> 39 <td valign="top" class="name"> 40 <label for="taskDuration">Task Duration:</label> 41 </td> 42 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDuration','errors')}"> 43 <input type="text" id="taskDuration" name="taskDuration" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'taskDuration')}" /> 44 </td> 45 </tr> 46 47 <tr class="prop"> 48 <td valign="top" class="name"> 49 <label for="generateAhead">Generate Ahead:</label> 50 </td> 51 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}"> 52 <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" /> 53 </td> 54 </tr> 55 56 <tr class="prop"> 57 <td valign="top" class="name"> 31 58 <label for="lastGeneratedDate">Last Generated Date:</label> 32 59 </td> … … 42 69 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'lastGeneratedSubTask','errors')}"> 43 70 <g:select optionKey="id" from="${Task.list()}" name="lastGeneratedSubTask.id" value="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}" noSelection="['null':'']"></g:select> 44 </td>45 </tr>46 47 <tr class="prop">48 <td valign="top" class="name">49 <label for="generateAhead">Generate Ahead:</label>50 </td>51 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}">52 <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />53 71 </td> 54 72 </tr> … … 74 92 <tr class="prop"> 75 93 <td valign="top" class="name"> 76 <label for="nextDueDate">Next Due Date:</label>77 </td>78 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextDueDate','errors')}">79 <g:datePicker name="nextDueDate" value="${taskRecurringScheduleInstance?.nextDueDate}" ></g:datePicker>80 </td>81 </tr>82 83 <tr class="prop">84 <td valign="top" class="name">85 94 <label for="nextGenerationDate">Next Generation Date:</label> 86 95 </td> … … 92 101 <tr class="prop"> 93 102 <td valign="top" class="name"> 94 <label for=" recurEvery">Recur Every:</label>103 <label for="nextTargetCompletionDate">Next Target Completion Date:</label> 95 104 </td> 96 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"> 97 <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" /> 105 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetCompletionDate','errors')}"> 106 <g:datePicker name="nextTargetCompletionDate" value="${taskRecurringScheduleInstance?.nextTargetCompletionDate}" ></g:datePicker> 107 </td> 108 </tr> 109 110 <tr class="prop"> 111 <td valign="top" class="name"> 112 <label for="nextTargetStartDate">Next Target Start Date:</label> 113 </td> 114 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetStartDate','errors')}"> 115 <g:datePicker name="nextTargetStartDate" value="${taskRecurringScheduleInstance?.nextTargetStartDate}" ></g:datePicker> 98 116 </td> 99 117 </tr> … … 126 144 </tr> 127 145 146 <tr class="prop"> 147 <td valign="top" class="name"> 148 <label for="taskDurationPeriod">Task Duration Period:</label> 149 </td> 150 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDurationPeriod','errors')}"> 151 <g:select optionKey="id" from="${Period.list()}" name="taskDurationPeriod.id" value="${taskRecurringScheduleInstance?.taskDurationPeriod?.id}" ></g:select> 152 </td> 153 </tr> 154 128 155 </tbody> 129 156 </table> -
trunk/grails-app/views/taskRecurringSchedule/edit.gsp
r151 r157 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${ resource(dir:'')}">Home</a></span>11 <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span> 12 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 13 13 <span class="menuButton"><g:link class="create" action="create">New TaskRecurringSchedule</g:link></span> … … 32 32 <tr class="prop"> 33 33 <td valign="top" class="name"> 34 <label for="recurEvery">Recur Every:</label> 35 </td> 36 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"> 37 <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" /> 38 </td> 39 </tr> 40 41 <tr class="prop"> 42 <td valign="top" class="name"> 43 <label for="taskDuration">Task Duration:</label> 44 </td> 45 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDuration','errors')}"> 46 <input type="text" id="taskDuration" name="taskDuration" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'taskDuration')}" /> 47 </td> 48 </tr> 49 50 <tr class="prop"> 51 <td valign="top" class="name"> 52 <label for="generateAhead">Generate Ahead:</label> 53 </td> 54 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}"> 55 <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" /> 56 </td> 57 </tr> 58 59 <tr class="prop"> 60 <td valign="top" class="name"> 34 61 <label for="lastGeneratedDate">Last Generated Date:</label> 35 62 </td> … … 45 72 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'lastGeneratedSubTask','errors')}"> 46 73 <g:select optionKey="id" from="${Task.list()}" name="lastGeneratedSubTask.id" value="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}" noSelection="['null':'']"></g:select> 47 </td>48 </tr>49 50 <tr class="prop">51 <td valign="top" class="name">52 <label for="generateAhead">Generate Ahead:</label>53 </td>54 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}">55 <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />56 74 </td> 57 75 </tr> … … 77 95 <tr class="prop"> 78 96 <td valign="top" class="name"> 79 <label for="nextDueDate">Next Due Date:</label>80 </td>81 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextDueDate','errors')}">82 <g:datePicker name="nextDueDate" value="${taskRecurringScheduleInstance?.nextDueDate}" ></g:datePicker>83 </td>84 </tr>85 86 <tr class="prop">87 <td valign="top" class="name">88 97 <label for="nextGenerationDate">Next Generation Date:</label> 89 98 </td> … … 95 104 <tr class="prop"> 96 105 <td valign="top" class="name"> 97 <label for=" recurEvery">Recur Every:</label>106 <label for="nextTargetCompletionDate">Next Target Completion Date:</label> 98 107 </td> 99 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}"> 100 <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" /> 108 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetCompletionDate','errors')}"> 109 <g:datePicker name="nextTargetCompletionDate" value="${taskRecurringScheduleInstance?.nextTargetCompletionDate}" ></g:datePicker> 110 </td> 111 </tr> 112 113 <tr class="prop"> 114 <td valign="top" class="name"> 115 <label for="nextTargetStartDate">Next Target Start Date:</label> 116 </td> 117 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextTargetStartDate','errors')}"> 118 <g:datePicker name="nextTargetStartDate" value="${taskRecurringScheduleInstance?.nextTargetStartDate}" ></g:datePicker> 101 119 </td> 102 120 </tr> … … 129 147 </tr> 130 148 149 <tr class="prop"> 150 <td valign="top" class="name"> 151 <label for="taskDurationPeriod">Task Duration Period:</label> 152 </td> 153 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'taskDurationPeriod','errors')}"> 154 <g:select optionKey="id" from="${Period.list()}" name="taskDurationPeriod.id" value="${taskRecurringScheduleInstance?.taskDurationPeriod?.id}" ></g:select> 155 </td> 156 </tr> 157 131 158 </tbody> 132 159 </table> -
trunk/grails-app/views/taskRecurringSchedule/list.gsp
r151 r157 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${ resource(dir:'')}">Home</a></span>11 <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span> 12 12 <span class="menuButton"><g:link class="create" action="create">New TaskRecurringSchedule</g:link></span> 13 13 </div> … … 24 24 <g:sortableColumn property="id" title="Id" /> 25 25 26 <g:sortableColumn property="recurEvery" title="Recur Every" /> 27 28 <g:sortableColumn property="taskDuration" title="Task Duration" /> 29 30 <g:sortableColumn property="generateAhead" title="Generate Ahead" /> 31 26 32 <g:sortableColumn property="lastGeneratedDate" title="Last Generated Date" /> 27 33 28 34 <th>Last Generated Sub Task</th> 29 35 30 <g:sortableColumn property="generateAhead" title="Generate Ahead" />31 32 <th>Generate Ahead Period</th>33 34 <g:sortableColumn property="isEnabled" title="Is Enabled" />35 36 36 </tr> 37 37 </thead> … … 42 42 <td><g:link action="show" id="${taskRecurringScheduleInstance.id}">${fieldValue(bean:taskRecurringScheduleInstance, field:'id')}</g:link></td> 43 43 44 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}</td> 45 46 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'taskDuration')}</td> 47 48 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td> 49 44 50 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedDate')}</td> 45 51 46 52 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}</td> 47 48 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td>49 50 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAheadPeriod')}</td>51 52 <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>53 53 54 54 </tr> -
trunk/grails-app/views/taskRecurringSchedule/show.gsp
r151 r157 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${ resource(dir:'')}">Home</a></span>11 <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span> 12 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 13 13 <span class="menuButton"><g:link class="create" action="create">New TaskRecurringSchedule</g:link></span> … … 31 31 32 32 <tr class="prop"> 33 <td valign="top" class="name">Recur Every:</td> 34 35 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}</td> 36 37 </tr> 38 39 <tr class="prop"> 40 <td valign="top" class="name">Task Duration:</td> 41 42 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'taskDuration')}</td> 43 44 </tr> 45 46 <tr class="prop"> 47 <td valign="top" class="name">Generate Ahead:</td> 48 49 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td> 50 51 </tr> 52 53 <tr class="prop"> 33 54 <td valign="top" class="name">Last Generated Date:</td> 34 55 … … 41 62 42 63 <td valign="top" class="value"><g:link controller="task" action="show" id="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}">${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()}</g:link></td> 43 44 </tr>45 46 <tr class="prop">47 <td valign="top" class="name">Generate Ahead:</td>48 49 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td>50 64 51 65 </tr> … … 66 80 67 81 <tr class="prop"> 68 <td valign="top" class="name">Next Due Date:</td>69 70 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')}</td>71 72 </tr>73 74 <tr class="prop">75 82 <td valign="top" class="name">Next Generation Date:</td> 76 83 … … 80 87 81 88 <tr class="prop"> 82 <td valign="top" class="name"> Recur Every:</td>89 <td valign="top" class="name">Next Target Completion Date:</td> 83 90 84 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}</td> 91 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'nextTargetCompletionDate')}</td> 92 93 </tr> 94 95 <tr class="prop"> 96 <td valign="top" class="name">Next Target Start Date:</td> 97 98 <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'nextTargetStartDate')}</td> 85 99 86 100 </tr> … … 107 121 </tr> 108 122 123 <tr class="prop"> 124 <td valign="top" class="name">Task Duration Period:</td> 125 126 <td valign="top" class="value"><g:link controller="period" action="show" id="${taskRecurringScheduleInstance?.taskDurationPeriod?.id}">${taskRecurringScheduleInstance?.taskDurationPeriod?.encodeAsHTML()}</g:link></td> 127 128 </tr> 129 109 130 </tbody> 110 131 </table> -
trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp
r151 r157 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>Create TaskRecurringSchedule</title> 7 <title>Create TaskRecurringSchedule</title> 8 <resource:dateChooser /> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span> 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 12 <h1>Create Recurring Schedule</h1> 13 13 </div> 14 14 <div class="body"> 15 <h1>Create TaskRecurringSchedule</h1>16 15 <g:if test="${flash.message}"> 17 16 <div class="message">${flash.message}</div> … … 42 41 </td> 43 42 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}"> 44 < g:datePicker name="startDate" value="${taskRecurringScheduleInstance?.startDate}" precision="day"></g:datePicker>43 <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.startDate}" /> 45 44 </td> 46 45 </tr> -
trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp
r151 r157 6 6 <meta name="layout" content="main" /> 7 7 <title>Edit TaskRecurringSchedule</title> 8 <resource:dateChooser /> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span> 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 13 <span class="menuButton"><g:link class="create" action="create">New TaskRecurringSchedule</g:link></span> 12 <h1>Edit Recurring Schedule</h1> 14 13 </div> 15 14 <div class="body"> 16 <h1>Edit TaskRecurringSchedule</h1>17 15 <g:if test="${flash.message}"> 18 16 <div class="message">${flash.message}</div> … … 44 42 </td> 45 43 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'startDate','errors')}"> 46 < g:datePicker name="startDate" value="${taskRecurringScheduleInstance?.startDate}" precision="day"></g:datePicker>44 <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${taskRecurringScheduleInstance?.startDate}" /> 47 45 </td> 48 46 </tr> -
trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp
r151 r157 9 9 <body> 10 10 <div class="nav"> 11 <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span> 12 <span class="menuButton"><g:link class="list" action="list">TaskRecurringSchedule List</g:link></span> 13 <span class="menuButton"><g:link class="create" action="create">New TaskRecurringSchedule</g:link></span> 11 <h1>Show Recurring Schedule</h1> 14 12 </div> 15 13 <div class="body"> 16 <h1>Show TaskRecurringSchedule</h1>17 14 <g:if test="${flash.message}"> 18 15 <div class="message">${flash.message}</div>
Note: See TracChangeset
for help on using the changeset viewer.
