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 !55

abweb/html/accountSetting.html

@@ -18,10 +18,11 @@
     <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://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
     <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/common.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="../common/js/validation.js"></script>
     <script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
 </head>
@@ -34,6 +35,7 @@
         <!-- account setting -->
         <main id="main">
             <div class="container-wrap">
+                <div id="main-ttl">
                     <!-- title -->
                     <h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting">アカウント設定</h1>
 
@@ -86,6 +88,7 @@
                         </div>
                     </div>
                 </div>
+            </div>
         </main>
 
         <!-- alert -->

abweb/js/reportList/reportList.js

@@ -16,7 +16,6 @@ RL.init = function () {
     RL.checkQuickReport();
     RL.loadCommon();
     RL.initTaskReportList();
-    COMMON.closeLoading();
 };
 
 /**
@@ -77,7 +76,9 @@ RL.initTaskReportList = function () {
         params.operationId = sessionStorage.OL_operationId;
         params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
         let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
-        $('#reportList').load(url, params);
+        $('#reportList').load(url, params, function () {
+            COMMON.closeLoading();
+        });
     } else {
         COMMON.displayAlert('error');
         COMMON.avwScreenMove('index.html');

abweb/js/setting/settings.js

@@ -148,13 +148,7 @@ SETTINGS.getNewPasswordRe = function () {
 
 // Initalize screen
 SETTINGS.initScreen = function () {
-    $('#includedHeader').load('../common/html/header.html', function () {
-        I18N.initi18n();
-        HEADER.init();
-    });
-    $('#includedConfirmModal').load('../common/html/confirmModal.html', function () {
-        I18N.initi18n();
-    });
+    TEMPLATE.loadHearder('#includedHeader');
     // Login ID
     $('#txtLoginId').text(ClientData.userInfo_loginId_session());
     // Account Path

abweb/js/template/template.js

@@ -6,6 +6,7 @@ var TEMPLATE = {};
 
 /** template load header */
 TEMPLATE.loadHearder = function (elmentId) {
+    COMMON.showLoading();
     $(elmentId).load('../common/html/header.html', function () {
         $('#iconHomeDashboard').removeClass('active');
         $('#iconHomeWorkList').removeClass('active');