From 5ef411c615c6446daa7bdd7fe36e5e50d8d477c4 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 10:55:37 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=BB=E5=B8=AB=E6=A4=9C=E7=B4=A2?=
 =?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=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/templates/docSearch.html | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index dfedc2eb..3d5c09a5 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -35,7 +35,7 @@
             <td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
         </tr>
     </table>
-    <form id="doctor_search" class="_form" name="search" action="/ultmarc/docSearch" method="POST">
+    <form id="doctor_search" class="_form" name="search" action="/ultmarc/docSearch" method="POST" onsubmit="showLoading()">
         <table class="docSearchTableDivTwo">
             <tbody>
                 <tr>
@@ -222,6 +222,12 @@
             return true;
         }
 
+        function transitionWithClearSearchItem(link) {
+            sessionStorage.clear();
+            transitionTo(link)
+            return false;
+        }
+
         function pagination_content(datas) {
             const display_keys = [
                 'dcf_pcf_dr_cd',
@@ -237,9 +243,9 @@
                 let td = display_keys.map((key) =>{
                     let inner_content = data[key];
                     if(key=='dcf_pcf_dr_cd')
-                        inner_content = `<a href="/ultmarc/docInfo?id=${data['dcf_pcf_dr_cd']}">${data['dcf_pcf_dr_cd']  || ''}</a>`;
+                        inner_content = `<a href="javascript:void(0);" onclick="transitionTo('/ultmarc/docInfo?id=${data['dcf_pcf_dr_cd']}')">${data['dcf_pcf_dr_cd']  || ''}</a>`;
                     if(key=='dcf_dsf_inst_cd')
-                        inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}" onclick="OnLinkClick()">${data['form_inst_name_kanji']  || ''}</a>`;
+                        inner_content = `<a href="javascript:void(0);" onclick="transitionWithClearSearchItem('/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}')">${data['form_inst_name_kanji']  || ''}</a>`;
                     return `<td>${inner_content || ''}</td>`
                 });
                 return  `
@@ -287,7 +293,13 @@
                 vals.push( $(this).val() ); // 配列に値を追加
             });
             $("#doc_id").val(vals.join(','));
+            // ローダー表示
+            showLoading();
         }
 </script>
+<!-- ローディング -->
+{% with progress_message = ''%}
+{% include '_loading.html' %}
+{% endwith %}
 </body>
 </html>
\ No newline at end of file