Fix bug Active icon home page

abweb/common/js/header.js

@@ -12,20 +12,23 @@
      DashboardSetting.getSettingData(function (settings) {
      DashboardSetting.getSettingData(function (settings) {
          if(settings.dashboardHome == 1)
          if(settings.dashboardHome == 1)
          {
          {
-             HEADER.goDashboard();
+            sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
+            HEADER.goDashboard();
          }
          }
          else
          else
          {
          {
-             HEADER.goOperationList();
-         }
-         
+            sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
+            HEADER.goOperationList();
+        }
      });
      });
  }
  }
+
  
  
  /**
  /**
   * Go page of operationList
   * Go page of operationList
   */
   */
   HEADER.goOperationList = function () {
   HEADER.goOperationList = function () {
+    sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
      $('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
      $('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
          sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
          sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
          HEADER.activeInitBottomNav('operationListBottomNav');
          HEADER.activeInitBottomNav('operationListBottomNav');
@@ -37,6 +40,7 @@
   * Go page of dashboard
   * Go page of dashboard
   */
   */
   HEADER.goDashboard = function () {
   HEADER.goDashboard = function () {
+    sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
      COMMON.avwScreenMove("dashboard.html");
      COMMON.avwScreenMove("dashboard.html");
  };
  };
  
  

abweb/html/common/header.html

@@ -5,13 +5,13 @@
                 <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
                 <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
             </a>
             </a>
             <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
             <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
-                <li class="active nav-link">
+                <li class="active nav-link" id="iconHomeDashboard">
                   <a href="dashboard.html" class="d-block text-center text-decoration-none">
                   <a href="dashboard.html" class="d-block text-center text-decoration-none">
                     <img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
                     <img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
                     <div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
                     <div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
                   </a>
                   </a>
                 </li>
                 </li>
-                <li class="nav-link">
+                <li class="nav-link" id="iconHomeWorkList"> 
                   <a href="task-list.html" class="d-block text-center text-decoration-none">
                   <a href="task-list.html" class="d-block text-center text-decoration-none">
                     <img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
                     <img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
                     <div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
                     <div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
@@ -29,7 +29,7 @@
                     <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
                     <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
                     <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
                     <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
                     </a>
                     </a>
-                  <a class="dropdown-item "  href="#"  data-toggle="modal" data-target="#confirm-modal" id="btnLogout">
+                  <a class="dropdown-item "  href="login.html"   id="btnLogout">
                     <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
                     <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
                     <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
                     <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
                     </a>
                     </a>

abweb/js/template/template.js

@@ -7,6 +7,16 @@ var TEMPLATE = {};
 /** template load header */
 /** template load header */
 TEMPLATE.loadHearder = function(elmentId) {
 TEMPLATE.loadHearder = function(elmentId) {
     $(elmentId).load("../html/common/header.html" , function() {
     $(elmentId).load("../html/common/header.html" , function() {
+        $("#iconHomeDashboard").removeClass('active');
+        $("#iconHomeWorkList").removeClass('active');
+        if(sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST)
+        {
+            $("#iconHomeWorkList").addClass('active');
+        }
+        else
+        {
+            $("#iconHomeDashboard").addClass('active');
+        }
         I18N.initi18n();
         I18N.initi18n();
     }); 
     }); 
 }
 }