Merge pull request #5099 from Matt-Yorkley/ticking-time-bom

Improve BOM

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -1,7 +1,7 @@
 angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, SortOptions, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
   $scope.initialized = false
   $scope.RequestMonitor = RequestMonitor
-  $scope.filteredLineItems = []
+  $scope.line_items = LineItems.all
   $scope.confirmDelete = true
   $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
   $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
@@ -15,50 +15,77 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.confirmRefresh = ->
     LineItems.allSaved() || confirm(t("unsaved_changes_warning"))
 
+  $scope.resetFilters = ->
+    $scope.distributorFilter = ''
+    $scope.supplierFilter = ''
+    $scope.orderCycleFilter = ''
+    $scope.quickSearch = ''
+
   $scope.resetSelectFilters = ->
-    $scope.distributorFilter = 0
-    $scope.supplierFilter = 0
-    $scope.orderCycleFilter = 0
-    $scope.quickSearch = ""
+    $scope.resetFilters()
+    $scope.refreshData()
 
   $scope.refreshData = ->
-    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
-      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
-      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
+      $scope.setOrderCycleDateRange()
 
-    formatted_start_date = moment($scope.startDate).format()
-    formatted_end_date = moment($scope.endDate).add(1,'day').format()
+    $scope.formattedStartDate = moment($scope.startDate).format()
+    $scope.formattedEndDate = moment($scope.endDate).add(1,'day').format()
 
+    return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()
+
+    $scope.loadOrders()
+    $scope.loadLineItems()
+
+    unless $scope.initialized
+      $scope.loadAssociatedData()
+
+    $scope.dereferenceLoadedData()
+
+  $scope.setOrderCycleDateRange = ->
+    start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
+    end_date = OrderCycles.byID[$scope.orderCycleFilter].orders_close_at
+    format = "YYYY-MM-DD HH:mm:ss Z"
+    $scope.startDate = moment(start_date, format).format('YYYY-MM-DD')
+    $scope.endDate = moment(end_date, format).startOf('day').format('YYYY-MM-DD')
+
+  $scope.loadOrders = ->
     RequestMonitor.load $scope.orders = Orders.index(
       "q[state_not_eq]": "canceled",
       "q[completed_at_not_null]": "true",
-      "q[completed_at_gteq]": formatted_start_date,
-      "q[completed_at_lt]": formatted_end_date
+      "q[distributor_id_eq]": $scope.distributorFilter,
+      "q[order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[completed_at_gteq]": $scope.formattedStartDate,
+      "q[completed_at_lt]": $scope.formattedEndDate
     )
 
-    RequestMonitor.load $scope.lineItems = LineItems.index(
-      "q[order][state_not_eq]": "canceled",
-      "q[order][completed_at_not_null]": "true",
-      "q[order][completed_at_gteq]": formatted_start_date,
-      "q[order][completed_at_lt]": formatted_end_date
+  $scope.loadLineItems = ->
+    RequestMonitor.load LineItems.index(
+      "q[order_state_not_eq]": "canceled",
+      "q[order_completed_at_not_null]": "true",
+      "q[order_distributor_id_eq]": $scope.distributorFilter,
+      "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
+      "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[order_completed_at_gteq]": $scope.formattedStartDate,
+      "q[order_completed_at_lt]": $scope.formattedEndDate
     )
 
-    unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+  $scope.loadAssociatedData = ->
+    RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+    RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
+    RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
 
-    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
+  $scope.dereferenceLoadedData = ->
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.line_items.$promise]).then ->
       Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
       Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "supplier", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID
       $scope.bulk_order_form.$setPristine()
       StatusMessage.clear()
+
       unless $scope.initialized
         $scope.initialized = true
-        $timeout ->
-          $scope.resetSelectFilters()
 
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
@@ -77,13 +104,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.deleteLineItem = (lineItem) ->
     if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
-      LineItems.delete lineItem, =>
-        $scope.lineItems.splice $scope.lineItems.indexOf(lineItem), 1
+      LineItems.delete lineItem
 
-  $scope.deleteLineItems = (lineItems) ->
+  $scope.deleteLineItems = (lineItemsToDelete) ->
     existingState = $scope.confirmDelete
     $scope.confirmDelete = false
-    $scope.deleteLineItem lineItem for lineItem in lineItems when lineItem.checked
+    $scope.deleteLineItem lineItem for lineItem in lineItemsToDelete when lineItem.checked
     $scope.confirmDelete = existingState
 
   $scope.allBoxesChecked = ->
@@ -154,4 +180,5 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
       $scope.weightAdjustedPrice(lineItem)
 
+  $scope.resetFilters()
   $scope.refreshData()

app/assets/javascripts/admin/resources/resources/line_item_resource.js.coffee

@@ -2,7 +2,6 @@ angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
   $resource('/admin/bulk_line_items/:id.json', {}, {
     'index':
       method: 'GET'
-      isArray: true
     'update':
       method: 'PUT'
       transformRequest: (data, headersGetter) =>

app/assets/javascripts/admin/resources/services/line_items.js.coffee

@@ -1,20 +1,27 @@
 angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
   new class LineItems
+    all: []
     byID: {}
     pristineByID: {}
+    pagination: {}
 
     index: (params={}, callback=null) ->
-    	LineItemResource.index params, (data) =>
+    	request = LineItemResource.index params, (data) =>
         @load(data)
         (callback || angular.noop)(data)
+      @all.$promise = request.$promise
+      @all
 
     resetData: ->
+      @all.length = 0
       @byID = {}
       @pristineByID = {}
 
-    load: (lineItems) ->
+    load: (data) ->
+      angular.extend(@pagination, data.pagination)
       @resetData()
-      for lineItem in lineItems
+      for lineItem in data.line_items
+        @all.push lineItem
         @byID[lineItem.id] = lineItem
         @pristineByID[lineItem.id] = angular.copy(lineItem)
 
@@ -25,8 +32,9 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     save: (lineItem) ->
       deferred = $q.defer()
+      lineItemResource = new LineItemResource(lineItem)
       lineItem.errors = {}
-      lineItem.$update({id: lineItem.id})
+      lineItemResource.$update({id: lineItem.id})
       .then( (data) =>
         @pristineByID[lineItem.id] = angular.copy(lineItem)
         deferred.resolve(data)
@@ -54,8 +62,10 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     delete: (lineItem, callback=null) ->
       deferred = $q.defer()
-      lineItem.$delete({id: lineItem.id})
+      lineItemResource = new LineItemResource(lineItem)
+      lineItemResource.$delete({id: lineItem.id})
       .then( (data) =>
+        @all.splice(@all.indexOf(lineItem),1)
         delete @byID[lineItem.id]
         delete @pristineByID[lineItem.id]
         (callback || angular.noop)(data)