仮でコミット

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]

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
         )
 

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 ''

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

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{

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;
+        // }
     }
 
     // 検索ボタンを再度非活性にする

ecs/jskult-webapp/src/templates/docSearch.html

@@ -105,9 +105,12 @@
                         value="{{ultmarc.is_input_alma()}}" oninput="formBtDisabled()">
                     </td>
                     <td class="docSearchColumnTd">卒年：</td>
-                    <td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y"
+                    <td class="docSearchTextboxTd">
+                        <input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y"
                         value="{{ultmarc.is_input_grad_y()}}" maxlength='4' oninput="formBtDisabled()"></td>
-                    <td class="search_btTd" colspan="2">
+                    <td class="docSearchColumnTd"><label><input type="checkbox" name="use_stop_div_ctrl" value="true"
+                        {{ultmarc.is_use_stop_div()}}> 利用停止区分を含む</label></td>
+                    <td class="search_btTd">
                         <input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();">
                         <input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
                     </td>
@@ -140,6 +143,7 @@
                         <th>役職名</th>
                         <th>出身大学</th>
                         <th>卒年</th>
+                        <th>利用停止区分</th>
                     </tr>
                 </thead>
                 <tbody id="result_data" class="result_data"></tbody>
@@ -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) =>{