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

Add link to load all products at the top of the list of products and include summary of number of products loaded already

Browse Source
This commit is contained in:
luisramos0
2019-11-21 18:16:27 +00:00
parent 0416521772
commit 2f7fd1482a
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee
View File

@@ -38,15 +38,16 @@ angular.module('admin.orderCycles')
$scope.loadExchangeProducts = (exchange, page = 1) ->
enterprise = $scope.enterprises[exchange.enterprise_id]
enterprise.supplied_products ?= []
return if enterprise.last_page_loaded? && enterprise.last_page_loaded >= page
enterprise.last_page_loaded = page
incoming = true if $scope.view == 'incoming'
params = { exchange_id: exchange.id, enterprise_id: exchange.enterprise_id, order_cycle_id: $scope.order_cycle.id, incoming: incoming, page: page}
ExchangeProduct.index params, (products, last_page) ->
enterprise.last_page = last_page
enterprise.supplied_products = [] unless enterprise.supplied_products?
ExchangeProduct.index params, (products, num_of_pages, num_of_products) ->
enterprise.num_of_pages = num_of_pages
enterprise.num_of_products = num_of_products
enterprise.supplied_products.push products...
$scope.loadMoreExchangeProducts = ->
@@ -54,7 +55,7 @@ angular.module('admin.orderCycles')
$scope.loadAllExchangeProducts = ->
enterprise = $scope.enterprises[this.exchange.enterprise_id]
for page_to_load in [(enterprise.last_page_loaded + 1)..enterprise.last_page]
for page_to_load in [(enterprise.last_page_loaded + 1)..enterprise.num_of_pages]
$scope.loadExchangeProducts(this.exchange, page_to_load)
# initialize exchange products panel if not yet done

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

@@ -10,7 +10,7 @@ angular.module('admin.orderCycles').factory('ExchangeProduct', ($resource) ->
index: (params={}, callback=null) ->
ExchangeProductResource.index params, (data) =>
@loaded = true
(callback || angular.noop)(data.products, data.pagination.pages)
(callback || angular.noop)(data.products, data.pagination.pages, data.pagination.results)
countVariants: (params={}, callback=null) ->
ExchangeProductResource.variant_count params, (data) =>

8
app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
View File

@@ -1,5 +1,11 @@
.row.exchange-distributed-products{'ng-init' => 'initializeExchangeProductsPanel(exchange)'}
.sixteen.columns.alpha.omega
.exchange-load-all-variants
%div
{{ 'js.admin.panels.exchange_products.products_loaded' | t:{ num_of_products_loaded: enterprises[exchange.enterprise_id].supplied_products.length, total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
%a{ 'ng-click' => 'loadAllExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_all_products' | t }}
.exchange-select-all-variants
%label
%input{ type: 'checkbox', name: 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants',
@@ -7,7 +13,7 @@
'ng-model' => 'exchange.select_all_variants',
'ng-change' => 'setExchangeVariants(exchange, incomingExchangeVariantsFor(exchange.enterprise_id), exchange.select_all_variants)',
'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants' }
{{ 'admin.select_all' | t }}
{{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
.exchange-products
-# Scope product list based on permissions the current user has to view variants in this exchange

8
app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml
View File

@@ -1,5 +1,11 @@
.row.exchange-supplied-products{'ng-init' => 'initializeExchangeProductsPanel(exchange)'}
.sixteen.columns.alpha.omega
.exchange-load-all-variants
%div
{{ 'js.admin.panels.exchange_products.products_loaded' | t:{ num_of_products_loaded: enterprises[exchange.enterprise_id].supplied_products.length, total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
%a{ 'ng-click' => 'loadAllExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_all_products' | t }}
.exchange-select-all-variants
%label
%input{ type: 'checkbox', name: 'order_cycle_incoming_exchange_{{ $index }}_select_all_variants',
@@ -7,7 +13,7 @@
'ng-model' => 'exchange.select_all_variants',
'ng-change' => 'setExchangeVariants(exchange, suppliedVariants(exchange.enterprise_id), exchange.select_all_variants)',
'id' => 'order_cycle_incoming_exchange_{{ $index }}_select_all_variants' }
{{ 'admin.select_all' | t }}
{{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
.exchange-products
-# No need to scope product list based on permissions, because if an incoming exchange is visible,

6
app/assets/stylesheets/admin/openfoodnetwork.css.scss
View File

@@ -104,9 +104,13 @@ form.order_cycle {
width: 20px;
}
.exchange-load-all-variants {
margin: 0px 5px 20px 5px;
}
.exchange-select-all-variants {
clear: both;
margin: 5px;
margin: 15px 5px 25px 5px;
}
.exchange-products {

2
config/locales/en.yml
View File

@@ -2563,6 +2563,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
exchange_products:
load_more_products: "Load More Products"
load_all_products: "Load All Products"
select_all_products: "Select All %{total_number_of_products} Products"
products_loaded: "%{num_of_products_loaded} of %{total_number_of_products} Products Loaded"
tag_rules:
shipping_method_tagged_top: "Shipping methods tagged"
shipping_method_tagged_bottom: "are:"