Changeset 125 for trunk/grails-app
- Timestamp:
- May 4, 2009, 4:49:22 PM (16 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 12 added
- 6 edited
-
conf/BootStrap.groovy (modified) (2 diffs)
-
controllers/StoreLocationDetailedController.groovy (added)
-
controllers/StoredItemDetailedController.groovy (added)
-
domain/RecurringSchedule.groovy (modified) (1 diff)
-
domain/StoredItem.groovy (modified) (1 diff)
-
jobs/TaskRecurringScheduleJob.groovy (modified) (4 diffs)
-
views/inventoryItemDetailed/edit.gsp (modified) (2 diffs)
-
views/inventoryItemDetailed/show.gsp (modified) (4 diffs)
-
views/storeLocationDetailed (added)
-
views/storeLocationDetailed/create.gsp (added)
-
views/storeLocationDetailed/edit.gsp (added)
-
views/storeLocationDetailed/list.gsp (added)
-
views/storeLocationDetailed/show.gsp (added)
-
views/storedItemDetailed (added)
-
views/storedItemDetailed/create.gsp (added)
-
views/storedItemDetailed/edit.gsp (added)
-
views/storedItemDetailed/list.gsp (added)
-
views/storedItemDetailed/show.gsp (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/conf/BootStrap.groovy
r124 r125 415 415 recurringScheduleInstance = new RecurringSchedule(recurEvery: 1, 416 416 period: Period.get(1), 417 task: Task.get(1)) 417 task: Task.get(1), 418 nextDueDate: new Date()) 418 419 BootStrapSaveAndTest(recurringScheduleInstance) 419 420 … … 421 422 recurringScheduleInstance = new RecurringSchedule(recurEvery: 1, 422 423 period: Period.get(2), 423 task: Task.get(2)) 424 task: Task.get(2), 425 nextDueDate: new Date()) 424 426 BootStrapSaveAndTest(recurringScheduleInstance) 425 427 -
trunk/grails-app/domain/RecurringSchedule.groovy
r124 r125 18 18 plannedMaintenance(blank:true, nullable:true) 19 19 lastExecutedDate(blank:true, nullable:true) 20 nextDueDate(blank:true, nullable:true)21 20 } 22 21 -
trunk/grails-app/domain/StoredItem.groovy
r116 r125 12 12 13 13 String toString() { 14 "${this.quantity} "14 "${this.quantity} item(s) at ${storeLocation} in ${storeLocation.inventoryStore}" 15 15 } 16 16 } -
trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy
r123 r125 1 1 2 2 class TaskRecurringScheduleJob { 3 def timeout = 5000 // execute job once in 5 seconds 3 // def timeout = 5000 // execute job once in 5 seconds 4 def timeout = 60000 4 5 5 6 def execute() { 6 println "5" 7 // println "TaskRecurringScheduleJob: tick" 8 // println "TaskRecurringScheduleJob: tock" 7 9 def recurringScheduleInstanceList = RecurringSchedule.list() 8 10 def now = new Date() … … 10 12 recurringScheduleInstanceList.each() { 11 13 12 if ( now <it.nextDueDate) {14 if ( now > it.nextDueDate) { 13 15 def taskInstance = it.task 14 16 def subTaskInstance = new Task() … … 25 27 subTaskInstance.taskType = TaskType.get(1) 26 28 subTaskInstance.leadPerson = taskInstance.leadPerson 27 if(subTaskInstance.save()){println "yes"} 29 subTaskInstance.save() 30 // if(subTaskInstance.save()){println "yes"} 28 31 29 32 //Set the assignedPersons … … 37 40 38 41 //Set the nextDueDate so that we don't loop ;-) 39 // it.nextDueDate = new DateTime(date:2.weeks.from.now) 42 it.nextDueDate = it.nextDueDate + 1 40 43 41 44 } -
trunk/grails-app/views/inventoryItemDetailed/edit.gsp
r116 r125 168 168 <ul> 169 169 <g:each var="i" in="${inventoryItemInstance?.inventoryMovements?}"> 170 <li><g:link controller="inventoryMovement " action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>170 <li><g:link controller="inventoryMovementDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 171 171 </g:each> 172 172 </ul> 173 <g:link controller="inventoryMovement " params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add InventoryMovement</g:link>173 <g:link controller="inventoryMovementDetailed" params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add InventoryMovement</g:link> 174 174 175 175 </td> … … 210 210 <ul> 211 211 <g:each var="s" in="${inventoryItemInstance?.storedItems?}"> 212 <li><g:link controller="storedItem " action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>212 <li><g:link controller="storedItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 213 213 </g:each> 214 214 </ul> 215 <g:link controller="storedItem " params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add StoredItem</g:link>215 <g:link controller="storedItemDetailed" params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add StoredItem</g:link> 216 216 217 217 </td> -
trunk/grails-app/views/inventoryItemDetailed/show.gsp
r124 r125 75 75 <td valign="top" class="name">Inventory Group:</td> 76 76 77 <td valign="top" class="value"> <g:link controller="inventoryGroup" action="show" id="${inventoryItemInstance?.inventoryGroup?.id}">${inventoryItemInstance?.inventoryGroup?.encodeAsHTML()}</g:link></td>77 <td valign="top" class="value">${inventoryItemInstance?.inventoryGroup?.encodeAsHTML()}</td> 78 78 79 79 </tr> … … 82 82 <td valign="top" class="name">Inventory Type:</td> 83 83 84 <td valign="top" class="value"> <g:link controller="inventoryType" action="show" id="${inventoryItemInstance?.inventoryType?.id}">${inventoryItemInstance?.inventoryType?.encodeAsHTML()}</g:link></td>84 <td valign="top" class="value">${inventoryItemInstance?.inventoryType?.encodeAsHTML()}</td> 85 85 86 86 </tr> … … 89 89 <td valign="top" class="name">Unit Of Measure:</td> 90 90 91 <td valign="top" class="value"> <g:link controller="unitOfMeasure" action="show" id="${inventoryItemInstance?.unitOfMeasure?.id}">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</g:link></td>91 <td valign="top" class="value">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</td> 92 92 93 93 </tr> … … 179 179 <ul> 180 180 <g:each var="s" in="${inventoryItemInstance.storedItems}"> 181 <li><g:link controller="storedItem " action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>181 <li><g:link controller="storedItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 182 182 </g:each> 183 183 </ul>
Note: See TracChangeset
for help on using the changeset viewer.
