From 72ae337651051c2468bb19e3b377563550f1ce2e Mon Sep 17 00:00:00 2001
From: Le Ngoc Danh <127722015+lndanh-axonivy@users.noreply.github.com>
Date: Wed, 23 Oct 2024 11:01:24 +0700
Subject: [PATCH] IVYPORTAL-17533 Create Accessibility Mode Dashboard Template
 (#1149)

* IVYPORTAL-17533 Create Accessibility Mode Dashboard Template: Highlight 2 menu items issue

* IVYPORTAL-17533 Create Accessibility Mode Dashboard Template: remove duplicated column "start"
---
 .../portal/config/variables/Portal/DashboardTemplates.json    | 4 ----
 AxonIvyPortal/portal/webContent/resources/js/portal.js        | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/AxonIvyPortal/portal/config/variables/Portal/DashboardTemplates.json b/AxonIvyPortal/portal/config/variables/Portal/DashboardTemplates.json
index 32b01d244b0..30fbe808df6 100644
--- a/AxonIvyPortal/portal/config/variables/Portal/DashboardTemplates.json
+++ b/AxonIvyPortal/portal/config/variables/Portal/DashboardTemplates.json
@@ -647,10 +647,6 @@
             {
               "field": "expiryTimestamp"
             },
-            {
-              "field": "start",
-              "visible": false
-            },
             {
               "field": "id",
               "visible": false,
diff --git a/AxonIvyPortal/portal/webContent/resources/js/portal.js b/AxonIvyPortal/portal/webContent/resources/js/portal.js
index a84d4369f1e..219c563f7ee 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/portal.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/portal.js
@@ -356,7 +356,7 @@ function highlightDashboardItem(menuId) {
 function activeMenuItemOnLeftMenu(menuId) {
   PF('main-menu').addMenuitem(menuId);
   let $selectedMenu = $("[id$='" + menuId + "']");
-  if (!$selectedMenu.hasClass('active-menuitem')) {
+  if (!$selectedMenu.hasClass('active-menuitem') && !$selectedMenu.siblings('.active-menuitem').length) {
     $selectedMenu.addClass('active-menuitem');
   }
 }