Changeset 126 for trunk/grails-app
- Timestamp:
- May 5, 2009, 5:12:53 AM (16 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/conf/SecurityConfig.groovy
r98 r126 37 37 '/images/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], 38 38 '/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], 39 '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], 39 '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_FULLY'], 40 '/plugins/richui-0.6/**': ['IS_AUTHENTICATED_FULLY'], 40 41 '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'], 41 42 '/login/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], -
trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy
r125 r126 1 1 2 class TaskRecurringScheduleJob { 2 class TaskRecurringScheduleJob {/* 3 3 // def timeout = 5000 // execute job once in 5 seconds 4 4 def timeout = 60000 … … 44 44 } 45 45 }//recurringScheduleInstanceList.each() 46 } 46 }*/ 47 47 } -
trunk/grails-app/views/taskDetailed/show.gsp
r124 r126 4 4 <meta name="layout" content="main" /> 5 5 <title>Show Task</title> 6 <resource:tabView skin="tabviewCustom" /> 6 7 </head> 7 8 <body> … … 12 13 </div> 13 14 <div class="body"> 14 <h1>Show Task</h1>15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> 17 17 </g:if> 18 19 20 21 <richui:tabView id="tabView"> 22 <richui:tabLabels> 23 <richui:tabLabel selected="true" title="Task" /> 24 <richui:tabLabel title="Recurrence" /> 25 <richui:tabLabel title="Sub Tasks" /> 26 <richui:tabLabel title="PM" /> 27 </richui:tabLabels> 28 <richui:tabContents> 29 <richui:tabContent> 30 18 31 <div class="dialog"> 19 32 <table> … … 105 118 </tr> 106 119 120 <tr class="prop"> 121 <td valign="top" class="name">Task Group:</td> 122 123 <td valign="top" class="value">${taskInstance?.taskGroup?.encodeAsHTML()}</td> 124 125 </tr> 126 127 <tr class="prop"> 128 <td valign="top" class="name">Task Type:</td> 129 130 <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td> 131 132 </tr> 133 134 <tr class="prop"> 135 <td valign="top" class="name">Assigned Persons:</td> 136 137 <td valign="top" style="text-align:left;" class="value"> 138 <ul> 139 <g:each var="a" in="${taskInstance.assignedPersons}"> 140 <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 141 </g:each> 142 </ul> 143 </td> 144 145 </tr> 146 147 </tbody> 148 </table> 149 </div> 150 151 152 <div class="buttons"> 153 <g:form> 154 <input type="hidden" name="id" value="${taskInstance?.id}" /> 155 <span class="button"><g:actionSubmit class="edit" value="Edit" /></span> 156 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> 157 </g:form> 158 </div> 159 160 <div class="list"> 161 <h1>Faults</h1> 162 <table> 163 <thead> 164 <tr> 165 <th>Comment</th> 166 <th>Date Done</th> 167 <th>Duration</th> 168 <th>Entered By</th> 169 <th></th> 170 171 <!-- <g:sortableColumn property="comment" title="Comment" /> 172 173 <g:sortableColumn property="dateDone" title="Date Done" /> 174 175 <g:sortableColumn property="enteredBy" title="Entered By" />--> 176 </tr> 177 </thead> 178 <tbody> 179 <g:each in="${taskInstance?.entries}" status="i" var="entry"> 180 <g:if test="${entry.entryType == EntryType.findByName('Fault')}"> 181 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 182 183 <td style="width:65%">${entry.comment}</td> 184 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td> 185 <td>${entry.durationHour}:${entry.durationMinute}</td> 186 <td>${entry.enteredBy}</td> 187 188 <td> 189 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 190 <img src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" /> 191 </g:link> 192 </td> 193 194 </tr> 195 </g:if> 196 </g:each> 197 </tbody> 198 </table> 199 </div> 200 201 <div class="list"> 202 <h1>Work Done</h1> 203 <table> 204 <thead> 205 <tr> 206 <th>Comment</th> 207 <th>Date Done</th> 208 <th>Duration</th> 209 <th>Entered By</th> 210 <th></th> 211 212 <!-- <g:sortableColumn property="commentW" title="Comment" /> 213 214 <g:sortableColumn property="dateDoneW" title="Date Done" /> 215 216 <g:sortableColumn property="enteredByW" title="Entered By" />--> 217 </tr> 218 </thead> 219 <tbody> 220 <g:each in="${taskInstance?.entries}" status="i" var="entry"> 221 <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}"> 222 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 223 224 <td width="65%">${entry.comment}</td> 225 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td> 226 <td>${entry.durationHour}:${entry.durationMinute}</td> 227 <td>${entry.enteredBy}</td> 228 229 <td> 230 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 231 <img src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" /> 232 </g:link> 233 </td> 234 235 </tr> 236 </g:if> 237 </g:each> 238 </tbody> 239 </table> 240 </div> 241 242 <br /> 243 244 <div class="buttons"> 245 <g:form controller="entryDetailed"> 246 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" /> 247 <span class="button"> 248 <g:actionSubmit value="Add Entry" action="create" class="add"/> 249 </span> 250 </g:form> 251 </div> 252 </richui:tabContent> 253 254 <richui:tabContent> 255 <div class="dialog"> 256 <table> 257 <tbody> 258 <tr class="prop"> 259 <td valign="top" class="name">Recurring Schedule:</td> 260 261 <td valign="top" class="value">${taskInstance.recurringSchedule?.encodeAsHTML()}</td> 262 263 </tr> 264 265 <tr class="prop"> 266 <td valign="top" class="name">Start Date:</td> 267 268 <td valign="top" class="value">${taskInstance.recurringSchedule?.startDate}</td> 269 270 </tr> 271 272 <tr class="prop"> 273 <td valign="top" class="name">Next Due Date:</td> 274 275 <td valign="top" class="value">${taskInstance.recurringSchedule?.nextDueDate}</td> 276 277 </tr> 278 279 <tr class="prop"> 280 <td valign="top" class="name">Last Excecuted Date:</td> 281 282 <td valign="top" class="value">${taskInstance.recurringSchedule?.lastExecutedDate}</td> 283 284 </tr> 285 </tbody> 286 </table> 287 </div> 288 289 </richui:tabContent> 290 291 <richui:tabContent> 292 <div class="dialog"> 293 <table> 294 <tbody> 107 295 <tr class="prop"> 108 296 <td valign="top" class="name">Sub Tasks:</td> … … 117 305 118 306 </tr> 119 120 <tr class="prop"> 121 <td valign="top" class="name">Task Group:</td> 122 123 <td valign="top" class="value">${taskInstance?.taskGroup?.encodeAsHTML()}</td> 124 125 </tr> 126 127 <tr class="prop"> 128 <td valign="top" class="name">Task Type:</td> 129 130 <td valign="top" class="value">${taskInstance?.taskType?.encodeAsHTML()}</td> 131 132 </tr> 133 134 <tr class="prop"> 135 <td valign="top" class="name">Assigned Persons:</td> 136 137 <td valign="top" style="text-align:left;" class="value"> 138 <ul> 139 <g:each var="a" in="${taskInstance.assignedPersons}"> 140 <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 141 </g:each> 142 </ul> 143 </td> 307 </tbody> 308 </table> 309 </div> 310 </richui:tabContent> 311 312 <!-- Planned Maintenance start--> 313 <richui:tabContent> 314 <div class="dialog"> 315 <table> 316 <tbody> 317 <tr class="prop"> 318 <td valign="top" class="name">Id:</td> 319 320 <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.id}</td> 321 322 </tr> 323 324 <tr class="prop"> 325 <td valign="top" class="name">Name:</td> 326 327 <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.name}</td> 328 329 </tr> 330 331 <tr class="prop"> 332 <td valign="top" class="name">Description:</td> 333 334 <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.description}</td> 335 336 </tr> 337 338 <tr class="prop"> 339 <td valign="top" class="name">Recurring Schedule:</td> 340 341 <td valign="top" class="value"><g:link controller="recurringScheduleDetailed" action="edit" id="${taskInstance.recurringSchedule?.id}">${taskInstance.recurringSchedule?.encodeAsHTML()}</g:link></td> 342 343 </tr> 344 345 <tr class="prop"> 346 <td valign="top" class="name">Is Active:</td> 347 348 <td valign="top" class="value">${taskInstance.recurringSchedule?.plannedMaintenance?.isActive}</td> 144 349 145 350 </tr> … … 149 354 </div> 150 355 <div class="buttons"> 151 <g:form >152 <input type="hidden" name="id" value="${taskInstance ?.id}" />356 <g:form controller="plannedMaintenanceDetailed"> 357 <input type="hidden" name="id" value="${taskInstance.recurringSchedule?.plannedMaintenance?.id}" /> 153 358 <span class="button"><g:actionSubmit class="edit" value="Edit" /></span> 154 359 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> … … 157 362 158 363 <div class="list"> 159 <h1> Faults</h1>364 <h1>Maintenance Actions</h1> 160 365 <table> 161 366 <thead> 162 367 <tr> 163 <th>Comment</th> 164 <th>Date Done</th> 165 <th>Duration</th> 166 <th>Entered By</th> 368 369 <!-- <g:sortableColumn property="plannedMaintenanceInstance.maintenanceAction.pmStepNumber" title="PM Step" /> --> 370 <th>Step</th> 371 <th>Action</th> 372 <th>System Section</th> 373 <th>Asset</th> 374 <th>Assembly</th> 375 <th>Maintenance Policy</th> 167 376 <th></th> 168 377 169 <!-- <g:sortableColumn property="comment " title="Comment" />170 171 <g:sortableColumn property="dateDone " title="Date Done" />172 173 <g:sortableColumn property="enteredBy " title="Entered By" />-->378 <!-- <g:sortableColumn property="commentW" title="Comment" /> 379 380 <g:sortableColumn property="dateDoneW" title="Date Done" /> 381 382 <g:sortableColumn property="enteredByW" title="Entered By" />--> 174 383 </tr> 175 384 </thead> 176 385 <tbody> 177 <g:each in="${taskInstance?.entries}" status="i" var="entry"> 178 <g:if test="${entry.entryType == EntryType.findByName('Fault')}"> 179 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 180 181 <td style="width:65%">${entry.comment}</td> 182 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td> 183 <td>${entry.durationHour}:${entry.durationMinute}</td> 184 <td>${entry.enteredBy}</td> 185 186 <td> 187 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 188 <img src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" /> 189 </g:link> 190 </td> 191 192 </tr> 193 </g:if> 194 </g:each> 195 </tbody> 196 </table> 197 </div> 198 199 <div class="list"> 200 <h1>Work Done</h1> 201 <table> 202 <thead> 203 <tr> 204 <th>Comment</th> 205 <th>Date Done</th> 206 <th>Duration</th> 207 <th>Entered By</th> 208 <th></th> 209 210 <!-- <g:sortableColumn property="commentW" title="Comment" /> 211 212 <g:sortableColumn property="dateDoneW" title="Date Done" /> 213 214 <g:sortableColumn property="enteredByW" title="Entered By" />--> 215 </tr> 216 </thead> 217 <tbody> 218 <g:each in="${taskInstance?.entries}" status="i" var="entry"> 219 <g:if test="${entry.entryType == EntryType.findByName('WorkDone')}"> 220 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/> 221 222 <td width="65%">${entry.comment}</td> 223 <td><g:formatDate date="${entry.dateDone}" format="EEE, dd MMM yyyy"/></td> 224 <td>${entry.durationHour}:${entry.durationMinute}</td> 225 <td>${entry.enteredBy}</td> 226 227 <td> 228 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 229 <img src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" /> 230 </g:link> 231 </td> 232 233 </tr> 234 </g:if> 235 </g:each> 386 <g:each in="${taskInstance.recurringSchedule?.plannedMaintenance?.maintenanceActions}" status="i" var="maintenanceAction"> 387 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/maintenanceActionDetailed/edit/${maintenanceAction.id}"'/> 388 389 <td>${fieldValue(bean:maintenanceAction, field:'pmStepNumber')}</td> 390 <td>${maintenanceAction.maintenanceAction}</td> 391 <td>${maintenanceAction.systemSection}</td> 392 <td>${maintenanceAction.asset}</td> 393 <td>${maintenanceAction.assembly}</td> 394 <td>${maintenanceAction.maintenancePolicy}</td> 395 396 <td> 397 <g:link controller="maintenanceActionDetailed" action="edit" id="${maintenanceAction.id}"> 398 <img src="${createLinkTo(dir:'images/skin',file:'database_edit.png')}" alt="Edit" /> 399 </g:link> 400 </td> 401 402 </tr> 403 </g:each> 236 404 </tbody> 237 405 </table> … … 240 408 <br /> 241 409 242 <div class="buttons"> 243 <g:form controller="entryDetailed"> 244 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" /> 245 <span class="button"> 246 <g:actionSubmit value="Add Entry" action="create" class="add"/> 247 </span> 248 </g:form> 249 </div> 410 <g:if test="${taskInstance.recurringSchedule?.plannedMaintenance?.id}"> 411 <div class="buttons"> 412 <g:form controller="maintenanceActionDetailed"> 413 <input type="hidden" name="plannedMaintenanceInstance.id" value="${taskInstance.recurringSchedule?.plannedMaintenance?.id}" /> 414 <span class="button"> 415 <g:actionSubmit value="Add Action" action="create" class="add"/> 416 </span> 417 </g:form> 418 </div> 419 </g:if> 420 421 </richui:tabContent> 422 <!-- Planned Maintenance end--> 423 424 </richui:tabContents> 425 </richui:tabView> 250 426 251 427 </div>
Note: See TracChangeset
for help on using the changeset viewer.