From 5b5ef1942538f744f5dfffa3aa8c21347bc43f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 14 Aug 2023 10:04:33 +0900 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BB=AE=E3=81=A7=E3=82=B3=E3=83=9F?= =?UTF-8?q?=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/model/db/ultmarc_doctor.py | 1 + .../src/model/request/ultmarc_doctor.py | 3 +++ .../model/view/ultmarc_doctor_search_view_model.py | 9 +++++++++ .../src/repositories/ultmarc_doctor_repository.py | 1 + ecs/jskult-webapp/src/static/css/ultStyle.css | 1 + .../src/static/function/businessLogicScript.js | 6 +++++- ecs/jskult-webapp/src/templates/docSearch.html | 12 +++++++++--- 7 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py index f5576a02..16b120c0 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py @@ -15,5 +15,6 @@ class UltmarcDoctorDBModel(BaseDBModel): form_post_name: Optional[str] alma: Optional[str] grad_y: Optional[str] + use_stop_div: Optional[str] prefc_name: Optional[str] blng_sec_cd: Optional[str] diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py index 6015731e..b670c126 100644 --- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py +++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py @@ -17,6 +17,7 @@ class UltmarcDoctorSearchModel(RequestBaseModel): trt_course_name: Optional[str] alma: Optional[str] grad_y: Optional[str] + use_stop_div: Optional[str] pagination_page_number: Optional[int] @classmethod @@ -33,6 +34,7 @@ class UltmarcDoctorSearchModel(RequestBaseModel): ctrl_trt_course_name: str = Form(None), ctrl_alma: str = Form(None), ctrl_grad_y: str = Form(None), + use_stop_div_ctrl: str = Form(None), pagination_page_number: str = Form(None) ): @@ -48,6 +50,7 @@ class UltmarcDoctorSearchModel(RequestBaseModel): trt_course_name=ctrl_trt_course_name, alma=ctrl_alma, grad_y=ctrl_grad_y, + use_stop_div=use_stop_div_ctrl, pagination_page_number=pagination_page_number ) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py index 801b9cec..0b122a39 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py @@ -112,6 +112,12 @@ class UltmarcDoctorSearchViewModel(BaseModel): return '' return self.form_data.grad_y or '' + # 利用停止区分 + def is_use_stop_div(self): + if not self.is_form_submitted(): + return 'checked' + return self._checked_value(self.form_data.use_stop_div) + def disabled_button(self): return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else '' @@ -126,3 +132,6 @@ class UltmarcDoctorSearchViewModel(BaseModel): def _selected_value(self, form_value: str, current_value: str): return 'selected' if form_value == current_value else '' + + def _checked_value(self, form_value: str): + return 'checked' if form_value else '' diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 9ad3ce16..44b0ab6b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -25,6 +25,7 @@ class UltmarcDoctorRepository(BaseRepository): com_post.form_post_name, com_alma.alma, com_dr.grad_y, + com_dr.use_stop_div, mst_prefc.prefc_name, com_dr_wrkplace.blng_sec_cd FROM diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css index c0c4649a..036df4a4 100644 --- a/ecs/jskult-webapp/src/static/css/ultStyle.css +++ b/ecs/jskult-webapp/src/static/css/ultStyle.css @@ -81,6 +81,7 @@ table{ margin-left: 3%; margin-top: 0.8%; margin-bottom: 0.8%; + text-align: center; } .notFind{ diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index 56d971e4..41db495e 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -12,13 +12,17 @@ function backToMenu(){ function clr() { const formElement = document.search const formInputElements = Array.from(formElement.elements) + const checkBoxArr = ['ikoFlg', 'delFlg_ctrl', 'use_stop_div_ctrl'] for (const formInput of formInputElements) { if (formInput.name.startsWith('ctrl_')) { formInput.value = ""; } - if(formInput.name == 'ikoFlg' || formInput.name == 'delFlg_ctrl'){ + if (checkBoxArr.includes(formInput.name)) { formInput.checked = false; } + // if(formInput.name == 'ikoFlg' || formInput.name == 'delFlg_ctrl' || formInput.name == 'use_stop_div_ctrl'){ + // formInput.checked = false; + // } } // 検索ボタンを再度非活性にする diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index dfedc2eb..dea94564 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -105,9 +105,12 @@ value="{{ultmarc.is_input_alma()}}" oninput="formBtDisabled()"> 卒年： - + - + + @@ -140,6 +143,7 @@ 役職名 出身大学 卒年 + 利用停止区分 @@ -180,6 +184,7 @@ sessionStorage.setItem('ctrl_trt_course_name','{{ultmarc.is_input_trt_course_name()}}'); sessionStorage.setItem('ctrl_alma','{{ultmarc.is_input_alma()}}'); sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}'); + sessionStorage.setItem('use_stop_div_ctrl','{{ultmarc.is_use_stop_div()}}'); // ページネーションのページ番号取得 let pagination_page_number = Number('{{ultmarc.init_pagination_page_number()}}'); @@ -231,7 +236,8 @@ 'trt_course_name', 'form_post_name', 'alma', - 'grad_y' + 'grad_y', + 'use_stop_div' ]; return datas.map(function (data) { let td = display_keys.map((key) =>{ From 97771bd6acf75649fe16555f49b3aa7c4b9a6b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 17 Aug 2023 09:12:18 +0900 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BB=AE=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88=EF=BC=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/db/ultmarc_doctor_info.py | 1 + .../src/model/db/ultmarc_doctor_wrkplace.py | 1 + .../model/db/ultmarc_doctor_wrkplace_his.py | 1 + .../view/ultmarc_doctor_info_view_model.py | 25 +++++++++++++++++++ .../view/ultmarc_doctor_search_view_model.py | 23 ++++++++++++++++- .../repositories/ultmarc_doctor_repository.py | 8 +++++- .../ultmarc_dr_wrkplace_his_repository.py | 3 ++- .../ultmarc_dr_wrkplace_repository.py | 3 ++- ecs/jskult-webapp/src/templates/docInfo.html | 5 ++++ .../src/templates/docSearch.html | 7 +++--- 10 files changed, 70 insertions(+), 7 deletions(-) diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py index 6f20dfb9..7999de13 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py @@ -14,5 +14,6 @@ class UltmarcDoctorInfoDBModel(BaseDBModel): alma: Optional[str] hometown: Optional[str] grad_y: Optional[str] + use_stop_div: Optional[str] drday_y: Optional[str] estab_y: Optional[str] diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py index b0c8a5d1..103cd9f1 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py @@ -11,3 +11,4 @@ class UltmarcDoctorWrkplaceDBModel(BaseDBModel): univ_post_name: Optional[str] post_name: Optional[str] aply_start_ymd: Optional[date] + notdm_flg: Optional[str] diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py index 9572bb5d..04450f9a 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py @@ -11,3 +11,4 @@ class UltmarcDoctorWrkplaceHisDBModel(BaseDBModel): post_name: Optional[str] aply_start_ymd: Optional[str] aply_end_ymd: Optional[str] + notdm_flg: Optional[str] diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py index a92ea9e1..ab9546ad 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py @@ -45,6 +45,24 @@ class UltmarcDoctorInfoViewModel(BaseModel): def is_input_birthday_format(self): return self._format_date_string(self.doctor_info_data.birthday) + # 利用停止区分 + def is_input_use_stop_div_category_name(self): + if self.doctor_info_data.use_stop_div: + use_stop_div = self.doctor_info_data.use_stop_div + # 利用停止区分の文言設定 + # 01：全面的に利用停止 + # 03：特定の項目について利用停止 + # 04：全てのＤＭ等利用停止 + if (use_stop_div == '01'): + return '全面的に利用停止' + if (use_stop_div == '03'): + return '特定の項目について利用停止' + if (use_stop_div == '04'): + return '全てのＤＭ等利用停止' + return '' + else: + return '' + # 開始年月日 def is_input_aply_start_ymd_format(self, aply_start_date: datetime): if aply_start_date: @@ -70,6 +88,13 @@ class UltmarcDoctorInfoViewModel(BaseModel): else: return '' + # DM不可フラグ + def is_input_notdm_flg_name(self, notdm_flg: str): + if notdm_flg and notdm_flg == '1': + return '不可' + else: + return '' + def is_input_trt_course_data_size(self): return len(self.trt_coursed_data) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py index 0b122a39..01fea27f 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py @@ -113,11 +113,32 @@ class UltmarcDoctorSearchViewModel(BaseModel): return self.form_data.grad_y or '' # 利用停止区分 - def is_use_stop_div(self): + def is_checked_use_stop_div(self): if not self.is_form_submitted(): return 'checked' return self._checked_value(self.form_data.use_stop_div) + def is_input_use_stop_div(self): + if not self.is_form_submitted(): + return '' + return self.form_data.use_stop_div or '' + + def is_input_use_stop_div_category_name(self, use_stop_div: str): + if use_stop_div: + # 利用停止区分の文言設定 + # 01：全面停止 + # 03：特定項目停止 + # 04：全ＤＭ停止 + if (use_stop_div == '01'): + return '全面停止' + if (use_stop_div == '03'): + return '特定項目停止' + if (use_stop_div == '04'): + return '全ＤＭ停止' + return '' + else: + return '' + def disabled_button(self): return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else '' diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 44b0ab6b..3c49c18b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -56,7 +56,7 @@ class UltmarcDoctorRepository(BaseRepository): clone_parameter = UltmarcDoctorSearchModel(**parameter.model_dump()) where_clause = self.__build_condition(clone_parameter) query = self.FETCH_SQL.format(where_clause=where_clause) - result = self._database.execute_select(query, clone_parameter.model_dump()) + result = self._database.execute_select(query, parameter.model_dump()) models = [UltmarcDoctorDBModel(**r) for r in result] return models @@ -142,6 +142,11 @@ class UltmarcDoctorRepository(BaseRepository): parameter.grad_y = f'%{parameter.grad_y}%' where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y')) + # 利用停止区分 + if is_not_empty(parameter.use_stop_div) is False: + # 01・03・04を対象外とする + where_clauses.append(SQLCondition('', '', "(use_stop_div NOT IN ('01','03','04'))", literal=True)) + # 廃業除外 if where_clauses: where_clauses.append(SQLCondition( @@ -163,6 +168,7 @@ class UltmarcDoctorRepository(BaseRepository): com_alma.alma, com_hometown.hometown, com_dr.grad_y, + com_dr.use_stop_div, com_dr.drday_y, com_dr.estab_y FROM src05.com_dr diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py index 054c9d74..cd2464cd 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py @@ -16,7 +16,8 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository): univ_post.form_post_name as univ_post_name, post.form_post_name as post_name, com_dr_wrkplace_his.aply_start_ymd, - com_dr_wrkplace_his.aply_end_ymd + com_dr_wrkplace_his.aply_end_ymd, + com_dr_wrkplace_his.notdm_flg FROM src05.com_dr LEFT JOIN src05.com_dr_wrkplace_his ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace_his.dcf_pcf_dr_cd LEFT JOIN src05.com_inst ON com_dr_wrkplace_his.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py index 4798c467..0e98f64b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py @@ -16,7 +16,8 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): com_blng_sec.blng_sec_name, univ_post.form_post_name AS univ_post_name, post.form_post_name AS post_name, - com_dr_wrkplace.aply_start_ymd + com_dr_wrkplace.aply_start_ymd, + com_dr_wrkplace.notdm_flg FROM src05.com_dr LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html index 59a0f8ba..5a5be87a 100644 --- a/ecs/jskult-webapp/src/templates/docInfo.html +++ b/ecs/jskult-webapp/src/templates/docInfo.html @@ -94,6 +94,8 @@ 生年月日: + 利用停止区分: + @@ -185,6 +187,7 @@ 職位 開始年月日 終了年月日 + DM不可 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 08/17] =?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 09/17] =?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 10/17] =?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 11/17] =?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 12/17] =?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 13/17] =?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 14/17] =?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 15/17] =?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 From 2376e6a6026ed60af50bca66b7c416aae0983d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 18 Aug 2023 16:19:41 +0900 Subject: [PATCH 16/17] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?= =?UTF-8?q?=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/ultmarc_doctor_info_view_model.py | 49 +++++++------------ .../view/ultmarc_doctor_search_view_model.py | 19 ++----- .../static/function/businessLogicScript.js | 6 +-- ecs/jskult-webapp/src/system_var/constants.py | 13 +++++ .../src/templates/docSearch.html | 15 ++---- 5 files changed, 39 insertions(+), 63 deletions(-) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py index ab9546ad..4f027f2e 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py @@ -11,7 +11,7 @@ from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel from src.model.db.ultmarc_specialist_license import \ UltmarcSpecialistLicenseDBModel from src.model.db.ultmarc_trt_course import UltmarcDrTrtCourseDBModel -from src.system_var import environment +from src.system_var import constants, environment class UltmarcDoctorInfoViewModel(BaseModel): @@ -47,53 +47,40 @@ class UltmarcDoctorInfoViewModel(BaseModel): # 利用停止区分 def is_input_use_stop_div_category_name(self): - if self.doctor_info_data.use_stop_div: - use_stop_div = self.doctor_info_data.use_stop_div - # 利用停止区分の文言設定 - # 01：全面的に利用停止 - # 03：特定の項目について利用停止 - # 04：全てのＤＭ等利用停止 - if (use_stop_div == '01'): - return '全面的に利用停止' - if (use_stop_div == '03'): - return '特定の項目について利用停止' - if (use_stop_div == '04'): - return '全てのＤＭ等利用停止' - return '' - else: + if not self.doctor_info_data.use_stop_div: return '' + return constants.DISPLAY_USER_STOP_DIV.get(self.doctor_info_data.use_stop_div, '') # 開始年月日 def is_input_aply_start_ymd_format(self, aply_start_date: datetime): - if aply_start_date: - return self._format_date(aply_start_date) - else: + if not aply_start_date: return '' + return self._format_date(aply_start_date) # 医師勤務先履歴_開始年月日 def is_input_his_aply_start_ymd_format(self, aply_start_date_string: str): - if aply_start_date_string: - # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す - aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d') - return self._format_date(aply_start_date) - else: + if not aply_start_date_string: return '' + # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す + aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d') + return self._format_date(aply_start_date) + # 医師勤務先履歴_終了年月日 def is_input_his_aply_end_ymd_format(self, aply_end_date_string: str): - if aply_end_date_string: - # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す - aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d') - return self._format_date(aply_end_date) - else: + if not aply_end_date_string: return '' + # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す + aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d') + return self._format_date(aply_end_date) + # DM不可フラグ def is_input_notdm_flg_name(self, notdm_flg: str): - if notdm_flg and notdm_flg == '1': - return '不可' - else: + if not notdm_flg: return '' + if notdm_flg == '1': + return '不可' def is_input_trt_course_data_size(self): return len(self.trt_coursed_data) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py index 01fea27f..cecfd77d 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py @@ -6,7 +6,7 @@ from pydantic import BaseModel from src.model.db.prefc_master import PrefcMasterModel from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel -from src.system_var import environment +from src.system_var import constants, environment class UltmarcDoctorSearchViewModel(BaseModel): @@ -123,21 +123,8 @@ class UltmarcDoctorSearchViewModel(BaseModel): return '' return self.form_data.use_stop_div or '' - def is_input_use_stop_div_category_name(self, use_stop_div: str): - if use_stop_div: - # 利用停止区分の文言設定 - # 01：全面停止 - # 03：特定項目停止 - # 04：全ＤＭ停止 - if (use_stop_div == '01'): - return '全面停止' - if (use_stop_div == '03'): - return '特定項目停止' - if (use_stop_div == '04'): - return '全ＤＭ停止' - return '' - else: - return '' + def get_use_stop_div_category_name_short(self): + return json.dumps(constants.DISPLAY_USER_STOP_DIV_SHORT, ensure_ascii=False) def disabled_button(self): return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else '' diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index 41db495e..a4b2b6d9 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -12,17 +12,13 @@ function backToMenu(){ function clr() { const formElement = document.search const formInputElements = Array.from(formElement.elements) - const checkBoxArr = ['ikoFlg', 'delFlg_ctrl', 'use_stop_div_ctrl'] for (const formInput of formInputElements) { if (formInput.name.startsWith('ctrl_')) { formInput.value = ""; } - if (checkBoxArr.includes(formInput.name)) { + if (formInput.type === 'checkbox') { formInput.checked = false; } - // if(formInput.name == 'ikoFlg' || formInput.name == 'delFlg_ctrl' || formInput.name == 'use_stop_div_ctrl'){ - // formInput.checked = false; - // } } // 検索ボタンを再度非活性にする diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index e421bd70..ed3d3add 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -194,3 +194,16 @@ MENTE_CSV_DOWNLOAD_FILE_NAME = 'instEmpData.csv' # CSVアップロードの制限サイズ＝20MB MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE = 20971520 + +# 利用停止区分 +DISPLAY_USER_STOP_DIV = { + '01': '全面的に利用停止', + '03': '特定の項目について利用停止', + '04': '全てのＤＭ等利用停止' +} + +DISPLAY_USER_STOP_DIV_SHORT = { + '01': '全面停止', + '03': '特定項目利用停止', + '04': '全ＤＭ停止' +} diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index 7c219571..3342ee9b 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -239,23 +239,16 @@ 'grad_y', 'use_stop_div' ]; + const useStopDivCategoryName = JSON.parse('{{ultmarc.get_use_stop_div_category_name_short()|safe}}'); return datas.map(function (data) { let td = display_keys.map((key) =>{ let inner_content = data[key]; if(key=='dcf_pcf_dr_cd') inner_content = `${data['dcf_pcf_dr_cd'] || ''}`; - if(key=='dcf_dsf_inst_cd') + else if(key=='dcf_dsf_inst_cd') inner_content = `${data['form_inst_name_kanji'] || ''}`; - if(key=='use_stop_div') - if(inner_content == '01'){ - inner_content = '全面停止'; - }else if(inner_content == '03'){ - inner_content = '特定項目停止'; - }else if(inner_content == '04'){ - inner_content = '全ＤＭ停止'; - }else{ - inner_content = ''; - } + else if(key=='use_stop_div') + inner_content = useStopDivCategoryName[inner_content] || ''; return `${inner_content || ''}` }); return ` From 4df7515d09cc829dcbbd611d4b8d295b42c014f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 21 Aug 2023 11:35:12 +0900 Subject: [PATCH 17/17] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/system_var/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index ed3d3add..3756facb 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -204,6 +204,6 @@ DISPLAY_USER_STOP_DIV = { DISPLAY_USER_STOP_DIV_SHORT = { '01': '全面停止', - '03': '特定項目利用停止', + '03': '特定項目停止', '04': '全ＤＭ停止' }