#100 more improvements to the dashboard widgets as well as some of th…

…e listing pages that are linked from the dashboard

grails-app/controllers/org/pih/warehouse/requisition/RequisitionController.groovy

@@ -43,8 +43,12 @@ class RequisitionController {
  requisition.destination = Location.get(session?.warehouse?.id)
  //def startTime = System.currentTimeMillis()
 
+ def dateCreatedFrom = params.dateCreatedFrom ? Date.parse("MM/dd/yyyy", params.dateCreatedFrom) : null
+ def dateCreatedTo = params.dateCreatedTo ? Date.parse("MM/dd/yyyy", params.dateCreatedTo) : null
+
+
  // Requisitions to display in the table
- def requisitions = requisitionService.getRequisitions(requisition, params)
+ def requisitions = requisitionService.getRequisitions(requisition, dateCreatedFrom, dateCreatedTo, params)
  def requisitionStatistics = requisitionService.getRequisitionStatistics(requisition.destination, null, user)
 
  render(view:"list", model:[requisitions: requisitions, requisitionStatistics:requisitionStatistics])

grails-app/controllers/org/pih/warehouse/shipping/ShipmentController.groovy

@@ -65,12 +65,13 @@ class ShipmentController {
  def statusEndDate = params.statusEndDate ? Date.parse("MM/dd/yyyy", params.statusEndDate) : null
  def lastUpdatedFrom = params.lastUpdatedFrom ? Date.parse("MM/dd/yyyy", params.lastUpdatedFrom) : null
  def lastUpdatedTo = params.lastUpdatedTo ? Date.parse("MM/dd/yyyy", params.lastUpdatedTo) : null
-
+ def dateCreatedFrom = params.dateCreatedFrom ? Date.parse("MM/dd/yyyy", params.dateCreatedFrom) : null
+ def dateCreatedTo = params.dateCreatedTo ? Date.parse("MM/dd/yyyy", params.dateCreatedTo) : null
 
  println "lastUpdatedFrom = " + lastUpdatedFrom + " lastUpdatedTo = " + lastUpdatedTo
 
  def shipments = shipmentService.getShipments(params.terms, shipmentType, origin, destination,
- statusCode, statusStartDate, statusEndDate, lastUpdatedFrom, lastUpdatedTo)
+ statusCode, statusStartDate, statusEndDate, lastUpdatedFrom, lastUpdatedTo, dateCreatedFrom, dateCreatedTo)
 
  // sort by event status, event date, and expecting shipping date
  shipments = shipments.sort( { a, b ->
@@ -88,6 +89,8 @@ class ShipmentController {
  status:statusCode?.name,
  lastUpdatedFrom:lastUpdatedFrom,
  lastUpdatedTo:lastUpdatedTo,
+ dateCreatedFrom:dateCreatedFrom,
+ dateCreatedTo:dateCreatedTo,
  incoming: incoming
  ]
  }

grails-app/controllers/org/pih/warehouse/user/DashboardController.groovy

@@ -113,44 +113,40 @@ class DashboardController {
 
  def currentUser = User.get(session?.user?.id)
 
+ def start = new Date() - 30, end = new Date()
+
  def location = Location.get(session?.warehouse?.id);
- def recentOutgoingShipments = shipmentService.getRecentOutgoingShipments(location?.id, 7, 7)
- def recentIncomingShipments = shipmentService.getRecentIncomingShipments(location?.id, 7, 7)
- //def allOutgoingShipments = shipmentService.getShipmentsByOrigin(location)
- //def allIncomingShipments = shipmentService.getShipmentsByDestination(location)
-
- //def expiredStock = inventoryService.getExpiredStock(null, location)
- //def expiringStockWithin30Days = inventoryService.getExpiringStock(null, location, 30)
- //def expiringStockWithin90Days = inventoryService.getExpiringStock(null, location, 90)
- //def expiringStockWithin180Days = inventoryService.getExpiringStock(null, location, 180)
- //def expiringStockWithin365Days = inventoryService.getExpiringStock(null, location, 365)
- //def lowStock = inventoryService.getLowStock(location)
- //def reorderStock = inventoryService.getReorderStock(location)
+ def recentOutgoingShipments = shipmentService.getRecentOutgoingShipments(location?.id, start, end)
+ def recentIncomingShipments = shipmentService.getRecentIncomingShipments(location?.id, start, end)
+ def outgoingShipmentsByStatus = shipmentService.getShipmentsByStatus(recentOutgoingShipments)
+ def incomingShipmentsByStatus = shipmentService.getShipmentsByStatus(recentIncomingShipments)
 
  // Days to include for activity list
  int daysToInclude = params.daysToInclude?Integer.parseInt(params.daysToInclude):3
 
+ def user = params.onlyShowMine?currentUser:null
  def requisitionStatistics =
- requisitionService.getRequisitionStatistics(location, null, params.onlyShowMine?currentUser:null)
+ requisitionService.getRequisitionStatistics(location, null, user, start, end)
 
- def outgoingShipmentsByStatus = shipmentService.getShipmentsByStatus(recentOutgoingShipments)
- def incomingShipmentsByStatus = shipmentService.getShipmentsByStatus(recentIncomingShipments)
+ def tags = productService?.getAllTags()?.sort { it.tag }
+ def rootCategory = productService.getRootCategory()
 
  log.info "dashboard.index Response time: " + (System.currentTimeMillis() - startTime) + " ms"
  //def outgoingOrders = orderService.getOutgoingOrders(location)
  //def incomingOrders = orderService.getIncomingOrders(location)
  [
- rootCategory : productService.getRootCategory(),
+ start: start,
+ end: end,
+ rootCategory : rootCategory,
  requisitionStatistics: requisitionStatistics,
  requisitions: [],
  //requisitions: requisitionService.getAllRequisitions(session.warehouse),
-
  //outgoingOrdersByStatus: orderService.getOrdersByStatus(outgoingOrders),
  //incomingOrdersByStatus: orderService.getOrdersByStatus(incomingOrders),
  outgoingShipmentsByStatus : outgoingShipmentsByStatus,
  incomingShipmentsByStatus : incomingShipmentsByStatus,
  daysToInclude: daysToInclude,
- tags:productService?.getAllTags()?.sort { it.tag }
+ tags:tags
  ]
  }
 

grails-app/i18n/messages.properties

@@ -19,7 +19,7 @@ address.postalCode.label = Postal code
 address.country.label = Country
 address.description.label = Description
 
-# Admin messages 
+# Admin messages
 admin.applicationVersion.label = Application version
 admin.debug.label = Debug Mode
 admin.emailEnabled.label = Email enabled
@@ -73,7 +73,7 @@ auth.userNotFound.message = Unable to authenticate user with
 batch.label = Batch
 
 
-# Breadcrumbs 
+# Breadcrumbs
 breadcrumbs.admin.label = General
 breadcrumbs.attribute.label = Products
 breadcrumbs.auth.label = Authorization
@@ -111,7 +111,7 @@ breadcrumbs.transactionEntry.label = Transaction
 breadcrumbs.user.label = Persons
 breadcrumbs.warehouse.label = Locations
 
-# Category 
+# Category
 category.categories.label = Categories
 category.children.label = Children
 category.chooseACategory.label = Choose a category...
@@ -163,7 +163,7 @@ createRequestWorkflow.pickRequestItems.label = Pick inventory items
 createRequestWorkflow.showPicklist.label = Print picklist
 createRequestWorkflow.confirmPicklist.label = Confirm picklist
 
-# Create Product 
+# Create Product
 createProduct.label = Create New Product
 
 # Create Product from Template
@@ -174,10 +174,10 @@ createProductFromTemplate.enterDetails.label = Enter product details
 createProductFromTemplate.confirmDetails.label = Confirm product details
 createProductFromTemplate.showProduct.label = Show product details
 
-# Create Shipment 
+# Create Shipment
 createShipment.label = Create Shipment
 
-# Create Shipment Workflow 
+# Create Shipment Workflow
 createShipmentWorkflow.label = Shipping
 
 # Dashboard messages
@@ -197,21 +197,21 @@ dashboard.activity.shipped.label = Shipment <a href={0}>{1}</a> was shipped to
 dashboard.activity.received.label = Shipment <a href={0}>{1}</a> was received by {3}
 dashboard.chooseLocation.label = Choose a location
 dashboard.greeting.label = Welcome, <b>{0}</b>!</span> You are logged into the <b>{1}</b> warehouse.
-dashboard.incoming.label = Showing receipts between {1} - {2}
-dashboard.incoming.pending.label = Receipts pending to {0}
-dashboard.incoming.shipped.label = Receipts enroute to {0}
-dashboard.incoming.received.label = Receipts received by {0}
+dashboard.inbound.label  = Inbound receipts created between {1} - {2}
+dashboard.inbound.pending.label  = Pending to {0}
+dashboard.inbound.shipped.label  = Enroute to {0}
+dashboard.inbound.received.label = Received by {0}
 dashboard.label = Dashboard
 dashboard.loggedInAs.message = You are logged in as {0}
 dashboard.managedRemotely.message = {0} managed remotely
 dashboard.noActivityFound.message = No recent activities were found
 dashboard.noLocation.message = No locations available
 dashboard.notLoggedIn.label = Please <a class="home" href="${createLink(uri: '/auth/login')}">login</a> to gain access</p>
 dashboard.noWarehouse.message = No locations available
-dashboard.outgoing.label = Showing shipments between {1} - {2}
-dashboard.outgoing.pending.label = Shipments pending from {0}
-dashboard.outgoing.shipped.label = Shipments sent from {0}
-dashboard.outgoing.received.label = Shipments received from {0}
+dashboard.outbound.label = Outbound shipments created between {1} - {2}
+dashboard.outbound.pending.label = Pending from {0}
+dashboard.outbound.shipped.label = Sent from {0}
+dashboard.outbound.received.label = Received from {0}
 dashboard.requiredActivities.message = No locations have been assigned the supported activities required for access. \
  Please add one of the following activities to locations that you want users to be able to access.\
  <br/><br/>\
@@ -371,7 +371,7 @@ default.lastUpdated.year.label = {0} Year(s)
 
 default.layout.label = Layout
 default.lbs.label = lbs
-default.list.label = {0}
+default.list.label = List {0}
 default.locale.label = Locale
 default.login.label = Login
 default.logout.label = Log out
@@ -520,7 +520,7 @@ document.uploaded.label = Uploaded
 
 documents.label = Documents
 
-# Email 
+# Email
 email.errorReportSubject.message = Error Report
 email.errorReportSuccess.message = Your error has been reported to {0}
 email.errorReportDisabled.message = The bug reporting system has been disabled. Please contact your system administrator for more information.
@@ -788,7 +788,7 @@ import.currentQuantity.label = Current quantity
 import.preferredForReorder.label = Preferred for reorder
 
 
-# Import Data Command 
+# Import Data Command
 importDataCommand.type.invalid = Please select a data import type
 
 # Inventory Actions
@@ -834,7 +834,7 @@ inventory.markAsSupported.label = Mark as supported
 inventory.markAsNonInventoried.label = Mark as non-inventoried
 inventory.markAsNotSupported.label = Mark as not supported
 
-# Inventory 
+# Inventory
 inventory.addItem.label = Add Item
 inventory.addNewInventoryItem.message = Add a new inventory item to proceed.
 inventory.addToShipments.label = Add to shipments
@@ -880,6 +880,7 @@ inventory.filters.label = Filters
 inventory.hideUnsupportedProducts.label = Hide unsupported products
 inventory.import.label = Import products
 inventory.importNow.label = Import now
+inventory.inventoryItemSummary.label = Inventory Item Summary
 inventory.label = Inventory
 inventory.level.label = Inventory level
 inventory.looseItems.label = Loose items
@@ -902,6 +903,7 @@ inventory.notValidXLSFile.message = Please upload a valid XLS
 inventory.oldQty.label = Previous Quantity
 inventory.onHandQuantity.label = On-Hand
 inventory.previousQuantity.label = Previous Quantity
+inventory.productSummary.label = Product Summary
 inventory.productsWithoutDefaultInventoryItem.label = Products with no default inventory item
 inventory.quantity.label = Quantity On Hand
 inventory.qtyOnHand.label = Qty On-Hand
@@ -1049,7 +1051,7 @@ locationGroup.name.label = Name
 locationGroup.locations.label = Locations
 locationGroups.label = Location groups
 
-# Login 
+# Login
 login.password.label = password
 login.username.label = username
 
@@ -1365,22 +1367,23 @@ productGroup.addProducts.label = Link to generic product
 productGroup.list.label = List generic products
 
 
-# Receive Order workflow 
+# Receive Order workflow
 productReceived.nullable.orderItems = Product does not exist
 
 
-# Purchase Order Workflow 
+# Purchase Order Workflow
 purchaseOrderWorkflow.label = Purchase order
 
 # Receipt messages
 receipt.actualDeliveryDate.invalid.mustOccurOnOrAfterActualShippingDate = Must occur on or after Actual Shipping Date
 receipt.actualDeliveryDate.invalid.mustOccurOnOrBeforeToday = Must occur on or before today
 receipt.inventoryItem.invalid = Must reference a valid inventory item
 
-# Receive Order Workflow messages 
+# Receive Order Workflow messages
 receiveOrderWorkflow.label = Receive Order
 
 receiving.label = Receiving
+receiving.summary.label = Receiving Summary
 
 # Report messages
 report.adjustedInQuantity.label = Adj
@@ -1716,7 +1719,7 @@ shipper.trackingFormat.label = Tracking Format
 shipper.trackingUrl.label = Tracking Url
 shippers.label = Shippers
 
-# Shipping 
+# Shipping
 shipping.actualDeliveryDate.label = Actual delivery date
 shipping.actualShippingDate.label = Actual shipping date
 shipping.add.label = Add a shipment
@@ -1878,7 +1881,7 @@ shipping.startOver.label = Start over
 shipping.statedValue.label = Declared value
 shipping.statedValueExplanation.message = The monetary value (USD) to be stated on the Certificate of Donation. Leave blank if none.
 shipping.status.label = Status
-shipping.summary.label = Shipping summary for {0}
+shipping.summary.label = Shipping Summary
 shipping.templates.label = Templates
 shipping.thereAreNoPendingShipmentsAvailable.message = No pending shipments available.
 shipping.to.label = To
@@ -1910,7 +1913,7 @@ stockCard.qtyReceiving.label = (+) Recv
 stockCard.qtyOnHand.label = On Hand
 stockCard.qtyAvailable.label = = Available 
 
-# Tag messages 
+# Tag messages
 tag.label = Tag
 tag.noTags.label = No tags available
 tags.label = Tags
@@ -1973,7 +1976,7 @@ transactions.label = Transactions
 transactionEntry.label = Transaction entry
 transactionEntry.quantity.invalid = Please enter a valid quantity for item with lot number {0}
 
-# Transaction log labels 
+# Transaction log labels
 transactionLog.from.label = Show transactions 
 transactionLog.to.label = to
 transactionLog.showAll.label = Show all transactions

grails-app/services/org/pih/warehouse/requisition/RequisitionService.groovy

@@ -40,10 +40,14 @@ class RequisitionService {
  */
 
  def getRequisitionStatistics(destination, origin) {
- return getRequisitionStatistics(destination, origin, null)
+ return getRequisitionStatistics(destination, origin, null, null, null)
  }
 
  def getRequisitionStatistics(destination, origin, user) {
+ return getRequisitionStatistics(destination, origin, user, null, null)
+ }
+
+ def getRequisitionStatistics(destination, origin, user, start, end) {
  def statistics = [:]
 
  def criteria = Requisition.createCriteria()
@@ -63,6 +67,10 @@ class RequisitionService {
  if (destination) eq("destination", destination)
  if (origin) eq("origin", origin)
  }
+
+ if (start || end) {
+ between("dateCreated", start, end)
+ }
  //if (user) {
  // or {
  // eq("createdBy", user)
@@ -167,6 +175,11 @@ class RequisitionService {
  * @return
  */
  def getRequisitions(Requisition requisition, Map params) {
+ return getRequisitions(requisition, null, null, params)
+ }
+
+
+ def getRequisitions(Requisition requisition, Date dateCreatedFrom, Date dateCreatedTo, Map params) {
  println "Get requisitions: " + params
 
  //def getRequisitions(Location destination, Location origin, User createdBy, RequisitionType requisitionType, RequisitionStatus status, CommodityClass commodityClass, String query, Map params) {
@@ -194,7 +207,9 @@ class RequisitionService {
  if (params.commodityClassIsNull) {
  isNull("commodityClass")
  }
-
+ if (dateCreatedFrom && dateCreatedTo) {
+ between("dateCreated", dateCreatedFrom, dateCreatedTo)
+ }
  if (requisition.destination) {
  eq("destination", requisition.destination)
  }