From bd0be4542e01e8aa7b6ca32d1ef1dbcb9ef4a7c2 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 30 Mar 2024 13:12:09 +0200 Subject: [PATCH] calendar mode buttons change --- .../crm/src/views/calendar/mode-buttons.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/client/modules/crm/src/views/calendar/mode-buttons.js b/client/modules/crm/src/views/calendar/mode-buttons.js index c014cebe1d..7a03504328 100644 --- a/client/modules/crm/src/views/calendar/mode-buttons.js +++ b/client/modules/crm/src/views/calendar/mode-buttons.js @@ -121,28 +121,19 @@ class CalendarModeButtons extends View { } }); - if (currentIndex >= this.visibleModeListCount) { - const tmp = list[this.visibleModeListCount - 1]; - - list[this.visibleModeListCount - 1] = list[currentIndex]; - list[currentIndex] = tmp; - } - return list; } getVisibleModeDataList() { const fullList = this.getModeDataList(); - const list = []; + const current = fullList.find(it => it.mode === this.mode); - fullList.forEach((o, i) => { - if (i >= this.visibleModeListCount) { - return; - } + const list = fullList.slice(0, this.visibleModeListCount); - list.push(o); - }); + if (current && !list.find(it => it.mode === this.mode)) { + list.push(current); + } return list; }