Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2

# Conflicts:
#	abweb/html/accountSetting.html
#	abweb/html/dashboard.html
#	abweb/html/pdfPrint.html
#	abweb/html/pickup.html
#	abweb/html/pushMessageDetail.html
#	abweb/html/reportForm.html
#	abweb/html/reportList.html
#	abweb/js/header/header.js

abweb/common/js/common.js

@@ -189,32 +189,6 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
 };
 
 /**
- * Communicate with cms and post
- *
- * @param {String} url
- * @param {Object} params
- * @param {String} method
- */
-COMMON.postCommunication = function (url, params, method = 'post') {
-    const form = document.createElement('form');
-    form.method = method;
-    form.action = url;
-
-    for (const key in params) {
-        if (params.hasOwnProperty(key)) {
-            const hiddenField = document.createElement('input');
-            hiddenField.type = 'hidden';
-            hiddenField.name = key;
-            hiddenField.value = params[key];
-            form.appendChild(hiddenField);
-        }
-    }
-
-    document.body.appendChild(form);
-    form.submit();
-};
-
-/**
  * Check if user is logged in
  *
  * @param {boolean} async

abweb/common/js/constant.js

@@ -23,6 +23,25 @@ CONSTANT.PAGE_NAME = {
     LOGIN: './login.html',
 };
 
+CONSTANT.URL_TREE_NAME = {
+    OPERATION_LIST: 'index.html',
+    DASHBOARD: 'dashboard.html',
+    REPORT_FORM: 'reportForm.html',
+    REPORT_LIST: 'reportList.html',
+    MESSAGE_DETAIL: 'pushMessageDetail.html',
+    MESSAGE_LIST: 'pushMessageList.html',
+    SEND_MESSAGE: 'sendMessage.html',
+    SETTING: 'accountSetting.html',
+    PICKUP: 'pickup.html',
+};
+
+CONSTANT.URL_TREE_PASS = {
+    1: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
+    2: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_FORM],
+    3: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.MESSAGE_LIST, CONSTANT.URL_TREE_NAME.MESSAGE_DETAIL],
+    4: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.SEND_MESSAGE],
+};
+
 CONSTANT.PAGE_TAB = {
     DASHBOARD: 'dashboard',
     OPERATION_LIST: 'operationList',
@@ -35,6 +54,13 @@ CONSTANT.REPORT_TYPE = {
     WORKFLOW: '3',
 };
 
+CONSTANT.REPORT_TYPE_INT = {
+    REPORT: 0,
+    ROUTINE: 1,
+    ANSWER: 2,
+    WORKFLOW: 3,
+};
+
 CONSTANT.ADD_REPORT_FLG = {
     UNABLE: '0',
     ABLE: '1',

abweb/html/accountSetting.html

@@ -20,7 +20,7 @@
     <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
 
     <script type="text/javascript" src="../common/js/validation.js"></script>
     <script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>

abweb/html/dashboard.html

@@ -18,14 +18,13 @@
     <script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
-
     <script src="../common/js/constant.js?__UPDATEID__"></script>
     <script src="../common/js/common.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
     
-    <script type="text/javascript" src="../common/js/header.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
+
     <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
     <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>

abweb/html/index.html

@@ -133,14 +133,14 @@
         <!-- confirm -->
         <div id="includedConfirmModal"></div>
         
-        <!--アラート-->
+        <!--alert-->
         <div class="alert-overlay d-none"></div>
         <div class="alert-area d-none">
             <i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i>
             <div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
         </div>
 
-        <!--ローディング-->
+        <!--loading-->
         <div id="check_loading" style="display:none; position: relative; overflow:hidden;">
             <p id="checkLoadingMessage"></p>
             <div id="checkLoadingImage"><img src='######' /></div>

abweb/html/pdfPrint.html

@@ -24,14 +24,11 @@
 
     <script src="../common/js/constant.js?__UPDATEID__"></script>
     <script src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
     
     <script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
     
-<<<<<<< HEAD
-=======
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
->>>>>>> feature/1.0_check_web_dev
     <script type="text/javascript">
         $(document).ready(function() {
             PP.init();

abweb/html/pickup.html

@@ -27,7 +27,6 @@
     <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
     <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>

abweb/html/pushMessageDetail.html

@@ -20,7 +20,7 @@
     <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
     <script src="../common/js/constant.js?__UPDATEID__"></script>
     <script src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
 
     <script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>

abweb/html/reportForm.html

@@ -20,7 +20,7 @@
     <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
 
     <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>

abweb/html/reportList.html

@@ -24,7 +24,7 @@
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
 
     <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
+    <script src="../common/js/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
     <script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
 

abweb/js/dashboard/dashboard.js

@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [
 DASHBOARD.communicationItems = [
     { id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' },
     { id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
-    { id: 'distanceSupport', href: 'javascript:DASHBOARD.goDistanceSupport();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_remote.svg' }, msg: 'distanceSupportTitle' },
-    { id: 'chat', href: 'javascript:DASHBOARD.goChat();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_chat.svg' }, msg: 'chatTitle' },
 ];
 
 /**   Default dashboard setting data */

abweb/js/header/header.js

+/**
+ * header js for index.
+ * ※Code is written mainly for dashboard and operationList.
+ *
+ * @since cms:1.4.3.2&1.4.3.3 web:1.0
+ */
+
+var HEADER = {};
+
+/**
+ * init
+ */
+HEADER.init = function () {
+    $('#dspLoginId').text(ClientData.userInfo_loginId());
+
+    $('#btnLogout').click(HEADER.logoutFunction);
+};
+
+/**
+ * create url tree & show breadcrumbs list
+ */
+HEADER.urlTree = function () {
+    const pathName = location.pathname;
+    const htmlName = pathName.substring(pathName.indexOf('/') + 1);
+
+    //now url tree
+    let urlTree = session.getItem('urlTree');
+
+    // check auth
+    let authFlg = false;
+    if ((!urlTree && htmlName == CONSTANT.URL_TREE_NAME.OPERATION_LIST) || htmlName == CONSTANT.URL_TREE_NAME.DASHBOARD) {
+        authFlg = true;
+        session.removeItem('urlTree');
+    }
+    urlList: for (const i in urlTree) {
+        const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
+        findUrl: for (const passList in CONSTANT.URL_TREE_PASS) {
+            for (const k in passList) {
+                if (urlHtmlName == passList[k]) {
+                    if (htmlName == passList[k]) {
+                        authFlg = true;
+                        break urlList;
+                    }
+                    break;
+                } else {
+                    break findUrl;
+                }
+            }
+        }
+    }
+
+    if (authFlg) {
+        session.removeItem('urlTree');
+        let newUrlTree = {};
+        const urlPath = htmlName + location.search;
+        for (const i in urlTree) {
+            const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
+            if (urlHtmlName == htmlName) {
+                newUrlTree.push(urlPath);
+            } else {
+                newUrlTree.push(urlTree[i]);
+            }
+        }
+        session.setItem('urlTree', newUrlTree);
+
+        //show urlTree
+        if ($('.breadcrumb').length) {
+            for (const i in newUrlTree) {
+                const urlHtmlName = newUrlTree[i].substring(0, pathName.indexOf('?'));
+                if (urlHtmlName == htmlName) {
+                    $('.breadcrumb').append('<li class="breadcrumb-item">作業一覧</li>');
+                } else {
+                    $('.breadcrumb').append('<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>');
+                }
+            }
+        }
+    } else {
+        COMMON.avwScreenMove('index.html');
+    }
+};
+
+/**
+ * Direct home page setting
+ * @param {*} pageId
+ */
+HEADER.goToHomePage = function (pageId) {
+    DashboardSetting.getSettingData(function (settings) {
+        if (settings.dashboardHome == 1) {
+            HEADER.goDashboard();
+        } else {
+            HEADER.goOperationList();
+        }
+    });
+};
+
+/**
+ * logout function
+ */
+HEADER.logoutFunction = function () {
+    console.log('clicked logout');
+    $('#msgModel').text(I18N.i18nText('msgLogoutConfirm'));
+
+    $('#confirmYes').click(HEADER.processLogout);
+};
+
+/**
+ * process logout
+ */
+HEADER.processLogout = function () {
+    var params = {
+        sid: ClientData.userInfo_sid(),
+    };
+    const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.LOGOUT;
+    COMMON.cmsAjax(
+        url,
+        params,
+        false,
+        function (data) {
+            if (data.httpStatus == CONSTANT.HTTP_STATUS.OK) {
+                SessionStorageUtils.clear();
+                COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid);
+                COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid_local);
+                // Move to login screen
+                //window.location = COMMON.ScreenIds.Login;
+                COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
+            } else {
+                if (data.errorMessage) {
+                    COMMON.displayAlert(data.errorMessage);
+                } else {
+                    COMMON.displayAlert('errorOccured');
+                }
+            }
+        },
+        function (xmlHttpRequest, txtStatus, errorThrown) {
+            if (xmlHttpRequest.errorMessage) {
+                COMMON.displayAlert(xmlHttpRequest.errorMessage);
+            } else {
+                COMMON.displayAlert('errorOccured');
+            }
+        },
+    );
+};
+
+/**
+ * Go page of operationList
+ */
+HEADER.goOperationList = function () {
+    sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
+    OL.init();
+};
+
+/**
+ * Go page of dashboard
+ */
+HEADER.goDashboard = function () {
+    sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
+    COMMON.avwScreenMove('dashboard.html');
+};
+
+/**
+ * Initialize with any navigation
+ *
+ * @param {String} bottomNav
+ */
+HEADER.activeInitBottomNav = function (bottomNav) {
+    HEADER.inactiveAllBottomNav();
+    HEADER.activeBottomNav(bottomNav);
+};
+
+/**
+ * change inactive all footer bottom
+ */
+HEADER.inactiveAllBottomNav = function () {
+    let navs = document.getElementsByClassName('bottom-nav');
+    for (i = 0; i < navs.length; i++) {
+        navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
+        let img = navs[i].querySelector('img');
+        if (img && img.getAttribute('data-inactive-src')) {
+            img.src = img.getAttribute('data-inactive-src');
+        }
+    }
+};
+
+/**
+ * Change specific footer bottom to active.
+ *
+ * @param {String} bottomNavId
+ */
+HEADER.activeBottomNav = function (bottomNavId) {
+    let elm = $('#' + bottomNavId);
+    if (typeof elm !== 'object') {
+        console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
+        return;
+    }
+    elm.removeClass('text-secondary');
+    elm.addClass('text-primary');
+    let img = elm.find('img')[0];
+    if (img && img.getAttribute('data-src')) {
+        img.src = img.getAttribute('data-src');
+    }
+};

abweb/js/operationList/operationList.js

@@ -148,16 +148,16 @@ OL.createOperationList = function (operationList) {
     for (let i = 0; i < operationList.length; i++) {
         let classIcon;
         switch (operationList[i].reportType) {
-            case OL.REPORT_TYPE.REPORTONLY:
+            case CONSTANT.REPORT_TYPE_INT.REPORT:
                 classIcon = 'report';
                 break;
-            case OL.REPORT_TYPE.INSPECT:
+            case CONSTANT.REPORT_TYPE_INT.ROUTINE:
                 classIcon = 'inspection';
                 break;
-            case OL.REPORT_TYPE.WITHREPLY:
+            case CONSTANT.REPORT_TYPE_INT.ANSWER:
                 classIcon = 'questionary';
                 break;
-            case OL.REPORT_TYPE.WORKFLOW:
+            case CONSTANT.REPORT_TYPE_INT.WORKFLOW:
                 classIcon = 'proccess';
                 break;
         }

abweb/js/pickup/pickup.js

@@ -747,11 +747,8 @@ PICKUP.getInspectDate = function (dateString) {
  */
 PICKUP.sendReportFormFromNewReport = function (operationId) {
     //Transition to the report form or operation list screen
-    let params = {};
-    params.sid = COMMON.getSid();
-    params.operationId = operationId;
-    let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
-    COMMON.postCommunication(url, params);
+    const url = 'reportForm.html?operationId=' + operationId;
+    COMMON.avwScreenMove(url);
 };
 
 /**
@@ -763,13 +760,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
  */
 PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
     //Transition to the report form or operation list screen
-    let params = {};
-    params.sid = COMMON.getSid();
-    params.operationId = operationId;
-    params.processKey = processKey;
-    params.phaseNo = phaseNo;
-    let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
-    COMMON.postCommunication(url, params);
+    const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
+    COMMON.avwScreenMove(url);
 };
 
 /**
@@ -783,25 +775,23 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
  */
 PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
     //Transition to the report form or operation list screen
-    let params = {};
-    params.sid = COMMON.getSid();
-    params.operationId = operationId;
+    let url = 'reportForm.html?operationId=' + operationId;
     switch (reportType) {
         case PICKUP.REPORT_TYPE.REPORTONLY:
-            params.taskKey = taskKey;
+            url += '&taskKey' + taskKey;
             break;
         case PICKUP.REPORT_TYPE.INSPECT:
-            params.taskKey = taskKey;
+            url += '&taskKey' + taskKey;
             break;
         case PICKUP.REPORT_TYPE.WITHREPLY:
-            params.replyNo = replyNo;
+            url += '&taskKey' + taskKey;
+            url += '&replyNO' + replyNo;
             break;
         case PICKUP.REPORT_TYPE.WORKFLOW:
-            params.processKey = processKey;
-            params.phaseNo = phaseNo;
+            url += '&processKey' + processKey;
+            url += '&phaseNo' + phaseNo;
             break;
     }
 
-    let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
-    COMMON.postCommunication(url, params);
+    COMMON.avwScreenMove(url);
 };

abweb/js/reportForm/reportForm.js

@@ -15,7 +15,6 @@ RF.init = function () {
     RF.loadCommon();
 
     RF.initFormView();
-    COMMON.closeLoading();
 };
 
 /**
@@ -55,6 +54,7 @@ RF.initFormView = function () {
         const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
         $('#report-form').load(url, params, function () {
             initPageLoad();
+            COMMON.closeLoading();
         });
     } else {
         COMMON.avwScreenMove('index.html');