Changeset 728 for trunk/grails-app
- Timestamp:
- Nov 29, 2010, 3:00:51 PM (14 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 8 edited
-
domain/Task.groovy (modified) (1 diff)
-
i18n/messages.properties (modified) (1 diff)
-
services/AssetReportService.groovy (modified) (1 diff)
-
services/TaskService.groovy (modified) (1 diff)
-
views/taskDetailed/create.gsp (modified) (2 diffs)
-
views/taskDetailed/createUnscheduled.gsp (modified) (2 diffs)
-
views/taskDetailed/edit.gsp (modified) (2 diffs)
-
views/taskDetailed/show.gsp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/Task.groovy
r592 r728 23 23 boolean attentionFlag = false 24 24 boolean safetyRequirement = false 25 boolean mandatoryRegulatory = false 25 boolean regulatoryRequirement = false 26 boolean mandatoryRequirement = false 26 27 boolean positiveFault = false 27 28 -
trunk/grails-app/i18n/messages.properties
r727 r728 181 181 task.leadPerson=Lead Person 182 182 task.leadPerson.help=The primay contact person. 183 task.safetyRequirement=Safety Requirment183 task.safetyRequirement=Safety 184 184 task.safetyRequirement.help=Completion of this task is a safety requirement. \ 185 185 This task must be completed and is not allowed to be missed. 186 task.mandatoryRegulatory=Mandatory/Regulatory 187 task.mandatoryRegulatory.help=Completion of this task is a mandatory or regulatory requirement. \ 186 task.regulatoryRequirement=Regulatory 187 task.regulatoryRequirement.help=Completion of this task is a regulatory requirement. \ 188 This task must be completed and is not allowed to be missed. 189 task.mandatoryRequirement=Mandatory 190 task.mandatoryRequirement.help=Completion of this task is mandatory, due to company policy or operational requirement. \ 188 191 This task must be completed and is not allowed to be missed. 189 192 task.positiveFault=Positive Fault -
trunk/grails-app/services/AssetReportService.groovy
r710 r728 192 192 from 'Task as task', 193 193 'left join task.associatedAssets as associatedAsset' 194 where 'task. mandatoryRegulatory= true'194 where 'task.regulatoryRequirement = true' 195 195 and 'task.targetStartDate < :endDate' 196 196 and 'task.targetCompletionDate >= :startDate' -
trunk/grails-app/services/TaskService.groovy
r631 r728 196 196 197 197 p.safetyRequirement = params.safetyRequirement ?: parentTask.safetyRequirement 198 p.mandatoryRegulatory = params.mandatoryRegulatory ?: parentTask.mandatoryRegulatory 198 p.regulatoryRequirement = params.regulatoryRequirement ?: parentTask.regulatoryRequirement 199 p.mandatoryRequirement = params.mandatoryRequirement ?: parentTask.mandatoryRequirement 199 200 200 201 p.taskGroup = params.taskGroup ?: parentTask.taskGroup -
trunk/grails-app/views/taskDetailed/create.gsp
r601 r728 151 151 <tr class="prop"> 152 152 <td valign="top" class="name"> 153 <label for=" isActive">Safety Requirement:</label>153 <label for="safetyRequirement">Safety:</label> 154 154 </td> 155 155 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}"> … … 161 161 <tr class="prop"> 162 162 <td valign="top" class="name"> 163 <label for="isActive">Mandatory/Regulatory:</label> 164 </td> 165 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}"> 166 <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox> 167 <g:helpBalloon code="task.mandatoryRegulatory" /> 168 </td> 169 </tr> 170 171 <tr class="prop"> 172 <td valign="top" class="name"> 173 <label for="isActive">Positive Fault:</label> 163 <label for="regulatoryRequirement">Regulatory:</label> 164 </td> 165 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}"> 166 <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox> 167 <g:helpBalloon code="task.regulatoryRequirement" /> 168 </td> 169 </tr> 170 171 <tr class="prop"> 172 <td valign="top" class="name"> 173 <label for="mandatoryRequirement">Mandatory:</label> 174 </td> 175 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}"> 176 <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox> 177 <g:helpBalloon code="task.mandatoryRequirement" /> 178 </td> 179 </tr> 180 181 <tr class="prop"> 182 <td valign="top" class="name"> 183 <label for="positiveFault">Positive Fault:</label> 174 184 </td> 175 185 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}"> -
trunk/grails-app/views/taskDetailed/createUnscheduled.gsp
r601 r728 133 133 <tr class="prop"> 134 134 <td valign="top" class="name"> 135 <label for=" isActive">Safety Requirement:</label>135 <label for="safetyRequirement">Safety Requirement:</label> 136 136 </td> 137 137 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}"> … … 143 143 <tr class="prop"> 144 144 <td valign="top" class="name"> 145 <label for=" isActive">Mandatory/Regulatory:</label>145 <label for="regulatoryRequirement">Regulatory Requirement:</label> 146 146 </td> 147 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}"> 148 <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox> 149 <g:helpBalloon code="task.mandatoryRegulatory" /> 147 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}"> 148 <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox> 149 <g:helpBalloon code="task.regulatoryRequirement" /> 150 </td> 151 </tr> 152 153 <tr class="prop"> 154 <td valign="top" class="name"> 155 <label for="mandatoryRequirement">Mandatory Requirement:</label> 156 </td> 157 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}"> 158 <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox> 159 <g:helpBalloon code="task.mandatoryRequirement" /> 150 160 </td> 151 161 </tr> -
trunk/grails-app/views/taskDetailed/edit.gsp
r602 r728 179 179 <tr class="prop"> 180 180 <td valign="top" class="name"> 181 <label for=" isActive">Safety Requirement:</label>181 <label for="safetyRequirement">Safety Requirement:</label> 182 182 </td> 183 183 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}"> … … 189 189 <tr class="prop"> 190 190 <td valign="top" class="name"> 191 <label for="isActive">Mandatory/Regulatory:</label> 192 </td> 193 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}"> 194 <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox> 195 <g:helpBalloon code="task.mandatoryRegulatory" /> 196 </td> 197 </tr> 198 199 <tr class="prop"> 200 <td valign="top" class="name"> 201 <label for="isActive">Positive Fault:</label> 191 <label for="regulatoryRequirement">Regulatory Requirement:</label> 192 </td> 193 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}"> 194 <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox> 195 <g:helpBalloon code="task.regulatoryRequirement" /> 196 </td> 197 </tr> 198 199 <tr class="prop"> 200 <td valign="top" class="name"> 201 <label for="mandatoryRequirement">Mandatory Requirement:</label> 202 </td> 203 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}"> 204 <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox> 205 <g:helpBalloon code="task.mandatoryRequirement" /> 206 </td> 207 </tr> 208 209 <tr class="prop"> 210 <td valign="top" class="name"> 211 <label for="positiveFault">Positive Fault:</label> 202 212 </td> 203 213 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}"> -
trunk/grails-app/views/taskDetailed/show.gsp
r592 r728 28 28 Task #${taskInstance.id} 29 29 <g:if test="${taskInstance.attentionFlag}" > 30 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt=" Flag" />30 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Attention Flag" title="Attention Flag" /> 31 31 </g:if> 32 32 <g:if test="${taskInstance.taskStatus.id == 3}" > 33 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Flag" /> 33 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" /> 34 </g:if> 35 <g:if test="${taskInstance.safetyRequirement}" > 36 <img src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" /> 37 </g:if> 38 <g:if test="${taskInstance.regulatoryRequirement}" > 39 <img src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" /> 40 </g:if> 41 <g:if test="${taskInstance.mandatoryRequirement}" > 42 <img src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" /> 34 43 </g:if> 35 44 </h1> … … 188 197 189 198 <tr class="prop"> 190 <td valign="top" class="name">Safety Requirement:</td>191 192 <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'safetyRequirement')}</td>193 194 </tr>195 196 <tr class="prop">197 <td valign="top" class="name">Mandatory/Regulatory:</td>198 199 <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'mandatoryRegulatory')}</td>200 201 </tr>202 203 <tr class="prop">204 199 <td valign="top" class="name">Positive Fault:</td> 205 200
Note: See TracChangeset
for help on using the changeset viewer.
