From 6e0019227bdf0d729f4af9a6b143da2e9bc34e00 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 2 Nov 2019 16:49:18 +0000 Subject: [PATCH] Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers --- .../order_cycles/controllers/create.js.coffee | 33 ++----------------- .../order_cycles/controllers/edit.js.coffee | 29 ++-------------- .../order_cycle_basic_controller.js.coffee | 30 +++++++++++++++++ .../controllers/simple_create.js.coffee | 33 ++----------------- .../controllers/simple_edit.js.coffee | 33 ++----------------- 5 files changed, 42 insertions(+), 116 deletions(-) create mode 100644 app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee diff --git a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee index 78c4174e20..b10d74eed7 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee @@ -1,5 +1,7 @@ angular.module('admin.orderCycles') - .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + .controller 'AdminCreateOrderCycleCtrl', ($scope, $controller, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + $controller('AdminOrderCycleBasicCtrl', {$scope: $scope}) + $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id) $scope.supplier_enterprises = Enterprise.producer_enterprises $scope.distributor_enterprises = Enterprise.hub_enterprises @@ -14,24 +16,9 @@ angular.module('admin.orderCycles') $scope.view = 'general_settings' - $scope.$watch 'order_cycle_form.$dirty', (newValue) -> - StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue - - $scope.$watch 'order_cycle_form.$valid', (isValid) -> - StatusMessage.setValidation(isValid) - - $scope.loaded = -> - Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading - - $scope.suppliedVariants = (enterprise_id) -> - Enterprise.suppliedVariants(enterprise_id) - $scope.exchangeSelectedVariants = (exchange) -> OrderCycle.exchangeSelectedVariants(exchange) - $scope.setExchangeVariants = (exchange, variants, selected) -> - OrderCycle.setExchangeVariants(exchange, variants, selected) - $scope.enterpriseTotalVariants = (enterprise) -> Enterprise.totalVariants(enterprise) @@ -50,9 +37,6 @@ angular.module('admin.orderCycles') $scope.enterprisesWithFees = -> $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0 - $scope.enterpriseFeesForEnterprise = (enterprise_id) -> - EnterpriseFee.forEnterprise(parseInt(enterprise_id)) - $scope.addSupplier = ($event) -> $event.preventDefault() OrderCycle.addSupplier($scope.new_supplier_id) @@ -66,14 +50,6 @@ angular.module('admin.orderCycles') OrderCycle.removeExchange(exchange) $scope.order_cycle_form.$dirty = true - $scope.addCoordinatorFee = ($event) -> - $event.preventDefault() - OrderCycle.addCoordinatorFee() - - $scope.removeCoordinatorFee = ($event, index) -> - $event.preventDefault() - OrderCycle.removeCoordinatorFee(index) - $scope.addExchangeFee = ($event, exchange) -> $event.preventDefault() OrderCycle.addExchangeFee(exchange) @@ -89,6 +65,3 @@ angular.module('admin.orderCycles') $event.preventDefault() StatusMessage.display 'progress', t('js.saving') OrderCycle.create(destination) - - $scope.cancel = (destination) -> - $window.location = destination diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee index 0231045f2c..9f5f91b1cf 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee @@ -1,5 +1,7 @@ angular.module('admin.orderCycles') - .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) -> + .controller 'AdminEditOrderCycleCtrl', ($scope, $controller, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) -> + $controller('AdminOrderCycleBasicCtrl', {$scope: $scope}) + 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 @@ -15,24 +17,9 @@ angular.module('admin.orderCycles') $scope.view = 'general_settings' - $scope.$watch 'order_cycle_form.$dirty', (newValue) -> - StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue - - $scope.$watch 'order_cycle_form.$valid', (isValid) -> - StatusMessage.setValidation(isValid) - - $scope.loaded = -> - Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading - - $scope.suppliedVariants = (enterprise_id) -> - Enterprise.suppliedVariants(enterprise_id) - $scope.exchangeSelectedVariants = (exchange) -> OrderCycle.exchangeSelectedVariants(exchange) - $scope.setExchangeVariants = (exchange, variants, selected) -> - OrderCycle.setExchangeVariants(exchange, variants, selected) - $scope.enterpriseTotalVariants = (enterprise) -> Enterprise.totalVariants(enterprise) @@ -51,9 +38,6 @@ angular.module('admin.orderCycles') $scope.enterprisesWithFees = -> $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0 - $scope.enterpriseFeesForEnterprise = (enterprise_id) -> - EnterpriseFee.forEnterprise(parseInt(enterprise_id)) - $scope.addSupplier = ($event) -> $event.preventDefault() OrderCycle.addSupplier($scope.new_supplier_id) @@ -67,10 +51,6 @@ angular.module('admin.orderCycles') OrderCycle.removeExchange(exchange) $scope.order_cycle_form.$dirty = true - $scope.addCoordinatorFee = ($event) -> - $event.preventDefault() - OrderCycle.addCoordinatorFee() - $scope.removeCoordinatorFee = ($event, index) -> $event.preventDefault() OrderCycle.removeCoordinatorFee(index) @@ -96,6 +76,3 @@ angular.module('admin.orderCycles') $event.preventDefault() StatusMessage.display 'progress', t('js.saving') OrderCycle.update(destination, $scope.order_cycle_form) - - $scope.cancel = (destination) -> - $window.location = destination diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee new file mode 100644 index 0000000000..48906182b3 --- /dev/null +++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee @@ -0,0 +1,30 @@ +angular.module('admin.orderCycles') + .controller 'AdminOrderCycleBasicCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + $scope.$watch 'order_cycle_form.$dirty', (newValue) -> + StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue + + $scope.$watch 'order_cycle_form.$valid', (isValid) -> + StatusMessage.setValidation(isValid) + + $scope.loaded = -> + Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading + + $scope.suppliedVariants = (enterprise_id) -> + Enterprise.suppliedVariants(enterprise_id) + + $scope.setExchangeVariants = (exchange, variants, selected) -> + OrderCycle.setExchangeVariants(exchange, variants, selected) + + $scope.enterpriseFeesForEnterprise = (enterprise_id) -> + EnterpriseFee.forEnterprise(parseInt(enterprise_id)) + + $scope.addCoordinatorFee = ($event) -> + $event.preventDefault() + OrderCycle.addCoordinatorFee() + + $scope.removeCoordinatorFee = ($event, index) -> + $event.preventDefault() + OrderCycle.removeCoordinatorFee(index) + + $scope.cancel = (destination) -> + $window.location = destination diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee index c0865990e5..2238b8e161 100644 --- 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,4 +1,6 @@ -angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) -> +angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $controller, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) -> + $controller('AdminOrderCycleBasicCtrl', {$scope: $scope}) + $scope.StatusMessage = StatusMessage $scope.OrderCycle = OrderCycle $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id}) @@ -8,12 +10,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl" $scope.init(enterprises) $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id) - $scope.$watch 'order_cycle_form.$dirty', (newValue) -> - StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue - - $scope.$watch 'order_cycle_form.$valid', (isValid) -> - StatusMessage.setValidation(isValid) - $scope.init = (enterprises) -> enterprise = enterprises[Object.keys(enterprises)[0]] OrderCycle.addSupplier enterprise.id @@ -26,33 +22,10 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl" OrderCycle.order_cycle.coordinator_id = enterprise.id - $scope.loaded = -> - Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading - $scope.removeDistributionOfVariant = angular.noop - $scope.setExchangeVariants = (exchange, variants, selected) -> - OrderCycle.setExchangeVariants(exchange, variants, selected) - - $scope.suppliedVariants = (enterprise_id) -> - Enterprise.suppliedVariants(enterprise_id) - - $scope.addCoordinatorFee = ($event) -> - $event.preventDefault() - OrderCycle.addCoordinatorFee() - - $scope.removeCoordinatorFee = ($event, index) -> - $event.preventDefault() - OrderCycle.removeCoordinatorFee(index) - - $scope.enterpriseFeesForEnterprise = (enterprise_id) -> - EnterpriseFee.forEnterprise(parseInt(enterprise_id)) - $scope.submit = ($event, destination) -> $event.preventDefault() StatusMessage.display 'progress', t('js.saving') OrderCycle.mirrorIncomingToOutgoingProducts() OrderCycle.create(destination) - - $scope.cancel = (destination) -> - $window.location = destination diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee index 6c6233e0fd..a650e9d067 100644 --- 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,4 +1,6 @@ -angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, StatusMessage, ocInstance) -> +angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $controller, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, StatusMessage, ocInstance) -> + $controller('AdminOrderCycleBasicCtrl', {$scope: $scope}) + $scope.orderCycleId = -> $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1] @@ -10,42 +12,13 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) => $scope.init() - $scope.$watch 'order_cycle_form.$dirty', (newValue) -> - StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue - - $scope.$watch 'order_cycle_form.$valid', (isValid) -> - StatusMessage.setValidation(isValid) - - $scope.loaded = -> - Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading - $scope.init = -> $scope.outgoing_exchange = OrderCycle.order_cycle.outgoing_exchanges[0] - $scope.enterpriseFeesForEnterprise = (enterprise_id) -> - EnterpriseFee.forEnterprise(parseInt(enterprise_id)) - $scope.removeDistributionOfVariant = angular.noop - $scope.setExchangeVariants = (exchange, variants, selected) -> - OrderCycle.setExchangeVariants(exchange, variants, selected) - - $scope.suppliedVariants = (enterprise_id) -> - Enterprise.suppliedVariants(enterprise_id) - - $scope.addCoordinatorFee = ($event) -> - $event.preventDefault() - OrderCycle.addCoordinatorFee() - - $scope.removeCoordinatorFee = ($event, index) -> - $event.preventDefault() - OrderCycle.removeCoordinatorFee(index) - $scope.submit = ($event, destination) -> $event.preventDefault() StatusMessage.display 'progress', t('js.saving') OrderCycle.mirrorIncomingToOutgoingProducts() OrderCycle.update(destination, $scope.order_cycle_form) - - $scope.cancel = (destination) -> - $window.location = destination