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

Feature/1.0 check web dev imai See merge request !78

Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev'
Feature/1.0 check web dev imai See merge request !78
611a9940 · Kang Donghun · 0639f7a5 · 8c4ec6ae · 611a9940 · 611a9940
Commit 611a9940 authored Nov 18, 2022 by Kang Donghun
12 changed files
--- a/abweb/common/js/common.js
+++ b/abweb/common/js/common.js
@@ -11,61 +11,71 @@
 *
 * @since cms:1.4.3.2&1.4.3.3 web:1.0
 */
- var COMMON = {};
+var COMMON = {};
- COMMON.loginCheckPageList = [CONSTANT.PAGE_NAME.DEFAULT, CONSTANT.PAGE_NAME.DASHBOARD, CONSTANT.PAGE_NAME.REPORT_LIST, CONSTANT.PAGE_NAME.REPORT_FORM,
+COMMON.loginCheckPageList = [
-      CONSTANT.PAGE_NAME.MESSAGE_DETAIL, CONSTANT.PAGE_NAME.MESSAGE_LIST, CONSTANT.PAGE_NAME.SEND_MESSAGE, CONSTANT.PAGE_NAME.SETTING,
+    CONSTANT.PAGE_NAME.DEFAULT,
-      CONSTANT.PAGE_NAME.PICKUP, CONSTANT.PAGE_NAME.PDF_PRINT];
+    CONSTANT.PAGE_NAME.DASHBOARD,
+    CONSTANT.PAGE_NAME.REPORT_LIST,
- COMMON.hasErrorKey = 'AVW_HASERR';
+    CONSTANT.PAGE_NAME.REPORT_FORM,
- $(document).ready(function() {
+    CONSTANT.PAGE_NAME.MESSAGE_DETAIL,
-     const checkUrl = location.href.substring(location.href.lastIndexOf('/') + 1 ,location.href.lastIndexOf(".html"));
+    CONSTANT.PAGE_NAME.MESSAGE_LIST,
+    CONSTANT.PAGE_NAME.SEND_MESSAGE,
+    CONSTANT.PAGE_NAME.SETTING,
+    CONSTANT.PAGE_NAME.PICKUP,
+    CONSTANT.PAGE_NAME.PDF_PRINT,
+];
+COMMON.hasErrorKey = 'AVW_HASERR';
+$(document).ready(function () {
+    const checkUrl = location.href.substring(location.href.lastIndexOf('/') + 1, location.href.lastIndexOf('.html'));
    if (COMMON.loginCheckPageList.includes(checkUrl)) {
-         if (!COMMON.checkLogin(CONSTANT.PAGE_NAME.LOGIN)){
+        if (!COMMON.checkLogin(CONSTANT.PAGE_NAME.LOGIN)) {
            return;
        }
    }
- })
+});
- /**
+/**
 * page transition without outputting a warning message
 * @param {*} url
 */
- COMMON.avwScreenMove = function (url) {
+COMMON.avwScreenMove = function (url) {
    COMMON.showLoading();
    window.onbeforeunload = null;
    window.location = url;
- };
+};
- /**
+/**
 * show loading dialog
 * show msg by key
 *
 * @param {String} key
 */
- COMMON.showLoading = function () {
+COMMON.showLoading = function () {
-     console.log("kdh check showLoading");
+    console.log('kdh check showLoading');
-     $('#loader').css( {
+    $('#loader').css({
-         'width': $(window).width(),
+        width: $(window).width(),
-         'height': $(window).height()
+        height: $(window).height(),
    });
    document.getElementById('loader').style.display = 'block';
- };
+};
- /**
+/**
 * close loading
 */
- COMMON.closeLoading = function () {
+COMMON.closeLoading = function () {
-     setTimeout(function(){ 
+    setTimeout(function () {
        document.getElementById('loader').style.display = 'none';
+        $('#loadingNone').show();
    }, 1000);
- };
+};
- /**
+/**
 * show confirm modal with yes, no buttons
 * @param {Object} data - Object with {title, message, confirmYes, confirmNo}
 * @param {callback} confirmCallback - The callback that handles the confirm button clicked
 */
- COMMON.showConfirmModal = function (data, confirmCallback) {
+COMMON.showConfirmModal = function (data, confirmCallback) {
    if (data) {
        let title = '';
        if (data.title) {
@@ -80,12 +90,12 @@
        if (data.confirmYes) {
            $('#confirm-modal #confirmYes').text(data.confirmYes);
            $('#confirm-modal #confirmYes').removeClass('d-none');
-             $('#confirm-modal #confirmYes').off('click');//remove all old click handlers
+            $('#confirm-modal #confirmYes').off('click'); //remove all old click handlers
-             $('#confirm-modal #confirmYes').click(function() {
+            $('#confirm-modal #confirmYes').click(function () {
                $('#confirm-modal .close').click();
                if (confirmCallback) {
                    //timeout for animation modal close
-                     setTimeout(function() {
+                    setTimeout(function () {
                        confirmCallback();
                    }, 500);
                }
@@ -101,20 +111,20 @@
        }
    }
    $('#showConfirmModalButton').click();
- };
+};
- /**
+/**
 * Show confirm modal with defaults: title, yes, no
 * @param {string} messageCode
 * @param {callback} confirmCallback - The callback that handles the confirm button clicked
 * @param {Object} options - Object with {titleCode, message, confirmYesCode, confirmNoCode}
 */
- COMMON.showConfirm = function (messageCode, confirmCallback, options = {}) {
+COMMON.showConfirm = function (messageCode, confirmCallback, options = {}) {
    const defaultParams = {
        titleCode: 'confirmation',
        confirmYesCode: 'confirmYes',
-         confirmNoCode: 'confirmNo'
+        confirmNoCode: 'confirmNo',
-     }
+    };
    const params = Object.assign(defaultParams, options);
    let message = '';
    if (messageCode) {
@@ -134,40 +144,43 @@
    if (params.title) {
        title = params.title;
    }
-     COMMON.showConfirmModal({
+    COMMON.showConfirmModal(
+        {
            message: message,
            title: title,
            confirmYes: I18N.i18nText(params.confirmYesCode),
-         confirmNo: I18N.i18nText(params.confirmNoCode)
+            confirmNo: I18N.i18nText(params.confirmNoCode),
-     }, confirmCallback);
+        },
- };
+        confirmCallback,
+    );
+};
- /**
+/**
 * show alert message by confirm modal html
 * @param {String} messageCode
 * @param {string} titleCode
 * @param {Object} options - Data Options {message, titleCode, confirmNoCode}
 */
- COMMON.showAlert = function (messageCode, titleCode = 'error', options = {}) {
+COMMON.showAlert = function (messageCode, titleCode = 'error', options = {}) {
    const defaultParams = {
        titleCode: titleCode ? titleCode : 'error',
        confirmYesCode: null,
        confirmNoCode: 'close',
-     }
+    };
    const params = Object.assign(defaultParams, options);
    COMMON.showConfirm(messageCode, null, params);
- };
+};
- /**
+/**
 * close alert
 */
- COMMON.alertClose = function () {
+COMMON.alertClose = function () {
    $('.alert-overlay').addClass('d-none');
    $('.alert-area').addClass('d-none');
    $('body').css('overflow', 'visible');
- };
+};
- /**
+/**
 * go Url page With Current Params
 *
 * ios will remove all web types data when reopen webview
@@ -176,7 +189,7 @@
 * @param {String} url
 * @param {Object} params
 */
- COMMON.goUrlWithCurrentParams = function (url, params) {
+COMMON.goUrlWithCurrentParams = function (url, params) {
    if (!params) {
        location.href = CONSTANT.URL.WEB.BASE + url;
    }
@@ -187,13 +200,13 @@
    } else {
        location.href = url + '?' + new URLSearchParams(mixParams);
    }
- };
+};
- /**
+/**
 * get url parameter
 *
 */
- COMMON.getUrlParameter = function () {
+COMMON.getUrlParameter = function () {
    var ret = {};
    if (location.search) {
        var param = {};
@@ -208,17 +221,17 @@
    }
    console.log({ ret: ret });
    return ret;
- };
+};
- /**
+/**
 * get sid in local Storage
 *
 */
- COMMON.getSid = function () {
+COMMON.getSid = function () {
    return ClientData.userInfo_sid();
- };
+};
- /**
+/**
 * cms communication
 *
 * @param {String} url
@@ -228,7 +241,7 @@
 * @param {Object} errorCallback
 * @param {number} type
 */
- COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, type) {
+COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, type) {
    var sysSettings = new COMMON.sysSetting();
    if (url) {
        $.ajax({
@@ -279,24 +292,24 @@
            COMMON.showAlert('errorOccurred');
        }
    }
- };
+};
- /**
+/**
 * Check if user is logged in
 *
 * @param {boolean} async
 */
- COMMON.checkAuth = function (async = true) {
+COMMON.checkAuth = function (async = true) {
    let params = {};
-     console.log("kdh check");
+    console.log('kdh check');
    params.sid = COMMON.getSid;
    const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.AUTH_SESSION;
    COMMON.cmsAjax(url, params, async, null, function () {
        COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
    });
- };
+};
- var ClientData = {
+var ClientData = {
    // Local :userInfo_account path:String
    userInfo_accountPath: function (data) {
        if (arguments.length > 0) {
@@ -508,24 +521,24 @@
            return COMMON.operateData(arguments, CONSTANT.KEYS.IsJumpBack, undefined);
        }
    },
- };
+};
- /*
+/*
 * Variables
 */
- COMMON.userSessionObj = null;
+COMMON.userSessionObj = null;
- COMMON.userSettingObj = null;
+COMMON.userSettingObj = null;
- COMMON.sysSettingObj = null;
+COMMON.sysSettingObj = null;
- /*
+/*
 * User Settings Class Definition
 */
- var UserSetting = function () {
+var UserSetting = function () {
    this.US_KEY = 'AVWUS';
    this.userSetting = this.load();
- };
+};
- /* get user setting from localStorage */
+/* get user setting from localStorage */
- UserSetting.prototype.load = function () {
+UserSetting.prototype.load = function () {
    var storage = window.localStorage;
    var value = null;
    var js = null;
@@ -537,14 +550,14 @@
        js = JSON.parse(value);
    }
    return js;
- };
+};
- /**
+/**
 * store user setting
 * @param {*} key
 * @param {*} value
 */
- UserSetting.prototype.set = function (key, value) {
+UserSetting.prototype.set = function (key, value) {
    this.userSetting = this.load();
    var values = this.userSetting;
    if (!values) {
@@ -558,27 +571,27 @@
        storage.setItem(this.US_KEY, jsonStr);
    }
    this.userSetting = values;
- };
+};
- /**
+/**
 *  grab user setting
 * @param {*} key
 * @returns
 */
- UserSetting.prototype.get = function (key) {
+UserSetting.prototype.get = function (key) {
    this.userSetting = this.load();
    var values = this.userSetting;
    if (values) {
        return values[key];
    }
    return null;
- };
+};
- /**
+/**
 * show user setting object list
 * @param {*} elmid
 */
- UserSetting.prototype.show = function (elmid) {
+UserSetting.prototype.show = function (elmid) {
    var storage = window.localStorage;
    var tags = '<p>';
    if (storage) {
@@ -592,9 +605,9 @@
        tags = tags + '</p>';
        $(elmid).html(tags);
    }
- };
+};
- /* Retrieve a list of user-set keys */
+/* Retrieve a list of user-set keys */
- UserSetting.prototype.keys = function () {
+UserSetting.prototype.keys = function () {
    var storage = window.localStorage;
    var keyList = [];
    if (storage) {
@@ -609,13 +622,13 @@
        return keyList;
    }
    return null;
- };
+};
- /**
+/**
 * Delete user settings
 * @param {*} key
 */
- UserSetting.prototype.remove = function (key) {
+UserSetting.prototype.remove = function (key) {
    var storage = window.localStorage;
    if (storage) {
        var value = storage.getItem(this.US_KEY);
@@ -627,27 +640,27 @@
            }
        }
    }
- };
+};
- /* Delete all user settings */
+/* Delete all user settings */
- UserSetting.prototype.removeAll = function () {
+UserSetting.prototype.removeAll = function () {
    var storage = window.localStorage;
    if (storage) {
        storage.remove(this.US_KEY);
    }
- };
+};
- /*
+/*
 * User Session Class Definition
 */
- var UserSession = function () {
+var UserSession = function () {
    this.available = false;
- };
+};
- /**
+/**
 * Initialize User Session
 * @param {*} option
 */
- UserSession.prototype.init = function (option) {
+UserSession.prototype.init = function (option) {
    this.available = false;
    if (option == 'restore') {
        var value = null;
@@ -664,14 +677,14 @@
        this.set('init', new Date().toLocaleString());
        this.available = true;
    }
- };
+};
- /**
+/**
 * store key, value item to user session
 * @param {*} key
 * @param {*} value
 */
- UserSession.prototype.set = function (key, value) {
+UserSession.prototype.set = function (key, value) {
    var storage = window.sessionStorage;
    if (storage) {
        if (this.available == false) {
@@ -684,14 +697,14 @@
            storage.setItem('AVWS_' + key, value);
        }
    }
- };
+};
- /**
+/**
 * get session item value
 * @param {*} key
 * @returns
 */
- UserSession.prototype.get = function (key) {
+UserSession.prototype.get = function (key) {
    var value = null;
    if (this.available) {
        value = this._get(key);
@@ -699,35 +712,35 @@
        throw new Error('Session Destroyed.');
    }
    return value;
- };
+};
- /**
+/**
 * get item value from session storage
 * @param {*} key
 * @returns
 */
- UserSession.prototype._get = function (key) {
+UserSession.prototype._get = function (key) {
    var storage = window.sessionStorage;
    var value = null;
    if (storage) {
        value = storage.getItem('AVWS_' + key);
    }
    return value;
- };
+};
- /* destroy user session */
+/* destroy user session */
- UserSession.prototype.destroy = function () {
+UserSession.prototype.destroy = function () {
    var storage = window.sessionStorage;
    if (storage) {
        storage.clear();
        this.available = false;
    }
- };
+};
- /**
+/**
 * show user session object list
 * @param {*} elmid
 */
- UserSession.prototype.show = function (elmid) {
+UserSession.prototype.show = function (elmid) {
    var storage = window.sessionStorage;
    var tags = '<p>';
    if (storage) {
@@ -739,10 +752,10 @@
        tags = tags + '</p>';
        $(elmid).html(tags);
    }
- };
+};
- /* Initialize system */
+/* Initialize system */
- $(function () {
+$(function () {
    // Determine the path where the system configuration files are located
    var location = window.location.toString().toLowerCase();
@@ -776,15 +789,15 @@
    //#31919 [Investigation] Business meeting support system GoogleChrome does not work with Bitch in/out.
    navigator.pointerEnabled = navigator.maxTouchPoints > 0; // Edge 17 touch support workaround
    document.documentElement.ontouchstart = navigator.maxTouchPoints > 0 ? function () {} : undefined; // Chrome 70 touch support workaround
- });
+});
- // Hide the locking layout
+// Hide the locking layout
- COMMON.unlockLayout = function () {
+COMMON.unlockLayout = function () {
    $('#avw-sys-modal').hide();
- };
+};
- // Show the locking layout
+// Show the locking layout
- COMMON.lockLayout = function () {
+COMMON.lockLayout = function () {
    if (document.getElementById('avw-sys-modal')) {
        $('#avw-sys-modal').show();
    } else {
@@ -808,34 +821,34 @@
            });
        });
    }
- };
+};
- /* Clear error condition　*/
+/* Clear error condition　*/
- COMMON.clearError = function () {
+COMMON.clearError = function () {
    var session = window.sessionStorage;
    if (session) {
        session.setItem(COMMON.hasErrorKey, false);
    }
- };
+};
- /* Get error status */
+/* Get error status */
- COMMON.hasError = function () {
+COMMON.hasError = function () {
    var session = window.sessionStorage;
    var isError = false;
    if (session) {
        isError = session.getItem(COMMON.hasErrorKey);
    }
    return isError == 'true';
- };
+};
- /* Set to error condition */
+/* Set to error condition */
- COMMON.setErrorState = function () {
+COMMON.setErrorState = function () {
    var session = window.sessionStorage;
    if (session) {
        session.setItem(COMMON.hasErrorKey, true);
    }
- };
+};
- /* get user session object */
+/* get user session object */
- COMMON.userSession = function () {
+COMMON.userSession = function () {
    if (!COMMON.userSessionObj) {
        var obj = new UserSession();
        obj.init('restore');
@@ -847,9 +860,9 @@
        }
    }
    return COMMON.userSessionObj;
- };
+};
- /* create user session object */
+/* create user session object */
- COMMON.createUserSession = function () {
+COMMON.createUserSession = function () {
    if (COMMON.userSessionObj) {
        COMMON.userSessionObj.destroy();
    } else {
@@ -857,26 +870,26 @@
        COMMON.userSessionObj.init();
    }
    return COMMON.userSessionObj;
- };
+};
- /* get user setting object */
+/* get user setting object */
- COMMON.userSetting = function () {
+COMMON.userSetting = function () {
    if (COMMON.userSettingObj == null) {
        COMMON.userSettingObj = new UserSetting();
    }
    return COMMON.userSettingObj;
- };
+};
- /* get system setting object */
+/* get system setting object */
- COMMON.sysSetting = function () {
+COMMON.sysSetting = function () {
    return COMMON.sysSettingObj;
- };
+};
- /*
+/*
 * Operations for session storage [start]
 */
- var SessionStorageUtils = {
+var SessionStorageUtils = {
    login: function () {
        if (COMMON.userSession()) {
            // Skip this case
@@ -898,12 +911,12 @@
    remove: function (strKey) {
        COMMON.userSession().set(strKey, null);
    },
- };
+};
- /*
+/*
 * Operations for local storage
 */
- var LocalStorageUtils = {
+var LocalStorageUtils = {
    getUniqueId: function () {
        var uniqueId = '';
@@ -957,28 +970,28 @@
        }
        return isExisted;
    },
- };
+};
- /**
+/**
 * String.format function def.
 * @param {*} fmt
 * @returns
 */
- COMMON.format = function (fmt) {
+COMMON.format = function (fmt) {
    for (var i = 1; i < arguments.length; i++) {
        var reg = new RegExp('\\{' + (i - 1) + '\\}', 'g');
        fmt = fmt.replace(reg, arguments[i]);
    }
    return fmt;
- };
+};
- /**
+/**
 * Get param url
 * @param {*} name
 * @param {*} url
 * @returns
 */
- COMMON.getUrlParam = function (name, url) {
+COMMON.getUrlParam = function (name, url) {
    if (!url) {
        url = window.location.href;
    }
@@ -992,10 +1005,10 @@
    } else {
        return results[1];
    }
- };
+};
- // Toogle Logout Nortice
+// Toogle Logout Nortice
- COMMON.ToogleLogoutNortice = function () {
+COMMON.ToogleLogoutNortice = function () {
    window.onbeforeunload = function (event) {
        var message = I18N.i18nText('sysInfoWithoutLogout');
        var e = event || window.event;
@@ -1004,9 +1017,9 @@
        }
        return message;
    };
- };
+};
- /**
+/**
 * * Get data from localstorage and sessionstorage synchronization If has any
 * param (args.length > 0) -> setter If has not param (args.length = 0) ->
 * getter . Get from session: + if it existed and key existed in localstorage ->
@@ -1017,7 +1030,7 @@
 * @param {*} returnDefaultData
 * @returns
 */
- COMMON.operateData = function (args, strKey, returnDefaultData) {
+COMMON.operateData = function (args, strKey, returnDefaultData) {
    if (args.length > 0) {
        var data = args[0];
        LocalStorageUtils.set(strKey, data);
@@ -1043,28 +1056,28 @@
            return returnDefaultData;
        }
    }
- };
+};
- /**
+/**
 * UTC current Time (millisecond)
 *
 * @returns UTC time
 */
- COMMON.currentTime = function () {
+COMMON.currentTime = function () {
    return Date.now();
- };
+};
- /**
+/**
 * check login information in window.sessionStorage
 *
 * @returns boolean
 */
- COMMON.checkLogin = function (option) {
+COMMON.checkLogin = function (option) {
    var userSession = COMMON.userSession();
-     if(!userSession) {
+    if (!userSession) {
        /* エラー画面を表示 */
-         var tags = '<div id="avw-auth-error">' +
+        var tags =
+            '<div id="avw-auth-error">' +
            '<div style="display:table; width:100%; height:100%;">' +
            '<div style="display:table-cell; text-align:center; vertical-align:middle;">' +
            '<p><h4>Authentication error</h4>Please use it after login.</p>' +
@@ -1072,47 +1085,47 @@
            '</div></div></div>';
        $('body').prepend(tags);
        $('#avw-auth-error').css({
-             'opacity': 1,
+            opacity: 1,
-             'position': 'fixed',
+            position: 'fixed',
-             'top': '0',
+            top: '0',
-             'left': '0',
+            left: '0',
-             'background': "#ffffff",
+            background: '#ffffff',
-             'width': $(window).width(),
+            width: $(window).width(),
-             'height': $(window).height(),
+            height: $(window).height(),
-             'zIndex': '10000'
+            zIndex: '10000',
        });
        // resize error page
-         $(window).resize(function() {
+        $(window).resize(function () {
-             $('#avw-auth-error').css( {
+            $('#avw-auth-error').css({
-                 'width': $(window).width(),
+                width: $(window).width(),
-                 'height': $(window).height()
+                height: $(window).height(),
            });
        });
        var returnPage;
-         if(option) {
+        if (option) {
-             returnPage = option
+            returnPage = option;
        } else {
            var sysSetting = COMMON.sysSetting();
            returnPage = sysSetting.loginPage;
        }
        /* ログイン画面に戻る */
-         $('#avw-unauth-ok').click(function() {
+        $('#avw-unauth-ok').click(function () {
            window.location = returnPage;
        });
        return false;
    }
    return true;
- }
+};
 /**
 * check quick report
 */
 COMMON.checkQuickReport = function (callback) {
-    if (sessionStorage.getItem("operationId")) {
+    if (sessionStorage.getItem('operationId')) {
        let params = {};
        params.sid = COMMON.getSid();
-        params.operationId = sessionStorage.getItem("operationId");
+        params.operationId = sessionStorage.getItem('operationId');
        let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
        COMMON.cmsAjax(
            url,
@@ -1132,21 +1145,21 @@ COMMON.checkQuickReport = function (callback) {
    }
 };
- /*
+/*
 * Operations for session storage [ end ]
 */
- // =============================================================================================
+// =============================================================================================
- // Utils for string, date, number [start]
+// Utils for string, date, number [start]
- // =============================================================================================
+// =============================================================================================
- /*
+/*
 * Convert date to JP format date time [start]
 */
- /*
+/*
 * YYYY/MM/DD HH:MM:SS
 */
- Date.prototype.jpDateTimeString = function () {
+Date.prototype.jpDateTimeString = function () {
    var strResult = '';
    var strYear = this.getFullYear() + '';
    var strMonth = this.getMonth() + 1 + '';
@@ -1158,11 +1171,11 @@ COMMON.checkQuickReport = function (callback) {
    strResult += strYear.padLeft('0', 4) + '/' + strMonth.padLeft('0', 2) + '/' + strDayInMonth.padLeft('0', 2);
    strResult += ' ' + strHour.padLeft('0', 2) + ':' + strMinute.padLeft('0', 2) + ':' + strSecond.padLeft('0', 2);
    return strResult;
- };
+};
- /*
+/*
 * YYYY-MM-DD HH:MM:SS
 */
- Date.prototype.jpDateTimeString1 = function () {
+Date.prototype.jpDateTimeString1 = function () {
    var strResult = '';
    var strYear = this.getFullYear() + '';
    var strMonth = this.getMonth() + 1 + '';
@@ -1174,11 +1187,11 @@ COMMON.checkQuickReport = function (callback) {
    strResult += strYear.padLeft('0', 4) + '-' + strMonth.padLeft('0', 2) + '-' + strDayInMonth.padLeft('0', 2);
    strResult += ' ' + strHour.padLeft('0', 2) + ':' + strMinute.padLeft('0', 2) + ':' + strSecond.padLeft('0', 2);
    return strResult;
- };
+};
- /*
+/*
 * yyyy/MM/dd
 */
- Date.prototype.jpDateString = function () {
+Date.prototype.jpDateString = function () {
    var strResult = '';
    var strYear = this.getFullYear() + '';
    var strMonth = this.getMonth() + 1 + '';
@@ -1187,11 +1200,11 @@ COMMON.checkQuickReport = function (callback) {
    strResult += strYear.padLeft('0', 4) + '/' + strMonth.padLeft('0', 2) + '/' + strDayInMonth.padLeft('0', 2);
    return strResult;
- };
+};
- /*
+/*
 * HH:mm:ss
 */
- Date.prototype.jpTimeString = function () {
+Date.prototype.jpTimeString = function () {
    var strResult = '';
    var strHour = this.getHours() + '';
    var strMinute = this.getMinutes() + '';
@@ -1199,11 +1212,11 @@ COMMON.checkQuickReport = function (callback) {
    strResult += ' ' + strHour.padLeft('0', 2) + ':' + strMinute.padLeft('0', 2) + ':' + strSecond.padLeft('0', 2);
    return strResult;
- };
+};
- /*
+/*
 * HH:mm
 */
- Date.prototype.jpShortTimeString = function () {
+Date.prototype.jpShortTimeString = function () {
    var strResult = '';
    var strHour = this.getHours() + '';
    var strMinute = this.getMinutes() + '';
@@ -1211,11 +1224,11 @@ COMMON.checkQuickReport = function (callback) {
    strResult += ' ' + strHour.padLeft('0', 2) + ':' + strMinute.padLeft('0', 2);
    return strResult;
- };
+};
- /*
+/*
 * yyyyMMddHHmmss
 */
- Date.prototype.toIdString = function () {
+Date.prototype.toIdString = function () {
    var strResult = '';
    var strYear = this.getFullYear() + '';
    var strMonth = this.getMonth() + 1 + '';
@@ -1228,128 +1241,127 @@ COMMON.checkQuickReport = function (callback) {
    strResult += strYear.padLeft('0', 4) + strMonth.padLeft('0', 2) + strDayInMonth.padLeft('0', 2);
    strResult += strHour.padLeft('0', 2) + strMinute.padLeft('0', 2) + strSecond.padLeft('0', 2) + strMilisecond.padLeft('0', 3);
    return strResult;
- };
+};
- /**
+/**
 *  Subtract date to get days
 * @param {*} targetDate
 * @returns
 */
- Date.prototype.subtractByDays = function (targetDate) {
+Date.prototype.subtractByDays = function (targetDate) {
    var milis = Math.abs(this - targetDate);
    var days = Math.floor(milis / (60 * 60 * 24 * 1000));
    return days;
- };
+};
- /**
+/**
 * add seconds
 * @param {*} plusSeconds
 * @returns
 */
- Date.prototype.addSeconds = function (plusSeconds) {
+Date.prototype.addSeconds = function (plusSeconds) {
    var newDate = new Date(this.getTime() + plusSeconds * 1000);
    return newDate;
- };
+};
- /**
+/**
 *  Subtract date to get days
 * @param {*} targetDate
 * @returns
 */
- Date.prototype.subtractBySeconds = function (targetDate) {
+Date.prototype.subtractBySeconds = function (targetDate) {
    var milis = Math.abs(this - targetDate);
    var days = Math.floor(milis / 1000);
    return days;
- };
+};
- /*
+/*
 * Convert date to JP format date time [ end ]
 */
- // trimming space from both side of the string
+// trimming space from both side of the string
- String.prototype.trim = function () {
+String.prototype.trim = function () {
    return this.replace(/^\s+|\s+$/g, '');
- };
+};
- // trimming space from left side of the string
+// trimming space from left side of the string
- String.prototype.trimLeft = function () {
+String.prototype.trimLeft = function () {
    return this.replace(/^\s+/, '');
- };
+};
- // trimming space from right side of the string
+// trimming space from right side of the string
- String.prototype.trimRight = function () {
+String.prototype.trimRight = function () {
    return this.replace(/\s+$/, '');
- };
+};
- /**
+/**
 * String: pads left
 * @param {*} padString
 * @param {*} length
 * @returns
 */
- String.prototype.padLeft = function (padString, length) {
+String.prototype.padLeft = function (padString, length) {
    var str = this;
    while (str.length < length) str = padString + str;
    return str;
- };
+};
- /**
+/**
 * String: pads right
 * @param {*} padString
 * @param {*} length
 * @returns
 */
- String.prototype.padRight = function (padString, length) {
+String.prototype.padRight = function (padString, length) {
    var str = this;
    while (str.length < length) str = str + padString;
    return str;
- };
+};
- /**
+/**
 * Check contain string
 * @param {*} string
 * @returns
 */
- String.prototype.contains = function (string) {
+String.prototype.contains = function (string) {
    if (this.indexOf(string) != -1) {
        return true;
    }
    return false;
- };
+};
- /**
+/**
 * Number: pads left
 * @param {*} padString
 * @param {*} length
 * @returns
 */
- Number.prototype.padLeft = function (padString, length) {
+Number.prototype.padLeft = function (padString, length) {
    var str = this + '';
    return str.padLeft(padString, length);
- };
+};
- /**
+/**
 * Number: pads right
 * @param {*} padString
 * @param {*} length
 * @returns
 */
- Number.prototype.padRight = function (padString, length) {
+Number.prototype.padRight = function (padString, length) {
    var str = this + '';
    return str.padRight(padString, length);
- };
+};
- // Clear data of array
+// Clear data of array
- Array.prototype.clear = function () {
+Array.prototype.clear = function () {
    this.splice(0, this.length);
- };
+};
- // Function to set position of object to center
+// Function to set position of object to center
- jQuery.fn.center = function () {
+jQuery.fn.center = function () {
    this.css('position', 'fixed');
    this.css('top', ($(window).height() - this.height()) / 2 + 'px');
    this.css('left', ($(window).width() - this.width()) / 2 + 'px');
    return this;
- };
+};
\ No newline at end of file
--- a/abweb/html/accountSetting.html
+++ b/abweb/html/accountSetting.html
@@ -35,6 +35,7 @@
    <div id="includedHeader"></div>
    <!-- account setting -->
    <div id="includedMainTitle"></div>
+    <div id="loadingNone" style="display:none;">
        <main id="main">
            <div class="container-wrap">
                <!-- content -->
@@ -97,6 +98,7 @@
        <input type="hidden" id="getToken">
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/dashboard.html
+++ b/abweb/html/dashboard.html
@@ -41,6 +41,8 @@
    <div id="loader"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <!-- dashboard -->
        <main>
            <div class="container-wrap">
@@ -67,6 +69,7 @@
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/index.html
+++ b/abweb/html/index.html
@@ -35,6 +35,7 @@
    <div id="loader"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <!-- task list -->
        <main>
            <div class="container-wrap">
@@ -131,6 +132,7 @@
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script src="../common/js/app.js?__UPDATEID__" defer></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/pdfPrint.html
+++ b/abweb/html/pdfPrint.html
@@ -40,6 +40,7 @@
    <div id="loader"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <!-- title -->
        <div id="includedMainTitle"></div>
@@ -49,6 +50,7 @@
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/pickup.html
+++ b/abweb/html/pickup.html
@@ -44,6 +44,7 @@
 <body>
  <div id="loader"></div>
  <div id="includedHeader"></div>
+  <div id="loadingNone" style="display:none;">
    <!-- pickup -->
    <main>
        <div class="container-wrap">
@@ -139,6 +140,7 @@
      <!-- confirm -->
      <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/pushMessageDetail.html
+++ b/abweb/html/pushMessageDetail.html
@@ -37,6 +37,7 @@
    <div id="loader"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <!-- message detail -->
        <main>
            <div class="container-wrap">
@@ -72,6 +73,7 @@
                </div>
            </div>
        </main>
+    </div>
    <script type="text/javascript" src="../common/js/app.js"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/pushMessageList.html
+++ b/abweb/html/pushMessageList.html
@@ -37,6 +37,7 @@
 <body>
    <div id="loader"></div>
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <!-- message list -->
        <main>
            <div class="container-wrap">
@@ -53,6 +54,7 @@
                </ul>
            </div>
        </main>
+    </div>
    <script type="text/javascript" src="../common/js/app.js"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/reportForm.html
+++ b/abweb/html/reportForm.html
@@ -32,6 +32,15 @@
    <div id="loader"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
+        <div id="includedMainTitle"></div>
+        <div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
+            <img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom"
+                title="pdfPrint">
+        </div>
+        <!-- report list -->
+        <div class="mb-5" id="report-form"></div>
        <div id="includedMainTitle"></div>
@@ -40,6 +49,7 @@
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/reportList.html
+++ b/abweb/html/reportList.html
@@ -40,6 +40,7 @@
    <div id="loader" style="display: none;"></div>
    <!-- header -->
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
        <div id="includedMainTitle"></div>
        <!-- report list -->
@@ -47,6 +48,7 @@
        <!-- confirm -->
        <div id="includedConfirmModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/html/sendMessage.html
+++ b/abweb/html/sendMessage.html
@@ -40,6 +40,7 @@
 <body>
    <div id="loader"></div>
    <div id="includedHeader"></div>
+    <div id="loadingNone" style="display:none;">
      <!-- send message -->
      <main>
          <div class="container-wrap">
@@ -91,6 +92,7 @@
      <!-- select template modal -->
      <div id="includeTemplateModal"></div>
+    </div>
    <script type="text/javascript" src="../common/js/app.js"></script>
    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>

--- a/abweb/js/reportForm/reportForm.js
+++ b/abweb/js/reportForm/reportForm.js
@@ -14,12 +14,12 @@ RF.addReportFlg;
 RF.init = function () {
    //Check if user is logged in
    COMMON.checkAuth(false);
-    COMMON.checkQuickReport(function(result) {
+    COMMON.checkQuickReport(function (result) {
        if (result) {
            result.isQuickReport = RF.isQuickReport;
            result.addReportFlg = RF.addReportFlg;
        }
-    })
+    });
    RF.loadCommon();
    RF.initFormView();
 };
@@ -38,7 +38,7 @@ RF.loadCommon = function () {
 */
 RF.initBreadcrumb = function () {
    if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
-        if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
+        if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
            navs = [
                {
                    titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
@@ -49,10 +49,10 @@ RF.initBreadcrumb = function () {
                    href: CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS,
                },
                {
-                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
+                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
                },
-            ]
+            ];
-        } else if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
+        } else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
            navs = [
                {
                    titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
@@ -63,9 +63,9 @@ RF.initBreadcrumb = function () {
                    href: CONSTANT.URL_TREE_NAME.PICKUP_WARNING,
                },
                {
-                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
+                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
                },
-            ]
+            ];
        } else {
            navs = [
                {
@@ -78,17 +78,17 @@ RF.initBreadcrumb = function () {
                },
                {
                    titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
-                    href: CONSTANT.URL_TREE_NAME.REPORT_LIST
+                    href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
                },
                {
-                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
+                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
                },
-            ]
+            ];
        }
    } else {
-        if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
+        if (sessionStorage.getItem('pickUpType')) sessionStorage.removeItem('pickUpType');
-        if ((RF.addReportFlg) && RF.addReportFlg == 1) {
+        if (RF.addReportFlg && RF.addReportFlg == 1) {
            navs = [
                {
                    titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
@@ -96,12 +96,12 @@ RF.initBreadcrumb = function () {
                },
                {
                    titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
-                    href: CONSTANT.URL_TREE_NAME.REPORT_LIST
+                    href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
                },
                {
-                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
+                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
                },
-            ]
+            ];
        } else {
            navs = [
                {
@@ -109,15 +109,15 @@ RF.initBreadcrumb = function () {
                    href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
                },
                {
-                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
+                    titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
                },
-            ]
+            ];
        }
    }
    TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback);
-}
+};
- /**
+/**
 * load main title callcack
 */
 RF.loadMainTitleCallback = function () {
@@ -163,3 +163,22 @@ RF.initFormView = function () {
        COMMON.avwScreenMove('index.html');
    }
 };
+/**
+ * back page url
+ */
+RF.backPage = function () {
+    if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
+        if (addReportFlg == 1) {
+            COMMON.avwScreenMove('reportList.html');
+        } else {
+            COMMON.avwScreenMove('pickup.html');
+        }
+    } else {
+        if (addReportFlg == 1) {
+            COMMON.avwScreenMove('reportList.html');
+        } else {
+            COMMON.avwScreenMove('index.html');
+        }
+    }
+};