Changeset 175 for trunk/grails-app/controllers

Timestamp:

Oct 29, 2009, 8:30:58 PM (15 years ago)

Author:

gav

Message:

Substantial refactor of the Inventory domain.
InventoryItems can now be added to tasks, no quantity adjustments done yet.
Removed StoredItem and with it the ability to store an inventoryItem in multiple places, just too complex right now.
Svn move StoreLocation to InventoryLocation.

Location:

trunk/grails-app/controllers

Files:

• InventoryItemController.groovy (modified) (2 diffs)
• InventoryItemDetailedController.groovy (modified) (2 diffs)
• InventoryLocationController.groovy (moved) (moved from trunk/grails-app/controllers/StoreLocationController.groovy) (3 diffs)
• InventoryLocationDetailedController.groovy (moved) (moved from trunk/grails-app/controllers/StoreLocationDetailedController.groovy) (3 diffs)
• InventoryMovementController.groovy (modified) (2 diffs)
• InventoryMovementDetailedController.groovy (added)
• InventoryStoreController.groovy (modified) (2 diffs)
• StoredItemController.groovy (deleted)
• StoredItemDetailedController.groovy (deleted)
• TaskDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryItemController.groovy

@@ -27 +27 @@
         if(inventoryItemInstance) {
             try {
-                inventoryItemInstance.delete()
+                inventoryItemInstance.delete(flush:true)
                 flash.message = "InventoryItem ${params.id} deleted"
                 redirect(action:list)
@@ -77 +77 @@
         else {
             flash.message = "InventoryItem not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -48 +48 @@
         if(inventoryItemInstance) {
             try {
-                inventoryItemInstance.delete()
+                inventoryItemInstance.delete(flush:true)
                 flash.message = "InventoryItem ${params.id} deleted"
                 redirect(action:search)
@@ -103 +103 @@
         else {
             flash.message = "InventoryItem not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:search)
         }
     }

trunk/grails-app/controllers/InventoryLocationController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class StoreLocationController extends BaseAppAdminController {
+class InventoryLocationController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ storeLocationInstanceList: StoreLocation.list( params ), storeLocationInstanceTotal: StoreLocation.count() ]
+        [ inventoryLocationInstanceList: InventoryLocation.list( params ), inventoryLocationInstanceTotal: InventoryLocation.count() ]
     }
 
     def show = {
-        def storeLocationInstance = StoreLocation.get( params.id )
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
 
-        if(!storeLocationInstance) {
-            flash.message = "StoreLocation not found with id ${params.id}"
+        if(!inventoryLocationInstance) {
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ storeLocationInstance : storeLocationInstance ] }
+        else { return [ inventoryLocationInstance : inventoryLocationInstance ] }
     }
 
     def delete = {
-        def storeLocationInstance = StoreLocation.get( params.id )
-        if(storeLocationInstance) {
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
+        if(inventoryLocationInstance) {
             try {
-                storeLocationInstance.delete()
-                flash.message = "StoreLocation ${params.id} deleted"
+                inventoryLocationInstance.delete(flush:true)
+                flash.message = "InventoryLocation ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "StoreLocation ${params.id} could not be deleted"
+                flash.message = "InventoryLocation ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "StoreLocation not found with id ${params.id}"
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def storeLocationInstance = StoreLocation.get( params.id )
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
 
-        if(!storeLocationInstance) {
-            flash.message = "StoreLocation not found with id ${params.id}"
+        if(!inventoryLocationInstance) {
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ storeLocationInstance : storeLocationInstance ]
+            return [ inventoryLocationInstance : inventoryLocationInstance ]
         }
     }
 
     def update = {
-        def storeLocationInstance = StoreLocation.get( params.id )
-        if(storeLocationInstance) {
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
+        if(inventoryLocationInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(storeLocationInstance.version > version) {
+                if(inventoryLocationInstance.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])
+                    inventoryLocationInstance.errors.rejectValue("version", "inventoryLocation.optimistic.locking.failure", "Another user has updated this InventoryLocation while you were editing.")
+                    render(view:'edit',model:[inventoryLocationInstance:inventoryLocationInstance])
                     return
                 }
             }
-            storeLocationInstance.properties = params
-            if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
-                flash.message = "StoreLocation ${params.id} updated"
-                redirect(action:show,id:storeLocationInstance.id)
+            inventoryLocationInstance.properties = params
+            if(!inventoryLocationInstance.hasErrors() && inventoryLocationInstance.save()) {
+                flash.message = "InventoryLocation ${params.id} updated"
+                redirect(action:show,id:inventoryLocationInstance.id)
             }
             else {
-                render(view:'edit',model:[storeLocationInstance:storeLocationInstance])
+                render(view:'edit',model:[inventoryLocationInstance:inventoryLocationInstance])
             }
         }
         else {
-            flash.message = "StoreLocation not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            flash.message = "InventoryLocation not found with id ${params.id}"
+            redirect(action:list)
         }
     }
 
     def create = {
-        def storeLocationInstance = new StoreLocation()
-        storeLocationInstance.properties = params
-        return ['storeLocationInstance':storeLocationInstance]
+        def inventoryLocationInstance = new InventoryLocation()
+        inventoryLocationInstance.properties = params
+        return ['inventoryLocationInstance':inventoryLocationInstance]
     }
 
     def save = {
-        def storeLocationInstance = new StoreLocation(params)
-        if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
-            flash.message = "StoreLocation ${storeLocationInstance.id} created"
-            redirect(action:show,id:storeLocationInstance.id)
+        def inventoryLocationInstance = new InventoryLocation(params)
+        if(!inventoryLocationInstance.hasErrors() && inventoryLocationInstance.save()) {
+            flash.message = "InventoryLocation ${inventoryLocationInstance.id} created"
+            redirect(action:show,id:inventoryLocationInstance.id)
         }
         else {
-            render(view:'create',model:[storeLocationInstance:storeLocationInstance])
+            render(view:'create',model:[inventoryLocationInstance:inventoryLocationInstance])
         }
     }

trunk/grails-app/controllers/InventoryLocationDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class StoreLocationDetailedController extends BaseController {
+class InventoryLocationDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ storeLocationInstanceList: StoreLocation.list( params ), storeLocationInstanceTotal: StoreLocation.count() ]
+        [ inventoryLocationInstanceList: InventoryLocation.list( params ), inventoryLocationInstanceTotal: InventoryLocation.count() ]
     }
 
     def show = {
-        def storeLocationInstance = StoreLocation.get( params.id )
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
 
-        if(!storeLocationInstance) {
-            flash.message = "StoreLocation not found with id ${params.id}"
+        if(!inventoryLocationInstance) {
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ storeLocationInstance : storeLocationInstance ] }
+        else { return [ inventoryLocationInstance : inventoryLocationInstance ] }
     }
 
     def delete = {
-        def storeLocationInstance = StoreLocation.get( params.id )
-        if(storeLocationInstance) {
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
+        if(inventoryLocationInstance) {
             try {
-                storeLocationInstance.delete()
-                flash.message = "StoreLocation ${params.id} deleted"
+                inventoryLocationInstance.delete(flush:true)
+                flash.message = "InventoryLocation ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "StoreLocation ${params.id} could not be deleted"
+                flash.message = "InventoryLocation ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "StoreLocation not found with id ${params.id}"
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def storeLocationInstance = StoreLocation.get( params.id )
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
 
-        if(!storeLocationInstance) {
-            flash.message = "StoreLocation not found with id ${params.id}"
+        if(!inventoryLocationInstance) {
+            flash.message = "InventoryLocation not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ storeLocationInstance : storeLocationInstance ]
+            return [ inventoryLocationInstance : inventoryLocationInstance ]
         }
     }
 
     def update = {
-        def storeLocationInstance = StoreLocation.get( params.id )
-        if(storeLocationInstance) {
+        def inventoryLocationInstance = InventoryLocation.get( params.id )
+        if(inventoryLocationInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(storeLocationInstance.version > version) {
+                if(inventoryLocationInstance.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])
+                    inventoryLocationInstance.errors.rejectValue("version", "inventoryLocation.optimistic.locking.failure", "Another user has updated this InventoryLocation while you were editing.")
+                    render(view:'edit',model:[inventoryLocationInstance:inventoryLocationInstance])
                     return
                 }
             }
-            storeLocationInstance.properties = params
-            if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
-                flash.message = "StoreLocation ${params.id} updated"
-                redirect(action:show,id:storeLocationInstance.id)
+            inventoryLocationInstance.properties = params
+            if(!inventoryLocationInstance.hasErrors() && inventoryLocationInstance.save()) {
+                flash.message = "InventoryLocation ${params.id} updated"
+                redirect(action:show,id:inventoryLocationInstance.id)
             }
             else {
-                render(view:'edit',model:[storeLocationInstance:storeLocationInstance])
+                render(view:'edit',model:[inventoryLocationInstance:inventoryLocationInstance])
             }
         }
         else {
-            flash.message = "StoreLocation not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            flash.message = "InventoryLocation not found with id ${params.id}"
+            redirect(action:list)
         }
     }
 
     def create = {
-        def storeLocationInstance = new StoreLocation()
-        storeLocationInstance.properties = params
-        return ['storeLocationInstance':storeLocationInstance]
+        def inventoryLocationInstance = new InventoryLocation()
+        inventoryLocationInstance.properties = params
+        return ['inventoryLocationInstance':inventoryLocationInstance]
     }
 
     def save = {
-        def storeLocationInstance = new StoreLocation(params)
-        if(!storeLocationInstance.hasErrors() && storeLocationInstance.save()) {
-            flash.message = "StoreLocation ${storeLocationInstance.id} created"
-            redirect(action:show,id:storeLocationInstance.id)
+        def inventoryLocationInstance = new InventoryLocation(params)
+        if(!inventoryLocationInstance.hasErrors() && inventoryLocationInstance.save()) {
+            flash.message = "InventoryLocation ${inventoryLocationInstance.id} created"
+            redirect(action:show,id:inventoryLocationInstance.id)
         }
         else {
-            render(view:'create',model:[storeLocationInstance:storeLocationInstance])
+            render(view:'create',model:[inventoryLocationInstance:inventoryLocationInstance])
         }
     }

trunk/grails-app/controllers/InventoryMovementController.groovy

@@ -27 +27 @@
         if(inventoryMovementInstance) {
             try {
-                inventoryMovementInstance.delete()
+                inventoryMovementInstance.delete(flush:true)
                 flash.message = "InventoryMovement ${params.id} deleted"
                 redirect(action:list)
@@ -77 +77 @@
         else {
             flash.message = "InventoryMovement not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }

trunk/grails-app/controllers/InventoryStoreController.groovy

@@ -27 +27 @@
         if(inventoryStoreInstance) {
             try {
-                inventoryStoreInstance.delete()
+                inventoryStoreInstance.delete(flush:true)
                 flash.message = "InventoryStore ${params.id} deleted"
                 redirect(action:list)
@@ -77 +77 @@
         else {
             flash.message = "InventoryStore not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -182 +182 @@
 
                         def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
-                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)                                 
+                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)
             def showTaskTab = new String("true")
+
+            def inventoryMovementList = InventoryMovement.findAllByTask(taskInstance, [max:100, sort:"id", order:"desc", offset:0])
 
             def taskProcedureInstance = TaskProcedure.get(taskInstance.taskProcedure?.id)
@@ -190 +192 @@
                 taskProcedureExits = false
             }
-//                      else {
-                                params.order = "asc"
-                                params.sort = "procedureStepNumber"
-                                def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, params)
-//                      }
-                                                
+
+            params.order = "asc"
+            params.sort = "procedureStepNumber"
+            def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, params)
+
             def taskRecurringScheduleInstance = TaskRecurringSchedule.get(taskInstance.taskRecurringSchedule?.id)
             def taskRecurringScheduleExits= new Boolean("true")
-                        if(!taskRecurringScheduleInstance) {
+            if(!taskRecurringScheduleInstance) {
                 taskRecurringScheduleExits = false
             }
@@ -213 +214 @@
                                                         maintenanceActionList: maintenanceActionList,
                                                         taskRecurringScheduleInstance: taskRecurringScheduleInstance,
-                                                        taskRecurringScheduleExits: taskRecurringScheduleExits] 
+                                                        taskRecurringScheduleExits: taskRecurringScheduleExits,
+                            inventoryMovementList: inventoryMovementList]
         }
     }