raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

New pattern: blank Options for index drop down filters are added within service

Browse Source 
Rather than in the controller after data is loaded
This commit is contained in:
Rob Harrington
2015-11-16 10:30:44 +11:00
parent 76414dedff
commit 767671c3b4
6 changed files with 88 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee
View File

@@ -1,16 +1,22 @@
angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource) ->
angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource, blankOption) ->
new class Enterprises
enterprisesByID: {}
pristineByID: {}
index: (params={}, callback=null) ->
EnterpriseResource.index params, (data) =>
includeBlank = !!params['includeBlank']
delete params['includeBlank']
EnterpriseResource.index(params, (data) =>
for enterprise in data
@enterprisesByID[enterprise.id] = enterprise
@pristineByID[enterprise.id] = angular.copy(enterprise)
(callback || angular.noop)(data)
data.unshift(blankOption()) if includeBlank
data
)
save: (enterprise) ->
deferred = $q.defer()
enterprise.$update({id: enterprise.permalink})

9
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -43,9 +43,9 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gt]": "#{$scope.startDate}", "q[order][completed_at_lt]": "#{$scope.endDate}")
unless $scope.initialized
RequestMonitor.load $scope.distributors = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"] )
RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{formatDate(daysFromToday(-90))}")
RequestMonitor.load $scope.suppliers = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true" )
RequestMonitor.load $scope.distributors = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
RequestMonitor.load $scope.orderCycles = OrderCycles.index(includeBlank: true, ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{formatDate(daysFromToday(-90))}")
RequestMonitor.load $scope.suppliers = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise]).then ->
Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.enterprisesByID
@@ -58,9 +58,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
unless $scope.initialized
$scope.initialized = true
$timeout ->
$scope.orderCycles.unshift blankOption()
$scope.suppliers.unshift blankOption()
$scope.distributors.unshift blankOption()
$scope.resetSelectFilters()
$scope.refreshData()

2
app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee
View File

@@ -1 +1 @@
angular.module('admin.orderCycles', ['ngResource'])
angular.module('admin.orderCycles', ['ngResource', 'admin.indexUtils'])

10
app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee
View File

@@ -1,16 +1,22 @@
angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource) ->
angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource, blankOption) ->
new class OrderCycles
orderCyclesByID: {}
pristineByID: {}
index: (params={}, callback=null) ->
OrderCycleResource.index params, (data) =>
includeBlank = !!params['includeBlank']
delete params['includeBlank']
OrderCycleResource.index(params, (data) =>
for orderCycle in data
@orderCyclesByID[orderCycle.id] = orderCycle
@pristineByID[orderCycle.id] = angular.copy(orderCycle)
(callback || angular.noop)(data)
data.unshift(blankOption()) if includeBlank
data
)
save: (order_cycle) ->
deferred = $q.defer()
order_cycle.$update({id: order_cycle.id})