From 5359486197fa214974a56888d1ec0b2cb498e84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Wed, 14 Jun 2023 15:35:55 +0900
Subject: [PATCH] =?UTF-8?q?delFlg=5Fctrl=20=E8=8B=A6=E8=82=89=E3=81=AE?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/model/request/ultmarc_inst.py         |  4 ++--
 .../repositories/ultmarc_doctor_repository.py |  9 ++-------
 .../src/templates/bioSearchList.html          |  4 ++--
 .../src/templates/docSearch.html              |  2 --
 .../src/templates/instSearch.html             | 20 +++++++++----------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index 8b9a52c6..ba06a443 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -28,7 +28,7 @@ class UltmarcInstModel(BaseModel):
         ctrl_postal_number: str = Form(None),
         ctrl_inst_phone_number: str = Form(None),
         ctrl_prefc_cd: str = Form(None),
-        ctrl_delFlg: str = Form(None),
+        delFlg_ctrl: str = Form(None),
         ctrl_inst_addr: str = Form(None)
     ):
         return cls(
@@ -39,7 +39,7 @@ class UltmarcInstModel(BaseModel):
             postal_number=ctrl_postal_number,
             inst_phone_number=ctrl_inst_phone_number,
             prefc_cd=ctrl_prefc_cd,
-            delFlg=ctrl_delFlg,
+            delFlg=delFlg_ctrl,
             inst_addr=ctrl_inst_addr
         )
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 5860148c..bd89db0b 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -34,6 +34,8 @@ class UltmarcDoctorRepository(BaseRepository):
     LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
     WHERE
         {where_clause}
+        AND (length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)
+        AND (length(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)
     GROUP BY com_dr.dcf_pcf_dr_cd, com_inst.dcf_dsf_inst_cd, com_blng_sec.blng_sec_cd
     ORDER BY
         com_dr.dcf_pcf_dr_cd,
@@ -127,13 +129,6 @@ class UltmarcDoctorRepository(BaseRepository):
             parameter.grad_y = f'%{parameter.grad_y}%'
             where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y'))
 
-        # 検索条件が入力されていない場合
-        # if not where_clauses:
-        #     where_clauses.append(SQLCondition(
-        #         '', '', '(LENGTH(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True))
-        #     where_clauses.append(SQLCondition(
-        #         '', '', '(LENGTH(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)', literal=True))
-
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index d44247c1..09f1a718 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -176,12 +176,12 @@
             </table>
             {% if bio.is_form_submitted() and bio.is_data_overflow_max_length() %}
             <div class="resultAreaMsg">
-                検索結果が最大件数を超えました。検索条件を見直しして下さい。
+                検索件数が500件を超えています 検索項目を見直してください
             </div>
             {% endif %}
             {% if bio.is_form_submitted() and bio.is_data_empty() %}
             <div class="resultAreaMsg">
-                対象のデータが存在しません。
+                対象のデータが存在しません
             </div>
             {% endif %}
         </div>
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 403b7f33..0b86e837 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
 	<script type="text/javascript">
-		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
-
 		window.onload = function(){
             // 見出し固定初期化
             FixedMidashi.create();
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 15988f05..d27197f4 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
 	<script type="text/javascript">
-		controlCount = 8; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
-
 		window.onload = function(){
             // 見出し固定初期化
             FixedMidashi.create();
@@ -49,7 +47,7 @@
 							<option value=""></option>
                             {% for inst_div in ultmarc.inst_div_models %}
                             <option value="{{inst_div['inst_div_cd']}}" {{ultmarc.is_selected_inst_div_cd(inst_div['inst_div_cd'])}}>
-                                {{inst_div['inst_div_name']}}
+                                {{inst_div['inst_div_cd']}}:{{inst_div['inst_div_name']}}
                             </option>
                             {% endfor %}
 						</select>
@@ -81,7 +79,7 @@
 					<td>都道府県：</td>
 					<td class="search_tb">
 						<!-- 都道府県のドロップダウン -->
-						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead(controlCount)">
+						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
 							<!-- 都道府県ドロップダウンの中身を作成 -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
@@ -93,8 +91,8 @@
 						</select>
 					</td>
 					<td>
-						<label><input type="checkbox" name="ctrl_delFlg" value="true" 
-						onchange="formBtDisabled()" {{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
+						<label><input type="checkbox" name="delFlg_ctrl" value="true" 
+							{{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
 					</td>
 				</tr>
 				<tr>
@@ -104,8 +102,8 @@
                         value="{{ultmarc.is_input_inst_addr()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="search_btTd" colspan="2">
-						<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">
+						<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>
 				</tr>
 			</tbody>
@@ -142,12 +140,12 @@
 			</table>
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
 			<div class="resultAreaMsg">
-				検索結果が最大件数を超えました。検索条件を見直しして下さい。
+				検索件数が500件を超えています 検索項目を見直してください
 			</div>
 			{% endif %}
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
 			<div class="resultAreaMsg">
-				対象のデータが存在しません。
+				対象のデータが存在しません
 			</div>
 			{% endif %}
 			</div>
@@ -179,7 +177,7 @@
 			sessionStorage.setItem('ctrl_postal_number','{{ultmarc.is_input_postal_number()}}');
 			sessionStorage.setItem('ctrl_inst_phone_number','{{ultmarc.is_input_inst_phone_number()}}');
 			sessionStorage.setItem('ctrl_prefc_cd','{{ultmarc.is_input_form_prefc_cd()}}');
-			sessionStorage.setItem('ctrl_delFlg','{{ultmarc.is_input_delFlg()}}');
+			sessionStorage.setItem('delFlg_ctrl','{{ultmarc.is_input_delFlg()}}');
 			sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
 
             $(".pagination").pagination({