From 24d8643d7a0cda0c6ab911b6891e0fcc4b021e20 Mon Sep 17 00:00:00 2001 From: Robert Axelsen Date: Fri, 17 Feb 2017 16:57:12 +0100 Subject: [PATCH] TT#10059 Ngcp-csc impl cf grid loading indicator Implement loading indicator for gridpanel in call forward module. Change-Id: I0fedcc5c7cc21f5bad7a3de4c4b3fc49abbcb7c3 --- classic/src/view/common/gridfilters/GridFilters.js | 1 - .../view/common/gridfilters/GridFiltersController.js | 4 ---- .../view/pages/callforward/CallForwardController.js | 11 ++++++----- .../src/view/pages/callforward/CallForwardMainForm.js | 9 +++++++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/classic/src/view/common/gridfilters/GridFilters.js b/classic/src/view/common/gridfilters/GridFilters.js index 0739d299..01dfe6b5 100644 --- a/classic/src/view/common/gridfilters/GridFilters.js +++ b/classic/src/view/common/gridfilters/GridFilters.js @@ -9,7 +9,6 @@ Ext.define('NgcpCsc.view.common.gridfilters.GridFilters', { ui: 'core-container', - initComponent: function() { this.items = [{ xtype: 'form', diff --git a/classic/src/view/common/gridfilters/GridFiltersController.js b/classic/src/view/common/gridfilters/GridFiltersController.js index 7b7445b6..a136f802 100644 --- a/classic/src/view/common/gridfilters/GridFiltersController.js +++ b/classic/src/view/common/gridfilters/GridFiltersController.js @@ -109,10 +109,6 @@ Ext.define('NgcpCsc.view.common.gridfilters.GridFiltersController', { }, submitFilters: function() { - // TODO: Changes are applied when form changes, but values are "delayed" - // (unchecking "missed" treats it as checked/true, and checking it - // treats it as unchecked/false. Tried setTimeout() without luck, and - // doublechecked that bind does not explicitly need to declare value: var store; var me = this; var vm = me.getViewModel(); diff --git a/classic/src/view/pages/callforward/CallForwardController.js b/classic/src/view/pages/callforward/CallForwardController.js index 5af1ca1d..b9c54c30 100644 --- a/classic/src/view/pages/callforward/CallForwardController.js +++ b/classic/src/view/pages/callforward/CallForwardController.js @@ -99,9 +99,11 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', { targetId = event.getTarget().id, buttonValue = button.value, buttonType = button.findParentByType('segmentedbutton').itemId, - storesArray = ['CallForwardOnline', 'CallForwardBusy', 'CallForwardOffline']; + storesArray = ['CallForwardOnline', 'CallForwardBusy', 'CallForwardOffline'], + loadingBar = me.lookupReference('loadingBar'); me.changeWidget(targetId, vm); vm.set(me.getSelectedSet(buttonType), buttonValue); + loadingBar.showBusy(); Ext.Ajax.request({ url: '/resources/data/callForwardCombinations.json', success: function(response, opts) { @@ -118,6 +120,9 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', { store.add(records); }; }; + Ext.defer(function () { + loadingBar.clearStatus(); + }, 300); }); }, failure: function(response, opts) { @@ -245,10 +250,6 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', { } else if (this.checkIndexOf('offlineSaveButton', targetId)) { this.saveDestinationToStore('CallForwardOffline'); }; - }, - - renderSaveText: function () { - return 'YOLO'; } }); diff --git a/classic/src/view/pages/callforward/CallForwardMainForm.js b/classic/src/view/pages/callforward/CallForwardMainForm.js index 195d7887..de861f44 100644 --- a/classic/src/view/pages/callforward/CallForwardMainForm.js +++ b/classic/src/view/pages/callforward/CallForwardMainForm.js @@ -120,16 +120,19 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardMainForm', { items: [{ value: 'always', id: 'alwaysButton', + reference: 'alwaysButton', text: Ngcp.csc.locales.callforward.time_one[localStorage.getItem('languageSelected')] }, { value: 'afterHours', id: 'afterHoursButton', + reference: 'afterHoursButton', text: Ngcp.csc.locales.callforward.time_two[localStorage.getItem('languageSelected')], iconCls: 'x-fa fa-pencil', iconAlign: 'right' }, { value: 'companyHours', id: 'companyHoursButton', + reference: 'companyHoursButton', text: Ngcp.csc.locales.callforward.time_three[localStorage.getItem('languageSelected')], iconCls: 'x-fa fa-pencil', iconAlign: 'right' @@ -219,16 +222,19 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardMainForm', { items: [{ value: 'everybody', id: 'everybodyButton', + reference: 'everybodyButton', text: Ngcp.csc.locales.callforward.source_one[localStorage.getItem('languageSelected')] }, { value: 'listA', id: 'listAButton', + reference: 'listAButton', text: Ngcp.csc.locales.callforward.source_two[localStorage.getItem('languageSelected')], iconCls: 'x-fa fa-pencil', iconAlign: 'right' }, { value: 'listB', id: 'listBButton', + reference: 'listBButton', text: Ngcp.csc.locales.callforward.source_three[localStorage.getItem('languageSelected')], iconCls: 'x-fa fa-pencil', iconAlign: 'right' @@ -298,6 +304,9 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardMainForm', { }] }] }] + }, { + xtype: 'statusbar', + reference: 'loadingBar' }, { xtype: 'container', userCls: 'cf-text cf-subheader',