From 96f29427a4b539f2c4f71a6adc567b72667dfb5b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 28 Jul 2023 17:26:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=AB=E3=83=88=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E6=A4=9C=E7=B4=A2=E7=94=BB=E9=9D=A2=E3=82=92?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/view/ultmarc_doctor_search_view_model.py | 11 +++++------ .../src/model/view/ultmarc_inst_search_view_model.py | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) 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 a623381e..85b3dcf4 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 @@ -1,5 +1,4 @@ import json -from typing import Optional from pydantic import BaseModel @@ -11,10 +10,10 @@ from src.system_var import environment class UltmarcDoctorSearchViewModel(BaseModel): subtitle: str = '医師検索一覧' - is_batch_processing: Optional[bool] + is_batch_processing: bool = None prefc_models: list[PrefcMasterModel] - doctor_data: Optional[list[UltmarcDoctorDBModel]] = [] - form_data: Optional[UltmarcDoctorSearchModel] + doctor_data: list[UltmarcDoctorDBModel] = None + form_data: UltmarcDoctorSearchModel = None def ultmarc_data_json_str(self): """アルトマーク医師データの検索結果を指定された件数ごとに分割しながら返す""" @@ -119,10 +118,10 @@ class UltmarcDoctorSearchViewModel(BaseModel): return self.form_data is not None def is_data_empty(self): - return len(self.doctor_data) == 0 + return self.doctor_data is None or len(self.doctor_data) == 0 def is_data_overflow_max_length(self): - return len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT + return self.doctor_data is not None and len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT def _selected_value(self, form_value: str, current_value: str): return 'selected' if form_value == current_value else '' diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py index b41c77cd..5b5d90c9 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py @@ -1,5 +1,4 @@ import json -from typing import Optional from pydantic import BaseModel @@ -12,11 +11,11 @@ from src.system_var import environment class UltmarcInstSearchViewModel(BaseModel): subtitle: str = '施設検索一覧' - is_batch_processing: Optional[bool] + is_batch_processing: bool = None prefc_models: list[PrefcMasterModel] inst_div_models: list[InstDivMasterModel] - inst_data: Optional[list[UltmarcInstDBModel]] = [] - form_data: Optional[UltmarcInstSearchModel] + inst_data: list[UltmarcInstDBModel] = None + form_data: UltmarcInstSearchModel = None def ultmarc_data_json_str(self): """アルトマーク施設データの検索結果を指定された件数ごとに分割しながら返す""" @@ -119,10 +118,10 @@ class UltmarcInstSearchViewModel(BaseModel): return self.form_data is not None def is_data_empty(self): - return len(self.inst_data) == 0 + return self.inst_data is None or len(self.inst_data) == 0 def is_data_overflow_max_length(self): - return len(self.inst_data) >= environment.ULTMARC_SEARCH_RESULT_MAX_COUNT + return self.inst_data is not None and len(self.inst_data) >= environment.ULTMARC_SEARCH_RESULT_MAX_COUNT def _selected_value(self, form_value: str, current_value: str): return 'selected' if form_value == current_value else ''