nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: アルトマーク検索画面を対応

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-07-28 17:26:15 +09:00
parent 175b4c41af
commit 96f29427a4
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py
View File

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

11
ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py
View File

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