Index: /trunk/application.properties
===================================================================
--- /trunk/application.properties (revision 124)
+++ /trunk/application.properties (revision 125)
@@ -1,4 +1,4 @@
#utf-8
-#Mon May 04 01:41:27 EST 2009
+#Mon May 04 14:08:06 EST 2009
plugins.help-balloons=1.2
app.version=
@@ -7,4 +7,4 @@
app.grails.version=1.1
plugins.hibernate=1.1
+app.name=gnuMims
plugins.quartz=0.4.1-SNAPSHOT
-app.name=gnuMims
Index: /trunk/grails-app/conf/BootStrap.groovy
===================================================================
--- /trunk/grails-app/conf/BootStrap.groovy (revision 124)
+++ /trunk/grails-app/conf/BootStrap.groovy (revision 125)
@@ -415,5 +415,6 @@
recurringScheduleInstance = new RecurringSchedule(recurEvery: 1,
period: Period.get(1),
- task: Task.get(1))
+ task: Task.get(1),
+ nextDueDate: new Date())
BootStrapSaveAndTest(recurringScheduleInstance)
@@ -421,5 +422,6 @@
recurringScheduleInstance = new RecurringSchedule(recurEvery: 1,
period: Period.get(2),
- task: Task.get(2))
+ task: Task.get(2),
+ nextDueDate: new Date())
BootStrapSaveAndTest(recurringScheduleInstance)
Index: /trunk/grails-app/controllers/StoreLocationDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/StoreLocationDetailedController.groovy (revision 125)
+++ /trunk/grails-app/controllers/StoreLocationDetailedController.groovy (revision 125)
@@ -0,0 +1,99 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class StoreLocationDetailedController extends BaseController {
+
+ def index = { redirect(action:list,params:params) }
+
+ // the delete, save and update actions only accept POST requests
+ static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+ def list = {
+ params.max = Math.min( params.max ? params.max.toInteger() : 10, 100)
+ [ storeLocationInstanceList: StoreLocation.list( params ), storeLocationInstanceTotal: StoreLocation.count() ]
+ }
+
+ def show = {
+ def storeLocationInstance = StoreLocation.get( params.id )
+
+ if(!storeLocationInstance) {
+ flash.message = "StoreLocation not found with id ${params.id}"
+ redirect(action:list)
+ }
+ else { return [ storeLocationInstance : storeLocationInstance ] }
+ }
+
+ def delete = {
+ def storeLocationInstance = StoreLocation.get( params.id )
+ if(storeLocationInstance) {
+ try {
+ storeLocationInstance.delete()
+ flash.message = "StoreLocation ${params.id} deleted"
+ redirect(action:list)
+ }
+ catch(org.springframework.dao.DataIntegrityViolationException e) {
+ flash.message = "StoreLocation ${params.id} could not be deleted"
+ redirect(action:show,id:params.id)
+ }
+ }
+ else {
+ flash.message = "StoreLocation not found with id ${params.id}"
+ redirect(action:list)
+ }
+ }
+
+ def edit = {
+ def storeLocationInstance = StoreLocation.get( params.id )
+
+ if(!storeLocationInstance) {
+ flash.message = "StoreLocation not found with id ${params.id}"
+ redirect(action:list)
+ }
+ else {
+ return [ storeLocationInstance : storeLocationInstance ]
+ }
+ }
+
+ def update = {
+ def storeLocationInstance = StoreLocation.get( params.id )
+ if(storeLocationInstance) {
+ if(params.version) {
+ def version = params.version.toLong()
+ if(storeLocationInstance.version > version) {
+
+ storeLocationInstance.errors.rejectValue("version", "storeLocation.optimistic.locking.failure", "Another user has updated this StoreLocation while you were editing.")
+ render(view:'edit',model:[storeLocationInstance:storeLocationInstance])
+ return
+ }
+ }
+ storeLocationInstance.properties = params
+ if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
+ flash.message = "StoreLocation ${params.id} updated"
+ redirect(action:show,id:storeLocationInstance.id)
+ }
+ else {
+ render(view:'edit',model:[storeLocationInstance:storeLocationInstance])
+ }
+ }
+ else {
+ flash.message = "StoreLocation not found with id ${params.id}"
+ redirect(action:edit,id:params.id)
+ }
+ }
+
+ def create = {
+ def storeLocationInstance = new StoreLocation()
+ storeLocationInstance.properties = params
+ return ['storeLocationInstance':storeLocationInstance]
+ }
+
+ def save = {
+ def storeLocationInstance = new StoreLocation(params)
+ if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
+ flash.message = "StoreLocation ${storeLocationInstance.id} created"
+ redirect(action:show,id:storeLocationInstance.id)
+ }
+ else {
+ render(view:'create',model:[storeLocationInstance:storeLocationInstance])
+ }
+ }
+}
Index: /trunk/grails-app/controllers/StoredItemDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/StoredItemDetailedController.groovy (revision 125)
+++ /trunk/grails-app/controllers/StoredItemDetailedController.groovy (revision 125)
@@ -0,0 +1,99 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class StoredItemDetailedController extends BaseController {
+
+ def index = { redirect(action:list,params:params) }
+
+ // the delete, save and update actions only accept POST requests
+ static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+ def list = {
+ params.max = Math.min( params.max ? params.max.toInteger() : 10, 100)
+ [ storedItemInstanceList: StoredItem.list( params ), storedItemInstanceTotal: StoredItem.count() ]
+ }
+
+ def show = {
+ def storedItemInstance = StoredItem.get( params.id )
+
+ if(!storedItemInstance) {
+ flash.message = "StoredItem not found with id ${params.id}"
+ redirect(action:list)
+ }
+ else { return [ storedItemInstance : storedItemInstance ] }
+ }
+
+ def delete = {
+ def storedItemInstance = StoredItem.get( params.id )
+ if(storedItemInstance) {
+ try {
+ storedItemInstance.delete()
+ flash.message = "StoredItem ${params.id} deleted"
+ redirect(action:list)
+ }
+ catch(org.springframework.dao.DataIntegrityViolationException e) {
+ flash.message = "StoredItem ${params.id} could not be deleted"
+ redirect(action:show,id:params.id)
+ }
+ }
+ else {
+ flash.message = "StoredItem not found with id ${params.id}"
+ redirect(action:list)
+ }
+ }
+
+ def edit = {
+ def storedItemInstance = StoredItem.get( params.id )
+
+ if(!storedItemInstance) {
+ flash.message = "StoredItem not found with id ${params.id}"
+ redirect(action:list)
+ }
+ else {
+ return [ storedItemInstance : storedItemInstance ]
+ }
+ }
+
+ def update = {
+ def storedItemInstance = StoredItem.get( params.id )
+ if(storedItemInstance) {
+ if(params.version) {
+ def version = params.version.toLong()
+ if(storedItemInstance.version > version) {
+
+ storedItemInstance.errors.rejectValue("version", "storedItem.optimistic.locking.failure", "Another user has updated this StoredItem while you were editing.")
+ render(view:'edit',model:[storedItemInstance:storedItemInstance])
+ return
+ }
+ }
+ storedItemInstance.properties = params
+ if(!storedItemInstance.hasErrors() && storedItemInstance.save()) {
+ flash.message = "StoredItem ${params.id} updated"
+ redirect(action:show,id:storedItemInstance.id)
+ }
+ else {
+ render(view:'edit',model:[storedItemInstance:storedItemInstance])
+ }
+ }
+ else {
+ flash.message = "StoredItem not found with id ${params.id}"
+ redirect(action:edit,id:params.id)
+ }
+ }
+
+ def create = {
+ def storedItemInstance = new StoredItem()
+ storedItemInstance.properties = params
+ return ['storedItemInstance':storedItemInstance]
+ }
+
+ def save = {
+ def storedItemInstance = new StoredItem(params)
+ if(!storedItemInstance.hasErrors() && storedItemInstance.save()) {
+ flash.message = "StoredItem ${storedItemInstance.id} created"
+ redirect(action:show,id:storedItemInstance.id)
+ }
+ else {
+ render(view:'create',model:[storedItemInstance:storedItemInstance])
+ }
+ }
+}
Index: /trunk/grails-app/domain/RecurringSchedule.groovy
===================================================================
--- /trunk/grails-app/domain/RecurringSchedule.groovy (revision 124)
+++ /trunk/grails-app/domain/RecurringSchedule.groovy (revision 125)
@@ -18,5 +18,4 @@
plannedMaintenance(blank:true, nullable:true)
lastExecutedDate(blank:true, nullable:true)
- nextDueDate(blank:true, nullable:true)
}
Index: /trunk/grails-app/domain/StoredItem.groovy
===================================================================
--- /trunk/grails-app/domain/StoredItem.groovy (revision 124)
+++ /trunk/grails-app/domain/StoredItem.groovy (revision 125)
@@ -12,5 +12,5 @@
String toString() {
- "${this.quantity}"
+ "${this.quantity} item(s) at ${storeLocation} in ${storeLocation.inventoryStore}"
}
}
Index: /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy
===================================================================
--- /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 124)
+++ /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 125)
@@ -1,8 +1,10 @@
class TaskRecurringScheduleJob {
- def timeout = 5000 // execute job once in 5 seconds
+// def timeout = 5000 // execute job once in 5 seconds
+ def timeout = 60000
def execute() {
- println "5"
+// println "TaskRecurringScheduleJob: tick"
+// println "TaskRecurringScheduleJob: tock"
def recurringScheduleInstanceList = RecurringSchedule.list()
def now = new Date()
@@ -10,5 +12,5 @@
recurringScheduleInstanceList.each() {
- if ( now < it.nextDueDate) {
+ if ( now > it.nextDueDate) {
def taskInstance = it.task
def subTaskInstance = new Task()
@@ -25,5 +27,6 @@
subTaskInstance.taskType = TaskType.get(1)
subTaskInstance.leadPerson = taskInstance.leadPerson
- if(subTaskInstance.save()){println "yes"}
+ subTaskInstance.save()
+// if(subTaskInstance.save()){println "yes"}
//Set the assignedPersons
@@ -37,5 +40,5 @@
//Set the nextDueDate so that we don't loop ;-)
-// it.nextDueDate = new DateTime(date:2.weeks.from.now)
+ it.nextDueDate = it.nextDueDate + 1
}
Index: /trunk/grails-app/views/inventoryItemDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 124)
+++ /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 125)
@@ -168,8 +168,8 @@
- - ${i?.encodeAsHTML()}
+ - ${i?.encodeAsHTML()}
-Add InventoryMovement
+Add InventoryMovement
@@ -210,8 +210,8 @@
- - ${s?.encodeAsHTML()}
+ - ${s?.encodeAsHTML()}
-Add StoredItem
+Add StoredItem
Index: /trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 124)
+++ /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 125)
@@ -75,5 +75,5 @@
Inventory Group: |
- ${inventoryItemInstance?.inventoryGroup?.encodeAsHTML()} |
+ ${inventoryItemInstance?.inventoryGroup?.encodeAsHTML()} |
@@ -82,5 +82,5 @@
Inventory Type: |
- ${inventoryItemInstance?.inventoryType?.encodeAsHTML()} |
+ ${inventoryItemInstance?.inventoryType?.encodeAsHTML()} |
@@ -89,5 +89,5 @@
Unit Of Measure: |
- ${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()} |
+ ${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()} |
@@ -179,5 +179,5 @@
- - ${s?.encodeAsHTML()}
+ - ${s?.encodeAsHTML()}
Index: /trunk/grails-app/views/storeLocationDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/storeLocationDetailed/create.gsp (revision 125)
+++ /trunk/grails-app/views/storeLocationDetailed/create.gsp (revision 125)
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+ Create StoreLocation
+
+
+
+
+
+
+
+
Create StoreLocation
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Edit StoreLocation
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
StoreLocation List
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+ | Inventory Store |
+
+
+
+
+
+
+
+
+
+ | ${fieldValue(bean:storeLocationInstance, field:'id')} |
+
+ ${fieldValue(bean:storeLocationInstance, field:'bin')} |
+
+ ${fieldValue(bean:storeLocationInstance, field:'inventoryStore')} |
+
+ ${fieldValue(bean:storeLocationInstance, field:'isActive')} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Show StoreLocation
+
+ ${flash.message}
+
+
+
+
+
+
+
+ | Id: |
+
+ ${fieldValue(bean:storeLocationInstance, field:'id')} |
+
+
+
+
+ | Bin: |
+
+ ${fieldValue(bean:storeLocationInstance, field:'bin')} |
+
+
+
+
+ | Inventory Store: |
+
+ ${storeLocationInstance?.inventoryStore?.encodeAsHTML()} |
+
+
+
+
+ | Is Active: |
+
+ ${fieldValue(bean:storeLocationInstance, field:'isActive')} |
+
+
+
+
+ | Stored Items: |
+
+
+
+
+ - ${s?.encodeAsHTML()}
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Create StoredItem
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Edit StoredItem
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
StoredItem List
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+ | Inventory Item |
+
+ Store Location |
+
+
+
+
+
+
+
+ | ${fieldValue(bean:storedItemInstance, field:'id')} |
+
+ ${fieldValue(bean:storedItemInstance, field:'quantity')} |
+
+ ${fieldValue(bean:storedItemInstance, field:'inventoryItem')} |
+
+ ${fieldValue(bean:storedItemInstance, field:'storeLocation')} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Show StoredItem
+
+ ${flash.message}
+
+
+
+
+
+
+
+ | Id: |
+
+ ${fieldValue(bean:storedItemInstance, field:'id')} |
+
+
+
+
+ | Quantity: |
+
+ ${fieldValue(bean:storedItemInstance, field:'quantity')} |
+
+
+
+
+ | Inventory Item: |
+
+ ${storedItemInstance?.inventoryItem?.encodeAsHTML()} |
+
+
+
+
+ | Store Location: |
+
+ ${storedItemInstance?.storeLocation?.encodeAsHTML()} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+