From 80876d66b46f0dd533a6a72de7c64dad167f5af7 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Thu, 17 Aug 2023 15:37:19 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=A1=E3=83=B3=E3=83=86=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E3=83=BB=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=81=AB=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/function/businessLogicScript.js    | 21 +++++++++++++++++++
 .../src/templates/maintlogin.html             |  6 +++++-
 ecs/jskult-webapp/src/templates/menu.html     | 14 ++++++++-----
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index 6f67cba6..c3aa12dc 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -44,11 +44,32 @@ class Loading {
     }
 }
 
+
+/**
+ * ローダーを表示する
+ * @param {string} loadingElemId ローディング要素のID
+ */
+function showLoading(loadingElemId = '_loading') {
+    const loading = new Loading(loadingElemId);
+    loading.start();
+}
+
+// 汎用画面遷移
+
+function transitionTo(link){
+    // ローディング表示
+    showLoading();
+    location.href = link;
+    return false;
+}
+
 // 検索フォーム
 
 // 戻るボタンの関数
 // 機能概要：メニュー画面に遷移する
 function backToMenu(){
+    // ローディング表示
+    showLoading();
     location.href = "/menu/";
 }
 
diff --git a/ecs/jskult-webapp/src/templates/maintlogin.html b/ecs/jskult-webapp/src/templates/maintlogin.html
index 06f28098..6a3a7d71 100644
--- a/ecs/jskult-webapp/src/templates/maintlogin.html
+++ b/ecs/jskult-webapp/src/templates/maintlogin.html
@@ -13,7 +13,7 @@
         Mainte Login
       </h1>
       <br><br>
-      <form name="login" class="text-center" method="post" action="/login/maintlogin">
+      <form name="login" class="text-center" method="post" action="/login/maintlogin" onsubmit="showLoading()">
         <div class="form-group">
           <input type="text"  name="ctrl_username" maxlength='10' style="ime-mode:disabled;" placeholder="UserID" class="form_login" onchange="formBtDisabled('login_button', 'login', true)">
           <input type="password" name="ctrl_password" style="ime-mode:disabled;" placeholder="Password" class="form_login" onchange="formBtDisabled('login_button', 'login', true)" onkeyup="formBtDisabled('login_button', 'login', true)" oninput="checkPassForm(this)">
@@ -21,5 +21,9 @@
         <input type="submit" id="login_button" name="login" class="btn btn-info btn-lg btn_width" id="submit" value="Login">
       </form>
     </div>
+    <!-- ローディング -->
+    {% with progress_message = ''%}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/menu.html b/ecs/jskult-webapp/src/templates/menu.html
index 59eb8a74..8b920198 100644
--- a/ecs/jskult-webapp/src/templates/menu.html
+++ b/ecs/jskult-webapp/src/templates/menu.html
@@ -11,14 +11,14 @@
       <h1>MeDaCA<br/>機能メニュー</h1>
       <br><br>
       {% if menu.is_available_ult_doctor_menu() %}
-        <a href="/ultmarc/docSearch" class="btn btn-primary btn-lg btn_width">Ultmarc照会（医師）</a><br><br>
+        <a href="javascript:void(0);" onclick="transitionTo('/ultmarc/docSearch')" class="btn btn-primary btn-lg btn_width">Ultmarc照会（医師）</a><br><br>
       {% endif %}
       {% if menu.is_available_ult_inst_menu() %}
-        <a href="/ultmarc/instSearch" class="btn btn-primary btn-lg btn_width">Ultmarc照会（施設）</a><br><br>
+        <a href="javascript:void(0);" onclick="transitionTo('/ultmarc/instSearch')" class="btn btn-primary btn-lg btn_width">Ultmarc照会（施設）</a><br><br>
       {% endif %}
       {% if menu.is_available_bio_menu() %}
         {% if not menu.is_batch_processing() %}
-          <a href="/bio/BioSearchList" class="btn btn-primary btn-lg btn_width">生物由来データ参照</a><br><br>
+        <a href="javascript:void(0);" onclick="transitionTo('/bio/BioSearchList')" class="btn btn-primary btn-lg btn_width">生物由来データ参照</a><br><br>
         {% else %}
           <div class="notUseBioMsg">生物由来データ参照は <br> 日次バッチ処理中のため利用出来ません</div>
         {% endif %}
@@ -29,10 +29,14 @@
         {% elif menu.is_backup_processing() %}
           <div class="notUseMainteMsg"> バックアップ取得を開始しました。 <br>日次バッチ更新が終了するまでマスターメンテメニューは利用できません</div>
         {% else %}
-          <a href="/masterMainte/masterMainteMenu" class="btn btn-primary btn-lg btn_width">マスターメンテメニュー</a><br><br>
+        <a href="javascript:void(0);" onclick="transitionTo('/masterMainte/masterMainteMenu')" class="btn btn-primary btn-lg btn_width">マスターメンテメニュー</a><br><br>
         {% endif %}
       {% endif %}
-      <br><br><a href="/logout/?reason=do_logout" class="btn btn-info btn-lg btn_width">Logout</a>
+      <br><br><a href="javascript:void(0);" onclick="transitionTo('/logout/?reason=do_logout')" class="btn btn-info btn-lg btn_width">Logout</a>
     </div>
+    <!-- ローディング -->
+    {% with progress_message = ''%}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>