From f0fe43be8d4ac013bd06b62b03de30f85c1b70af Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 17 Aug 2023 14:53:47 +0900 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E3=83=AD=E3=83=BC=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E3=81=AE=E5=85=B1=E9=80=9A=E9=83=A8?= =?UTF-8?q?=E5=93=81=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=80=81=E7=94=9F?= =?UTF-8?q?=E7=89=A9=E7=94=B1=E6=9D=A5=E7=85=A7=E4=BC=9A=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AB=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/static/css/bioStyle.css | 22 ------------------- ecs/jskult-webapp/src/static/css/loading.css | 21 ++++++++++++++++++ ecs/jskult-webapp/src/templates/_header.html | 1 + ecs/jskult-webapp/src/templates/_loading.html | 5 +++++ .../src/templates/bioSearchList.html | 18 +++++++-------- 5 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 ecs/jskult-webapp/src/static/css/loading.css create mode 100644 ecs/jskult-webapp/src/templates/_loading.html diff --git a/ecs/jskult-webapp/src/static/css/bioStyle.css b/ecs/jskult-webapp/src/static/css/bioStyle.css index 14fe4ea6..eeb0a079 100644 --- a/ecs/jskult-webapp/src/static/css/bioStyle.css +++ b/ecs/jskult-webapp/src/static/css/bioStyle.css @@ -282,25 +282,3 @@ table.tablesorter thead tr .headerSortDown { table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { background-color: #8dbdd8; } - -#loading { - z-index: 10000; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: #FFF; - overflow-x: hidden; - overflow-y: auto; - outline: 0; - text-align: center; - display: none; - opacity: 0.7; -} - -#loading_content { - position: absolute; - top: 50%; - left: 50%; -} \ No newline at end of file diff --git a/ecs/jskult-webapp/src/static/css/loading.css b/ecs/jskult-webapp/src/static/css/loading.css new file mode 100644 index 00000000..b4ea2df0 --- /dev/null +++ b/ecs/jskult-webapp/src/static/css/loading.css @@ -0,0 +1,21 @@ +#_loading { + z-index: 10000; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #FFF; + overflow-x: hidden; + overflow-y: auto; + outline: 0; + text-align: center; + display: none; + opacity: 0.7; +} + +#_loading_content { + position: absolute; + top: 50%; + left: 50%; +} diff --git a/ecs/jskult-webapp/src/templates/_header.html b/ecs/jskult-webapp/src/templates/_header.html index 01a1521a..c2476734 100644 --- a/ecs/jskult-webapp/src/templates/_header.html +++ b/ecs/jskult-webapp/src/templates/_header.html @@ -8,6 +8,7 @@ + diff --git a/ecs/jskult-webapp/src/templates/_loading.html b/ecs/jskult-webapp/src/templates/_loading.html new file mode 100644 index 00000000..9e4cc87f --- /dev/null +++ b/ecs/jskult-webapp/src/templates/_loading.html @@ -0,0 +1,5 @@ +
+
+ {{progress_message}} +
+
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index 6dc40888..6a33c904 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -198,7 +198,7 @@ + +{% with progress_message = ''%} +{% include '_loading.html' %} +{% endwith %} \ No newline at end of file From bdee1719b9e39c4142ede47ade1a1264c9ab1a4d Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 11:10:56 +0900 Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=AB=E3=83=88?= =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=AF=E6=96=BD=E8=A8=AD=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=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/instSearch.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html index 32ca580c..85c23261 100644 --- a/ecs/jskult-webapp/src/templates/instSearch.html +++ b/ecs/jskult-webapp/src/templates/instSearch.html @@ -37,7 +37,7 @@ -
+ @@ -211,6 +211,8 @@ // ページ送りしたときにヘッダがずれるのを修正 FixedMidashi.remove(); FixedMidashi.create(); + // ページ送りしたときに医師情報ボタンを非活性化 + resultBtDisabled(); } }) }); @@ -232,7 +234,7 @@ let td = display_keys.map((key) =>{ let inner_content = data[key]; if(key=='dcf_dsf_inst_cd') - inner_content = `${data['dcf_dsf_inst_cd'] || ''}`; + inner_content = `${data['dcf_dsf_inst_cd'] || ''}`; if(key=='abolish_ymd' && data[key] != null) inner_content = '削除'; return `` @@ -281,9 +283,14 @@ vals.push( $(this).val() ); // 配列に値を追加 }); $("#inst_id").val(vals.join(',')); + // ローダー表示 + showLoading(); } - + +{% with progress_message = ''%} +{% include '_loading.html' %} +{% endwith %} \ No newline at end of file From f4730195b4ac4e1170679eeaadffa83b48da5608 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 11:51:14 +0900 Subject: [PATCH 06/12] =?UTF-8?q?feat:=20=E6=96=BD=E8=A8=AD=E6=8B=85?= =?UTF-8?q?=E5=BD=93=E8=80=85CSV=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=89=E7=94=BB=E9=9D=A2=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=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/instEmpCsvUL.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html index de6edad8..1556e5e2 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html @@ -36,7 +36,7 @@ var element = document.getElementById("upload_form") sessionStorage.setItem("ctrl_select_function", element.ctrl_select_function.value); sessionStorage.setItem("ctrl_select_table", element.ctrl_select_table.value); - document.getElementById("loading").style.display = "block"; + showLoading(); if (document.getElementById("ulMsg") !== null) { document.getElementById("ulMsg").style.display = "none"; } @@ -45,7 +45,7 @@ function Form_Submit_Disp_Dialog(){ var msg = '{{ mainte_csv_up.select_function_message }}'; if (confirmDialog(msg)) { - document.getElementById("loading").style.display = "block"; + showLoading(); if (document.getElementById("ulMsg") !== null) { document.getElementById("ulMsg").style.display = "none"; } @@ -165,9 +165,6 @@

-

{% if not mainte_csv_up.is_error_message_list_empty() %}
{% for error_message in mainte_csv_up.error_message_list %} @@ -203,5 +200,8 @@
{% endif %}

+ {% with progress_message = '処理中...\nしばらくお待ち下さい。'%} + {% include '_loading.html' %} + {% endwith %} From 9b3ef38a0165cce7f507f3c34b82e1c2bba1856e Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 12:06:54 +0900 Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=E6=96=BD=E8=A8=AD=E6=8B=85?= =?UTF-8?q?=E5=BD=93=E8=80=85CSV=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=89=E7=94=BB=E9=9D=A2=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=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/static/function/businessLogicScript.js | 2 ++ ecs/jskult-webapp/src/templates/instEmpCsvDL.html | 8 ++++---- ecs/jskult-webapp/src/templates/instEmpCsvUL.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index c3aa12dc..32d1a489 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -293,6 +293,8 @@ function checkNumberOnlyForm($this) // 機能概要：マスターメンテメニュー画面に遷移する function backToMainteMenu(){ sessionStorage.clear(); + // ローディング表示 + showLoading(); location.href = "/masterMainte/masterMainteMenu"; } diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html index 8bdc70ba..c51aed07 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html @@ -29,7 +29,7 @@ function Form_Submit_Disp_Dialog(){ var msg = 'CSVファイルを出力しますか？'; if (confirmDialog(msg)) { - document.getElementById("loading").style.display = "block"; + showLoading(); document.getElementById("csvOutputMsg").style.display = "none"; } else { return false; @@ -179,9 +179,9 @@
{{mainte_csv_dl.result_msg}}
{% endif %} {% endif %} -

+ {% with progress_message = '処理中...しばらくお待ち下さい。'%} + {% include '_loading.html' %} + {% endwith %} diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html index 1556e5e2..981e97b8 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html @@ -200,7 +200,7 @@ {% endif %}

- {% with progress_message = '処理中...\nしばらくお待ち下さい。'%} + {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} From 561cb81bdd6fce723303d90b4af2c5472359dd61 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 12:09:17 +0900 Subject: [PATCH 08/12] =?UTF-8?q?feat:=20=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E4=B8=8A=E6=9B=B8=E3=81=8D=E7=94=BB=E9=9D=A2=E3=81=AB?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92?= =?UTF-8?q?=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/tableOverride.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ecs/jskult-webapp/src/templates/tableOverride.html b/ecs/jskult-webapp/src/templates/tableOverride.html index 40c69255..02e43784 100644 --- a/ecs/jskult-webapp/src/templates/tableOverride.html +++ b/ecs/jskult-webapp/src/templates/tableOverride.html @@ -11,7 +11,7 @@ function Form_Submit_Disp_Dialog(){ var msg = "ダミー従業員担当施設マスタのデータがすべて上書きされます。よろしいですか？" if (confirmDialog(msg)) { - document.getElementById("loading").style.display = "block"; + showLoading(); document.getElementById("overRided").style.display = "none"; } else { return false; @@ -53,9 +53,8 @@
ダミー従業員担当施設マスタのデータを本番従業員担当施設マスタのデータで上書きしました

{% endif %} - - + {% with progress_message = 'データ上書き中...しばらくお待ち下さい。'%} + {% include '_loading.html' %} + {% endwith %} From efe1c81b931b17ec4952d177005cc6084f8cc1c0 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 13:46:35 +0900 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E3=83=9E=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=86=E6=A9=9F=E8=83=BD=E3=81=AE=E6=88=BB?= =?UTF-8?q?=E3=82=8B=E3=83=9C=E3=82=BF=E3=83=B3=E7=94=A8=E3=81=AB=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=84=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 @@ -
-
+
+
{{progress_message}}
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 @@
${inner_content || ''}
- +

施設担当者データCSVダウンロード
@@ -180,8 +180,13 @@ {% endif %} {% endif %}

+ {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %} 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() %} {% else %} - + {% endif %} @@ -200,8 +200,14 @@ {% endif %}

+ + {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %} 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 @@ - +

テーブル上書きコピー
@@ -53,8 +53,13 @@
ダミー従業員担当施設マスタのデータを本番従業員担当施設マスタのデータで上書きしました

{% endif %} + {% with progress_message = 'データ上書き中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %} From b6d1b46f48f984dfec0453afcf3bcdb9745626a0 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 13:48:35 +0900 Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E3=83=9E=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=86=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/templates/masterMainteMenu.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ecs/jskult-webapp/src/templates/masterMainteMenu.html b/ecs/jskult-webapp/src/templates/masterMainteMenu.html index 0abc4ec3..fe0f7a93 100644 --- a/ecs/jskult-webapp/src/templates/masterMainteMenu.html +++ b/ecs/jskult-webapp/src/templates/masterMainteMenu.html @@ -10,16 +10,17 @@

MeDaCA
マスターメンテメニュー



- 施設担当者データCSVアップロード

- + 施設担当者データCSVアップロード

- 施設担当者データCSVダウンロード

- + 施設担当者データCSVダウンロード

- テーブル上書きコピー

- + テーブル上書きコピー

-

メニューへ +

メニューへ + + {% with progress_message = ''%} + {% include '_loading.html' %} + {% endwith %} From f94593de9169d21cbc68e3bf73975fe0300a2dc6 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 14:32:38 +0900 Subject: [PATCH 11/12] =?UTF-8?q?feat:=20=E5=8C=BB=E5=B8=AB=E8=A9=B3?= =?UTF-8?q?=E7=B4=B0=E7=94=BB=E9=9D=A2=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=87?= =?UTF-8?q?=E3=82=A3=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 @@ - + - + {% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %} {% if doctor_wrkplace_data.dcf_dsf_inst_cd %} - @@ -211,7 +212,7 @@ {% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %} {% if doctor_wrkplace_his_data.dcf_dsf_inst_cd %} - @@ -225,6 +226,9 @@
@@ -58,7 +58,7 @@
+ {{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}} {{doctor_wrkplace_data.inst_name_kanji or ''}} {{doctor_wrkplace_data.blng_sec_name or ''}}
+ {{doctor_wrkplace_his_data.dcf_dsf_inst_cd or ''}} {{doctor_wrkplace_his_data.inst_name_kanji or ''}} {{doctor_wrkplace_his_data.blng_sec_name or ''}}
- + + {% with progress_message = ''%} + {% include '_loading.html' %} + {% endwith %} \ 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(); } }) From 5d9e9720b84f1ff6d98ca5d75da744440c188dd7 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 18 Aug 2023 14:37:35 +0900 Subject: [PATCH 12/12] =?UTF-8?q?feat:=20=E6=96=BD=E8=A8=AD=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E7=94=BB=E9=9D=A2=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=87?= =?UTF-8?q?=E3=82=A3=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/instInfo.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html index 00f8e9ab..6c1fa1ff 100644 --- a/ecs/jskult-webapp/src/templates/instInfo.html +++ b/ecs/jskult-webapp/src/templates/instInfo.html @@ -41,13 +41,13 @@ - + - +
@@ -86,6 +86,8 @@ }else{ $('#instSearch').attr('method', 'POST'); } + // ローディングを表示 + showLoading(); return true; } @@ -283,5 +285,9 @@
+ + {% with progress_message = ''%} + {% include '_loading.html' %} + {% endwith %} \ No newline at end of file