nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 医師詳細画面にローディングを追加

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-08-18 14:32:38 +09:00
parent b6d1b46f48
commit f94593de91
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ecs/jskult-webapp/src/templates/docInfo.html
View File

@ -45,7 +45,7 @@
<!-- 上部のボタン --> <!-- 上部のボタン -->
<table class="instHeaderTable"> <table class="instHeaderTable">
<tr> <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="doc_id" value="{{ultmarc.doc_id}}">
<input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}"> <input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
<td class="instHeaderTd"> <td class="instHeaderTd">
@ -58,7 +58,7 @@
<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}> <input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
</td> </td>
</form> </form>
<form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch"> <form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch" onsubmit="showLoading()">
<script> <script>
var form = document.getElementById("instSearch"); var form = document.getElementById("instSearch");
for (var i = 0, length = sessionStorage.length; i < length; ++i) { for (var i = 0, length = sessionStorage.length; i < length; ++i) {
@ -188,16 +188,17 @@
</tr> </tr>
</thead> </thead>
<script> <script>
function OnLinkClick(){ function transitionWithClearSearchItem(link) {
sessionStorage.clear(); sessionStorage.clear();
return true; transitionTo(link)
return false;
} }
</script> </script>
<tbody> <tbody>
{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %} {% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
{% if doctor_wrkplace_data.dcf_dsf_inst_cd %} {% if doctor_wrkplace_data.dcf_dsf_inst_cd %}
<tr> <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> {{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}}</a></td>
<td>{{doctor_wrkplace_data.inst_name_kanji or ''}}</td> <td>{{doctor_wrkplace_data.inst_name_kanji or ''}}</td>
<td>{{doctor_wrkplace_data.blng_sec_name 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 %} {% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
{% if doctor_wrkplace_his_data.dcf_dsf_inst_cd %} {% if doctor_wrkplace_his_data.dcf_dsf_inst_cd %}
<tr> <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> {{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.inst_name_kanji or ''}}</td>
<td>{{doctor_wrkplace_his_data.blng_sec_name or ''}}</td> <td>{{doctor_wrkplace_his_data.blng_sec_name or ''}}</td>
@ -225,6 +226,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<!-- ローディング -->
{% with progress_message = ''%}
{% include '_loading.html' %}
{% endwith %}
</body> </body>
</html> </html>

7
ecs/jskult-webapp/src/templates/docSearch.html
View File

@ -213,15 +213,12 @@
// ページ送りしたときにヘッダがずれるのを修正 // ページ送りしたときにヘッダがずれるのを修正
FixedMidashi.remove(); FixedMidashi.remove();
FixedMidashi.create(); FixedMidashi.create();
// ページ送りしたときに医師情報ボタンを非活性化
resultBtDisabled();
} }
}) })
}); });
function OnLinkClick(){
sessionStorage.clear();
return true;
}
function transitionWithClearSearchItem(link) { function transitionWithClearSearchItem(link) {
sessionStorage.clear(); sessionStorage.clear();
transitionTo(link) transitionTo(link)

2
ecs/jskult-webapp/src/templates/instSearch.html
View File

@ -211,7 +211,7 @@
// ページ送りしたときにヘッダがずれるのを修正 // ページ送りしたときにヘッダがずれるのを修正
FixedMidashi.remove(); FixedMidashi.remove();
FixedMidashi.create(); FixedMidashi.create();
// ページ送りしたときに医師情報ボタンを非活性化 // ページ送りしたときに施設情報ボタンを非活性化
resultBtDisabled(); resultBtDisabled();
} }
}) })