Order Cycles can be assigned to schedules via new/edit form

2026-03-19 04:49:15 +00:00 · 2016-08-31 17:22:22 +10:00
parent 4195bd6cd8
commit 733dc76c6c
14 changed files with 191 additions and 65 deletions
--- a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
@@ -1,10 +1,11 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, ocInstance, StatusMessage) ->
+  .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) ->
    $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
    $scope.supplier_enterprises = Enterprise.producer_enterprises
    $scope.distributor_enterprises = Enterprise.hub_enterprises
    $scope.supplied_products = Enterprise.supplied_products
    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
+    $scope.schedules = Schedules.index()

    $scope.OrderCycle = OrderCycle
    $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
@@ -18,7 +19,7 @@ angular.module('admin.orderCycles')
      StatusMessage.setValidation(isValid)

    $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading

    $scope.suppliedVariants = (enterprise_id) ->
      Enterprise.suppliedVariants(enterprise_id)
@@ -89,4 +90,3 @@ angular.module('admin.orderCycles')

    $scope.cancel = (destination) ->
      $window.location = destination
-
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -1,11 +1,12 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor) ->
    order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
    $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
    $scope.supplier_enterprises = Enterprise.producer_enterprises
    $scope.distributor_enterprises = Enterprise.hub_enterprises
    $scope.supplied_products = Enterprise.supplied_products
    $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
+    $scope.schedules = Schedules.index()

    $scope.OrderCycle = OrderCycle
    $scope.order_cycle = OrderCycle.load(order_cycle_id)
@@ -19,7 +20,7 @@ angular.module('admin.orderCycles')
      StatusMessage.setValidation(isValid)

    $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading

    $scope.suppliedVariants = (enterprise_id) ->
      Enterprise.suppliedVariants(enterprise_id)
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -1,6 +1,7 @@
-angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, ocInstance) ->
+angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
  $scope.StatusMessage = StatusMessage
  $scope.OrderCycle = OrderCycle
+  $scope.schedules = Schedules.index()
  $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, =>
    # TODO: make this a get method, which only fetches one enterprise
    $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
@@ -26,7 +27,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
    OrderCycle.order_cycle.coordinator_id = enterprise.id

  $scope.loaded = ->
-    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading

  $scope.removeDistributionOfVariant = angular.noop

--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -1,10 +1,11 @@
-angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, StatusMessage) ->
  $scope.orderCycleId = ->
    $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]

  $scope.StatusMessage = StatusMessage
  $scope.enterprises = Enterprise.index(order_cycle_id: $scope.orderCycleId())
  $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.orderCycleId())
+  $scope.schedules = Schedules.index()
  $scope.OrderCycle = OrderCycle
  $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
    $scope.init()
@@ -16,7 +17,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
    StatusMessage.setValidation(isValid)

  $scope.loaded = ->
-    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading

  $scope.init = ->
    $scope.outgoing_exchange = OrderCycle.order_cycle.outgoing_exchanges[0]
--- a/app/assets/javascripts/admin/order_cycles/directives/schedule_list.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/directives/schedule_list.js.coffee
@@ -0,0 +1,15 @@
+angular.module("admin.orderCycles").directive 'scheduleList', (RequestMonitor, Schedules) ->
+  restrict: 'E'
+  scope:
+    orderCycle: '='
+  template: "<div><span ng-repeat='schedule in schedules'>{{ schedule.name + ($last ? '' : ', ')}}</span></div>"
+  link: (scope, element, attr) ->
+    scope.schedules = []
+
+    scope.$watchCollection 'orderCycle.schedule_ids', (newValue, oldValue) ->
+      return unless  newValue? && RequestMonitor.loadId > 0 # Request for schedules needs to have been sent
+      scope.schedules = []
+      RequestMonitor.loadQueue.then ->
+        for id in scope.orderCycle.schedule_ids
+          schedule = Schedules.byID[id]
+          scope.schedules.push schedule if schedule?
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -1,4 +1,4 @@
-require 'open_food_network/order_cycle_permissions'
+require 'open_food_network/permissions'
 require 'open_food_network/order_cycle_form_applicator'

 module Admin
@@ -9,6 +9,7 @@ module Admin
    before_filter :require_coordinator, only: :new
    before_filter :remove_protected_attrs, only: [:update]
    before_filter :remove_unauthorized_bulk_attrs, only: [:bulk_update]
+    before_filter :check_editable_schedule_ids, only: [:create, :update]
    around_filter :protect_invalid_destroy, only: :destroy

    def index
@@ -182,6 +183,17 @@ module Admin
      end
    end

+    def check_editable_schedule_ids
+      return unless params[:order_cycle][:schedule_ids]
+      requested = params[:order_cycle][:schedule_ids].map(&:to_i)
+      existing = @order_cycle.schedule_ids
+      permitted = Schedule.where(id: requested | existing).merge(OpenFoodNetwork::Permissions.new(spree_current_user).editable_schedules).pluck(:id)
+      result = existing
+      result |= (requested & permitted) # add any requested & permitted ids
+      result -= ((result & permitted) - requested) # remove any existing and permitted ids that were not specifically requested
+      params[:order_cycle][:schedule_ids] = result
+    end
+
    def ams_prefix_whitelist
      [:basic, :index]
    end
--- a/app/serializers/api/admin/order_cycle_serializer.rb
+++ b/app/serializers/api/admin/order_cycle_serializer.rb
@@ -4,7 +4,7 @@ class Api::Admin::OrderCycleSerializer < ActiveModel::Serializer
  attributes :id, :name, :orders_open_at, :orders_close_at, :coordinator_id, :exchanges
  attributes :editable_variants_for_incoming_exchanges, :editable_variants_for_outgoing_exchanges
  attributes :visible_variants_for_outgoing_exchanges
-  attributes :viewing_as_coordinator
+  attributes :viewing_as_coordinator, :schedule_ids

  has_many :coordinator_fees, serializer: Api::IdSerializer

--- a/app/views/admin/order_cycles/_name_and_timing_form.html.haml
+++ b/app/views/admin/order_cycles/_name_and_timing_form.html.haml
@@ -26,3 +26,18 @@
      = f.text_field :orders_close_at, 'datetimepicker' => 'order_cycle.orders_close_at', 'ng-model' => 'order_cycle.orders_close_at', 'ng-disabled' => '!loaded()'
    - else
      {{ order_cycle.orders_close_at }}
+
+.row
+  .two.columns.alpha
+    = f.label :schedule_ids, t('admin.order_cycles.schedules')
+  .twelve.columns
+    - if viewing_as_coordinator_of?(@order_cycle)
+      %input.fullwidth.ofn-select2#schedule_ids{ name: 'order_cycle[schedule_ids]',
+        data: 'schedules',
+        multiple: 'true',
+        filter: '{viewing_as_coordinator: true}',
+        ng: { model: 'order_cycle.schedule_ids' } }
+    - else
+      %schedule-list{ 'order-cycle' => 'order_cycle' }
+  .two.columns.omega
+    &nbsp;