From f94593de9169d21cbc68e3bf73975fe0300a2dc6 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 14:32:38 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=BB=E5=B8=AB=E8=A9=B3=E7=B4=B0?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/templates/docInfo.html   | 18 +++++++++++-------
 ecs/jskult-webapp/src/templates/docSearch.html |  7 ++-----
 .../src/templates/instSearch.html              |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index 59a0f8ba..226a6ab5 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -45,7 +45,7 @@
     <!-- 上部のボタン -->
     <table class="instHeaderTable">
         <tr>
-            <form id="instInfo" name="instInfo" method="post" action="/ultmarc/docInfo">
+            <form id="instInfo" name="instInfo" method="post" action="/ultmarc/docInfo" onsubmit="showLoading()">
                 <input type="hidden" name="doc_id" value="{{ultmarc.doc_id}}">
                 <input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
                 <td class="instHeaderTd">
@@ -58,7 +58,7 @@
                     <input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
                 </td>
             </form>
-            <form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch">
+            <form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch" onsubmit="showLoading()">
                 <script>
                     var form = document.getElementById("instSearch");
                     for (var i = 0, length = sessionStorage.length; i < length; ++i) {
@@ -188,16 +188,17 @@
                 </tr>
             </thead>
             <script>
-                function OnLinkClick(){
+                function transitionWithClearSearchItem(link) {
                     sessionStorage.clear();
-                    return true;
+                    transitionTo(link)
+                    return false;
                 }
             </script>
             <tbody>
                 {% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
                 {% if doctor_wrkplace_data.dcf_dsf_inst_cd %}
                     <tr>
-                        <td><a href="/ultmarc/instInfo?id={{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}}" onclick="OnLinkClick();">
+                        <td><a href="javascript:void(0);" onclick="transitionWithClearSearchItem('/ultmarc/instInfo?id={{doctor_wrkplace_data.dcf_dsf_inst_cd}}');">
                             {{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}}</a></td>
                         <td>{{doctor_wrkplace_data.inst_name_kanji or ''}}</td>
                         <td>{{doctor_wrkplace_data.blng_sec_name or ''}}</td>
@@ -211,7 +212,7 @@
                 {% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
                 {% if doctor_wrkplace_his_data.dcf_dsf_inst_cd %}
                     <tr>
-                        <td><a href="/ultmarc/instInfo?id={{doctor_wrkplace_his_data.dcf_dsf_inst_cd or ''}}" onclick="OnLinkClick();">
+                        <td><a href="javascript:void(0);" onclick="transitionWithClearSearchItem('/ultmarc/instInfo?id={{doctor_wrkplace_his_data.dcf_dsf_inst_cd}}');">
                             {{doctor_wrkplace_his_data.dcf_dsf_inst_cd or ''}}</a></td>
                         <td>{{doctor_wrkplace_his_data.inst_name_kanji or ''}}</td>
                         <td>{{doctor_wrkplace_his_data.blng_sec_name or ''}}</td>
@@ -225,6 +226,9 @@
             </tbody>
         </table>
     </div>
-
+    <!-- ローディング -->
+    {% with progress_message = ''%}
+    {% include '_loading.html' %}
+    {% endwith %}
 </body>
 </html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 3d5c09a5..e8d89083 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -213,15 +213,12 @@
                     // ページ送りしたときにヘッダがずれるのを修正
                     FixedMidashi.remove();
                     FixedMidashi.create();
+                    // ページ送りしたときに医師情報ボタンを非活性化
+                    resultBtDisabled();
                 }
             })
         });
 
-        function OnLinkClick(){
-            sessionStorage.clear();
-            return true;
-        }
-
         function transitionWithClearSearchItem(link) {
             sessionStorage.clear();
             transitionTo(link)
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 85c23261..ea1d55de 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -211,7 +211,7 @@
                     // ページ送りしたときにヘッダがずれるのを修正
                     FixedMidashi.remove();
                     FixedMidashi.create();
-                    // ページ送りしたときに医師情報ボタンを非活性化
+                    // ページ送りしたときに施設情報ボタンを非活性化
                     resultBtDisabled();
                 }
             })