From efe1c81b931b17ec4952d177005cc6084f8cc1c0 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 18 Aug 2023 13:46:35 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=9E=E3=82=B9=E3=82=BF=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=86=E6=A9=9F=E8=83=BD=E3=81=AE=E6=88=BB=E3=82=8B?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E7=94=A8=E3=81=AB=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92=E4=BD=BF=E3=81=84?=
 =?UTF-8?q?=E5=88=86=E3=81=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/static/css/loading.css              | 4 ++--
 .../src/static/function/businessLogicScript.js            | 4 ++--
 ecs/jskult-webapp/src/templates/_loading.html             | 4 ++--
 ecs/jskult-webapp/src/templates/instEmpCsvDL.html         | 7 ++++++-
 ecs/jskult-webapp/src/templates/instEmpCsvUL.html         | 8 +++++++-
 ecs/jskult-webapp/src/templates/tableOverride.html        | 7 ++++++-
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ecs/jskult-webapp/src/static/css/loading.css b/ecs/jskult-webapp/src/static/css/loading.css
index b4ea2df0..8f081d29 100644
--- a/ecs/jskult-webapp/src/static/css/loading.css
+++ b/ecs/jskult-webapp/src/static/css/loading.css
@@ -1,4 +1,4 @@
-#_loading {
+._loading {
     z-index: 10000;
     position: fixed;
     top: 0;
@@ -14,7 +14,7 @@
     opacity: 0.7;
 }
 
-#_loading_content {
+._loading_content {
     position: absolute;
     top: 50%;
     left: 50%;
diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index 32d1a489..a77bb2e9 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -291,10 +291,10 @@ function checkNumberOnlyForm($this)
 
 // メニューへボタンの関数
 // 機能概要：マスターメンテメニュー画面に遷移する
-function backToMainteMenu(){
+function backToMainteMenu(loadingElemId = '_loading'){
     sessionStorage.clear();
     // ローディング表示
-    showLoading();
+    showLoading(loadingElemId);
     location.href = "/masterMainte/masterMainteMenu";
 }
 
diff --git a/ecs/jskult-webapp/src/templates/_loading.html b/ecs/jskult-webapp/src/templates/_loading.html
index 9e4cc87f..437c7e50 100644
--- a/ecs/jskult-webapp/src/templates/_loading.html
+++ b/ecs/jskult-webapp/src/templates/_loading.html
@@ -1,5 +1,5 @@
-<div id="_loading">
-    <div id="_loading_content">
+<div class="_loading" id="{{id or '_loading'}}">
+    <div class="_loading_content">
         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>{{progress_message}}
     </div>
 </div>
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
index c51aed07..93ecf332 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
@@ -45,7 +45,7 @@
         <table class="headerTable">
             <tr>
                 <td class="headerTdLeft"><h1>施設担当者データCSVダウンロード</h1></td>
-                <td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ" onclick="backToMainteMenu()"></td>
+                <td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ" onclick="backToMainteMenu('_loading_for_back')"></td>
             </tr>
         </table>
     </h1>
@@ -180,8 +180,13 @@
             {% endif %}
         {% endif %}
     </p>
+    <!-- ダウンロード用 -->
     {% with progress_message = '処理中...しばらくお待ち下さい。'%}
     {% include '_loading.html' %}
     {% endwith %}
+    <!-- 戻るボタン用 -->
+    {% with progress_message = '', id = '_loading_for_back' %}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
index 981e97b8..bf1bf845 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
@@ -66,7 +66,7 @@
                     {% if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty()  %}
                         <input type="button" class="header_buttonSize" onclick="location.href='/masterMainte/instEmpCsvUL' " value="戻る">
                     {% else %}
-                        <input type="button" class="header_buttonSize" onclick="backToMainteMenu()" value="メニューへ" />
+                        <input type="button" class="header_buttonSize" onclick="backToMainteMenu('_loading_for_back')" value="メニューへ" />
                     {% endif %}
                 </td>
             </tr>
@@ -200,8 +200,14 @@
             </div>
         {% endif %}
     </p>
+    <!-- ローディング -->
+    <!-- 登録処理用 -->
     {% with progress_message = '処理中...しばらくお待ち下さい。'%}
     {% include '_loading.html' %}
     {% endwith %}
+    <!-- 戻るボタン用 -->
+    {% with progress_message = '', id = '_loading_for_back' %}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>
diff --git a/ecs/jskult-webapp/src/templates/tableOverride.html b/ecs/jskult-webapp/src/templates/tableOverride.html
index 02e43784..b5fe6a58 100644
--- a/ecs/jskult-webapp/src/templates/tableOverride.html
+++ b/ecs/jskult-webapp/src/templates/tableOverride.html
@@ -25,7 +25,7 @@
         <table class="headerTable">
             <tr>
                 <td class="headerTdLeft"><h1>テーブル上書きコピー</h1></td>
-                <td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ" onclick="backToMainteMenu()"></td>
+                <td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ"  onclick="backToMainteMenu('_loading_for_back')"></td>
             </tr>
         </table>
     </h1>
@@ -53,8 +53,13 @@
             <div id="overRided" class="csvOutputMessage">ダミー従業員担当施設マスタのデータを本番従業員担当施設マスタのデータで上書きしました</div>
         </p>
     {% endif %}
+    <!-- 上書き用 -->
     {% with progress_message = 'データ上書き中...しばらくお待ち下さい。'%}
     {% include '_loading.html' %}
     {% endwith %}
+    <!-- 戻るボタン用 -->
+    {% with progress_message = '', id = '_loading_for_back' %}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>