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()">