Index: /trunk/grails-app/controllers/InventoryItemDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 224) +++ /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 225) @@ -4,9 +4,11 @@ def filterService + def inventoryItemService + def inventoryMovementService def index = { redirect(action:search, params:params) } // the delete, save and update actions only accept POST requests - static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + static allowedMethods = [delete:'POST', save:'POST', update:'POST', useInventoryItem:'POST'] def list = { @@ -29,17 +31,52 @@ } + /** + * Simply assigns a passed in task id to a session variable and redirects to search. + */ + def findInventoryItemForMovement = { + if(!params.task?.id) { + flash.message = "No task id supplied, please select a task then the inventory tab." + redirect(controller: "taskDetailed", action: "search") + return + } + + session.inventoryMovementTaskId = params.task.id + flash.message = "Please find and then select the inventory item." + redirect(action: search) + } + def show = { - + // In the case of an actionSubmit button, rewrite action name from 'index'. if(params._action_Show) { params.action='show' } - - def inventoryItemInstance = InventoryItem.get( params.id ) - if(!inventoryItemInstance) { + if(!InventoryItem.exists(params.id)) { flash.message = "InventoryItem not found with id ${params.id}" redirect(action:search) + return } - else { return [ inventoryItemInstance : inventoryItemInstance ] } + + def result = inventoryItemService.prepareShowData(params) + + if(result.error) { + flash.message = "Could not to prepare the data to show item with id: ${params.id}." + redirect(action:search) + return + } + + def model = [ inventoryItemInstance: result.inventoryItemInstance, + inventoryMovementList: result.inventoryMovementList, + inventoryMovementListTotal: result.inventoryMovementListTotal, + inventoryMovementListMax: result.inventoryMovementListMax, + showTab: result.showTab] + + if(session.inventoryMovementTaskId) { + model.inventoryMovementInstance = new InventoryMovement() + model.inventoryMovementInstance.task = Task.get(session.inventoryMovementTaskId) + model.inventoryMovementInstance.quantity = 1 + } + + return model } @@ -123,3 +160,40 @@ } } + + /** + * Handles the use inventory item form submit in the show view. + */ + def useInventoryItem = { + + params.inventoryMovementType = InventoryMovementType.get(1) // used. + def result = inventoryMovementService.move(params) + + if(!result.error) { + flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name.encodeAsHTML()} created." + redirect(controller:"taskDetailed", action:"show", id: result.taskId) + } + else { + if(result.inventoryMovementInstance) { + def p = [:] + p.id = result.inventoryMovementInstance.inventoryItem?.id + def r = inventoryItemService.prepareShowData(p) + + def model = [ inventoryItemInstance: r.inventoryItemInstance, + inventoryMovementList: r.inventoryMovementList, + inventoryMovementListTotal: r.inventoryMovementListTotal, + inventoryMovementListMax: r.inventoryMovementListMax, + showTab: r.showTab] + + model.inventoryMovementInstance = result.inventoryMovementInstance + + render(view: 'show', model: model) + } + else { + flash.message = "Could not create inventory movement." + redirect(action:"search") + } + + } + } + } Index: /trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 224) +++ /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 225) @@ -154,4 +154,22 @@ { params.action='show' } + def showTab = [:] + switch (params.showTab) { + case "showProcedureTab": + showTab.procedure = new String("true") + break + case "showRecurrenceTab": + showTab.recurrence = new String("true") + break + case "showInventoryTab": + showTab.inventory = new String("true") + break + case "showSubTasksTab": + showTab.subTasks = new String("true") + break + default: + showTab.task = new String("true") + } + def taskInstance = Task.get( params.id ) @@ -177,5 +195,4 @@ def subTaskInstanceList = Task.findAllByParentTaskAndTrash(taskInstance, false, params) def subTaskInstanceTotal = Task.countByParentTaskAndTrash(taskInstance, false) - def showTaskTab = new String("true") def inventoryMovementList = InventoryMovement.findAllByTask(taskInstance, [max:100, sort:"id", order:"desc", offset:0]) @@ -204,5 +221,5 @@ taskProcedureInstance: taskProcedureInstance, taskProcedureExits: taskProcedureExits, - showTaskTab: showTaskTab, + showTab: showTab, subTaskInstanceList: subTaskInstanceList, subTaskInstanceTotal: subTaskInstanceTotal, Index: /trunk/grails-app/i18n/messages.properties =================================================================== --- /trunk/grails-app/i18n/messages.properties (revision 224) +++ /trunk/grails-app/i18n/messages.properties (revision 225) @@ -66,4 +66,7 @@ task.associatedAssets=Associated Assets task.associatedAssets.help=These assets are to be associated with this task, but costs will not be assigned. + + +inventoryItem.notFound=Could not complete operation, inventory item not found. inventoryMovement.quantity.insufficientItemsInStock=Could not complete operation, insufficient items in stock. Index: /trunk/grails-app/services/InventoryItemService.groovy =================================================================== --- /trunk/grails-app/services/InventoryItemService.groovy (revision 225) +++ /trunk/grails-app/services/InventoryItemService.groovy (revision 225) @@ -0,0 +1,57 @@ +/** +* Provides a service class for the InventoryItem domain class. +*/ +class InventoryItemService { + + boolean transactional = false + + /** + * Prepare the data for the show view. + * The result can be used to easily construct the model for the show view. + * @param params The incoming params as normally passed to the show view + * primarily including the id of the inventoryItem. + * @returns A map containing result.error=true (if any error) and result.inventoryItemInstance (if available) + * and + */ + def prepareShowData(params) { + def result = [:] + + def fail = { Object[] args -> + if(args.size() == 2) result.errors = [args[0], args[1]] + log.debug result.errors + result.error = true + return result + } + + result.showTab = [:] + switch (params.showTab) { + case "showDetailTab": + result.showTab.detail = new String("true") + break + case "showMovementTab": + result.showTab.movement = new String("true") + break + default: + result.showTab.inventory = new String("true") + } + + result.inventoryItemInstance = InventoryItem.get( params.id ) + + if(!result.inventoryItemInstance) + return fail("inventoryItem", "inventoryItem.notFound") + + log.debug "WTF are we doing here" + + def p = [:] + p.max = result.inventoryMovementListMax = 10 + p.order = "desc" + p.sort = "id" + result.inventoryMovementList = InventoryMovement.findAllByInventoryItem(result.inventoryItemInstance, p) + result.inventoryMovementListTotal = InventoryMovement.countByInventoryItem(result.inventoryItemInstance) + + // Success + return result + + } // end prepareShowData() + +} // end class Index: /trunk/grails-app/services/InventoryMovementService.groovy =================================================================== --- /trunk/grails-app/services/InventoryMovementService.groovy (revision 224) +++ /trunk/grails-app/services/InventoryMovementService.groovy (revision 225) @@ -10,6 +10,26 @@ result.inventoryMovementInstance = InventoryMovement.lock(params.id) if(result.inventoryMovementInstance) { + + // Used type must have a task that is not complete or in the trash + if(result.inventoryMovementInstance.inventoryMovementType.id == 1) { + + // Unlike move, if the task does not exist at all then deletion is still allowed. + if(result.inventoryMovementInstance.task?.trash) { + status.setRollbackOnly() + result.inventoryMovementInstance.errors.rejectValue("task", "task.operationNotPermittedOnTaskInTrash") + result.error = true + return result + } + + if(result.inventoryMovementInstance.task?.taskStatus?.id == 3) { + status.setRollbackOnly() + result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask") + result.error = true + return result + } + } + def inventoryItem = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id) - result.taskId = result.inventoryMovementInstance.task.id + result.taskId = result.inventoryMovementInstance.task?.id if(!inventoryItem) { @@ -70,4 +90,29 @@ result.inventoryMovementInstance.person = personService.currentUser + // Used type must have a task that is not complete or in the trash + if(result.inventoryMovementInstance.inventoryMovementType.id == 1) { + + if(!result.inventoryMovementInstance.task) { + status.setRollbackOnly() + result.inventoryMovementInstance.errors.rejectValue('task', "task.notFound") + result.error = true + return result + } + + if(result.inventoryMovementInstance.task.trash) { + status.setRollbackOnly() + result.inventoryMovementInstance.errors.rejectValue("task", "task.operationNotPermittedOnTaskInTrash") + result.error = true + return result + } + + if(result.inventoryMovementInstance.task.taskStatus.id == 3) { + status.setRollbackOnly() + result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask") + result.error = true + return result + } + } + if(result.inventoryMovementInstance.validate()) { def inventoryItem = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id) @@ -77,11 +122,4 @@ status.setRollbackOnly() result.inventoryMovementInstance.errors.rejectValue('inventoryItem', "inventoryMovement.inventoryItem.notFound") - result.error = true - return result - } - - if(result.inventoryMovementInstance.task.taskStatus.id == 3) { - status.setRollbackOnly() - result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask") result.error = true return result Index: /trunk/grails-app/views/inventoryItemDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 224) +++ /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 225) @@ -7,4 +7,5 @@ Show InventoryItem + @@ -14,222 +15,345 @@
+ +
+ +
+ -
${flash.message}
+
${flash.message}
 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Picture: - - - - - - Add Picture - - -
Id:${fieldValue(bean:inventoryItemInstance, field:'id')}
Name:${fieldValue(bean:inventoryItemInstance, field:'name')}
Description:${fieldValue(bean:inventoryItemInstance, field:'description')}
Location: - - ${inventoryItemInstance?.inventoryLocation?.encodeAsHTML()} - - in ${inventoryItemInstance?.inventoryLocation?.inventoryStore.encodeAsHTML()} -
In Stock: - ${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')} ${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()} -
Reorder Point:${fieldValue(bean:inventoryItemInstance, field:'reorderPoint')}
Enable Reorder:${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}
Recommended Reorder Point:${fieldValue(bean:inventoryItemInstance, field:'recommendedReorderPoint')}
Active:${fieldValue(bean:inventoryItemInstance, field:'isActive')}
Obsolete:${fieldValue(bean:inventoryItemInstance, field:'isObsolete')}
Inventory Group:${inventoryItemInstance?.inventoryGroup?.encodeAsHTML()}
Inventory Type:${inventoryItemInstance?.inventoryType?.encodeAsHTML()}
Manufacturers Part Number:${fieldValue(bean:inventoryItemInstance, field:'manufacturersPartNumber')}
Suppliers Part Number:${fieldValue(bean:inventoryItemInstance, field:'suppliersPartNumber')}
Recommended Reorder Point:${fieldValue(bean:inventoryItemInstance, field:'recommendedReorderPoint')}
Average Delivery Time:${fieldValue(bean:inventoryItemInstance, field:'averageDeliveryTime')}
Alternate Items: -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-
Inventory Movements: -
    - -
  • ${i?.encodeAsHTML()}
    • -     -
-
Manufacturers: -
    - -
  • ${m?.encodeAsHTML()}
    • -     -
-
Spare For: -
    - -
  • ${s?.encodeAsHTML()}
    • -     -
-
Suppliers: -
    - -
  • ${s?.encodeAsHTML()}
    • -     -
-
+ + +
+
-
- - - - - -
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
Use on task: + + ${Task.get(inventoryMovementInstance.task.id).encodeAsHTML()} + +
+ + + + ${inventoryItemInstance.unitOfMeasure?.encodeAsHTML()} + + + + + +
+
+ + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Picture: + + + + + + Add Picture + + +
Name:${fieldValue(bean:inventoryItemInstance, field:'name')}
Description:${fieldValue(bean:inventoryItemInstance, field:'description')}
In Stock: + ${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')} ${inventoryItemInstance.unitOfMeasure.encodeAsHTML()} +
Location: + + ${inventoryItemInstance.inventoryLocation?.encodeAsHTML()} + + in ${inventoryItemInstance.inventoryLocation?.inventoryStore.encodeAsHTML()} +
Active:${fieldValue(bean:inventoryItemInstance, field:'isActive')}
Alternate Items: +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+
Spare For: +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
+
+
+ + + + + +
+ +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:inventoryItemInstance, field:'id')}
Obsolete:${fieldValue(bean:inventoryItemInstance, field:'isObsolete')}
Inventory Group:${inventoryItemInstance.inventoryGroup?.encodeAsHTML()}
Inventory Type:${inventoryItemInstance.inventoryType?.encodeAsHTML()}
Reorder Point:${fieldValue(bean:inventoryItemInstance, field:'reorderPoint')}
Enable Reorder:${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}
Recommended Reorder Point:${fieldValue(bean:inventoryItemInstance, field:'recommendedReorderPoint')}
Suppliers Part Number:${fieldValue(bean:inventoryItemInstance, field:'suppliersPartNumber')}
Suppliers: +
    + +
  • ${s?.encodeAsHTML()}
    • +     +
+
Average Delivery Time: + ${fieldValue(bean:inventoryItemInstance, field:'averageDeliveryTime')} + ${fieldValue(bean:inventoryItemInstance, field:'averageDeliveryPeriod')} +
Manufacturers Part Number:${fieldValue(bean:inventoryItemInstance, field:'manufacturersPartNumber')}
Manufacturers: +
    + +
  • ${m?.encodeAsHTML()}
    • +     +
+
+
+
+ + + + + +
+ + + + + + + +
+ No Inventory Movements. +
+
+ +
+ + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
QuantityMovement TypeDatePerson
${fieldValue(bean:movements, field:'quantity')}${fieldValue(bean:movements, field:'inventoryMovementType')}${fieldValue(bean:movements, field:'person')} + + Show + +
+
+ +
+ + + + Showing ${inventoryMovementListMax} of ${inventoryMovementListTotal} +
+ + + Total ${inventoryMovementListTotal} +
+ + + + +
+ + + + + + + + + +
Index: /trunk/grails-app/views/inventoryMovementDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/inventoryMovementDetailed/create.gsp (revision 224) +++ /trunk/grails-app/views/inventoryMovementDetailed/create.gsp (revision 225) @@ -56,5 +56,5 @@ - + Index: /trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/show.gsp (revision 224) +++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 225) @@ -30,9 +30,9 @@ - - - - - + + + + + @@ -530,5 +530,5 @@
- No Inventory Used. + No Inventory Movements.

@@ -567,6 +567,6 @@ - - + +
@@ -575,5 +575,5 @@ - +