OBPIH-739 Adding day to bin QoH export

openboxes · jmiranda · Jun 18, 2018 · Mar 7, 2018 · Sep 13, 2015 · Sep 13, 2015
commit bf43426c8e827a33dcb90e1fa5112b320a25d115
diff --git a/grails-app/controllers/org/pih/warehouse/JsonController.groovy b/grails-app/controllers/org/pih/warehouse/JsonController.groovy
@@ -1543,7 +1543,7 @@ class JsonController {
  productGroup: it?.product?.genericProduct?.name,
  category: it?.product?.category?.name,
  lotNumber: it?.inventoryItem?.lotNumber,
- expirationDate: g.formatDate(date: it?.inventoryItem?.expirationDate, format: "MMM yyyy"),
+ expirationDate: g.formatDate(date: it?.inventoryItem?.expirationDate, format: "dd/MMM/yyyy"),
  unitOfMeasure: it?.product?.unitOfMeasure,
  binLocation: it?.binLocation?.name,
  quantity: it?.quantity

diff --git a/grails-app/controllers/org/pih/warehouse/reporting/ReportController.groovy b/grails-app/controllers/org/pih/warehouse/reporting/ReportController.groovy
@@ -113,7 +113,7 @@ class ReportController {
  String csv = ""
  if (binLocation) {
  String defaultBinLocation = g.message(code: 'default.label')
- String expirationDate = g.formatDate(date: binLocation?.inventoryItem?.expirationDate, format: "MMM yyyy")
+ String expirationDate = g.formatDate(date: binLocation?.inventoryItem?.expirationDate, format: "dd/MMM/yyyy")
  csv += binLocation.status + ","
  csv += StringEscapeUtils.escapeCsv(binLocation?.product?.productCode) + ","
  csv += StringEscapeUtils.escapeCsv(binLocation?.product?.name) + ","