From 203d1402346929dbffa16b2c97ebb8da3c9701ad Mon Sep 17 00:00:00 2001 From: feoche Date: Fri, 5 Jan 2018 11:22:54 +0100 Subject: [PATCH] feat(Number - Call filtering): Add bulk action to call filtering on number pages (easyHunting - xPabx) --- ...n-callsFiltering-easyHunting.controller.js | 46 ++++++++++++++++++- ...figuration-callsFiltering-easyHunting.html | 17 +++++++ .../translations/Messages_fr_FR.xml | 4 ++ ...ation-callsFiltering-oldPabx.controller.js | 46 ++++++++++++++++++- ...-configuration-callsFiltering-oldPabx.html | 17 +++++++ .../oldPabx/translations/Messages_fr_FR.xml | 4 ++ 6 files changed, 132 insertions(+), 2 deletions(-) diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.controller.js b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.controller.js index ffacca940..73768d751 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.controller.js +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.controller.js @@ -1,4 +1,4 @@ -angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCallsFilteringEasyHuntingCtrl", function ($stateParams, $q, OvhApiTelephony, ToastError) { +angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCallsFilteringEasyHuntingCtrl", function ($stateParams, $q, $translate, OvhApiTelephony, ToastError, telephonyBulk, Toast) { "use strict"; var self = this; @@ -102,4 +102,48 @@ angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCalls } init(); + + self.bulkDatas = { + billingAccount: $stateParams.billingAccount, + serviceName: $stateParams.serviceName, + infos: { + name: "screenListConditions", + actions: [{ + name: "screenListConditions", + route: "/telephony/{billingAccount}/easyHunting/{serviceName}/screenListConditions", + method: "PUT", + params: null + }] + } + }; + + self.getBulkParams = function () { + return { + status: _.get(self, "screenStatus.modified") + }; + }; + + self.onBulkSuccess = function (bulkResult) { + // display message of success or error + telephonyBulk.getToastInfos(bulkResult, { + fullSuccess: $translate.instant("telephony_line_calls_filtering_bulk_all_success"), + partialSuccess: $translate.instant("telephony_line_calls_filtering_bulk_some_success", { + count: bulkResult.success.length + }), + error: $translate.instant("telephony_line_calls_filtering_bulk_error") + }).forEach(function (toastInfo) { + Toast[toastInfo.type](toastInfo.message, { + hideAfter: null + }); + }); + + // reset initial values to be able to modify again the options + OvhApiTelephony.Line().Lexi().resetAllCache(); + + init(); + }; + + self.onBulkError = function (error) { + Toast.error([$translate.instant("telephony_line_calls_filtering_bulk_on_error"), _.get(error, "msg.data")].join(" ")); + }; }); diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.html b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.html index ff3565a7b..918c183cd 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.html +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/telecom-telephony-alias-configuration-callsFiltering-easyHunting.html @@ -14,6 +14,8 @@

+ +
@@ -41,6 +43,21 @@

+
+
+
+ + +
+
+
diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/translations/Messages_fr_FR.xml b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/translations/Messages_fr_FR.xml index e70351b44..9dace4cf5 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/translations/Messages_fr_FR.xml +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/easyHunting/translations/Messages_fr_FR.xml @@ -1,3 +1,7 @@ + Le filtrage d'appels a bien été appliqué aux services sélectionnés. + Le filtrage d'appels a bien été appliqué à {{ count }} des services sélectionnés. + Le filtrage d'appels n'a pas pu être appliqué au(x) service(s) suivant(s) : + Oups ! Une erreur est survenue lors de l'application du filtrage d'appels. diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.controller.js b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.controller.js index 580b92954..c426966aa 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.controller.js +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.controller.js @@ -1,4 +1,4 @@ -angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCallsFilteringOldPabxCtrl", function ($stateParams, $q, OvhApiTelephony, ToastError) { +angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCallsFilteringOldPabxCtrl", function ($stateParams, $q, $translate, OvhApiTelephony, ToastError, telephonyBulk, Toast) { "use strict"; var self = this; @@ -100,4 +100,48 @@ angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationCalls } init(); + + self.bulkDatas = { + billingAccount: $stateParams.billingAccount, + serviceName: $stateParams.serviceName, + infos: { + name: "screen", + actions: [{ + name: "screen", + route: "/telephony/{billingAccount}/screen/{serviceName}", + method: "PUT", + params: null + }] + } + }; + + self.getBulkParams = function () { + return { + incomingScreenList: _.get(self, "screenStatus.modified") + }; + }; + + self.onBulkSuccess = function (bulkResult) { + // display message of success or error + telephonyBulk.getToastInfos(bulkResult, { + fullSuccess: $translate.instant("telephony_line_calls_filtering_bulk_all_success"), + partialSuccess: $translate.instant("telephony_line_calls_filtering_bulk_some_success", { + count: bulkResult.success.length + }), + error: $translate.instant("telephony_line_calls_filtering_bulk_error") + }).forEach(function (toastInfo) { + Toast[toastInfo.type](toastInfo.message, { + hideAfter: null + }); + }); + + // reset initial values to be able to modify again the options + OvhApiTelephony.Line().Lexi().resetAllCache(); + + init(); + }; + + self.onBulkError = function (error) { + Toast.error([$translate.instant("telephony_line_calls_filtering_bulk_on_error"), _.get(error, "msg.data")].join(" ")); + }; }); diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.html b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.html index 04e80c234..520279428 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.html +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/telecom-telephony-alias-configuration-callsFiltering-oldPabx.html @@ -13,6 +13,8 @@

+ +
@@ -37,6 +39,21 @@

+
+
+
+ + +
+
+
diff --git a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/translations/Messages_fr_FR.xml b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/translations/Messages_fr_FR.xml index e70351b44..9dace4cf5 100644 --- a/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/translations/Messages_fr_FR.xml +++ b/client/app/telecom/telephony/alias/configuration/callsFiltering/oldPabx/translations/Messages_fr_FR.xml @@ -1,3 +1,7 @@ + Le filtrage d'appels a bien été appliqué aux services sélectionnés. + Le filtrage d'appels a bien été appliqué à {{ count }} des services sélectionnés. + Le filtrage d'appels n'a pas pu être appliqué au(x) service(s) suivant(s) : + Oups ! Une erreur est survenue lors de l'application du filtrage d'appels.