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

refactor: モデルクラス名とファイル名を修正

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-07-28 09:17:32 +09:00
parent 6f8b480cd5
commit 739384febd
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py → ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py
View File

@ -9,7 +9,7 @@ from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
from src.system_var import environment
class UltmarcDoctorViewModel(BaseModel):
class UltmarcDoctorSearchViewModel(BaseModel):
subtitle: str = '医師検索一覧'
is_batch_processing: Optional[bool]
prefc_models: list[PrefcMasterModel]

2
ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py → ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py
View File

@ -10,7 +10,7 @@ from src.model.request.ultmarc_inst import UltmarcInstSearchModel
from src.system_var import environment
class UltmarcInstViewModel(BaseModel):
class UltmarcInstSearchViewModel(BaseModel):
subtitle: str = '施設検索一覧'
is_batch_processing: Optional[bool]
prefc_models: list[PrefcMasterModel]

14
ecs/jskult-webapp/src/services/ultmarc_view_service.py
View File

@ -3,10 +3,12 @@ from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
from src.model.request.ultmarc_inst import UltmarcInstSearchModel
from src.model.view.ultmarc_doctor_info_view_model import \
UltmarcDoctorInfoViewModel
from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
from src.model.view.ultmarc_doctor_search_view_model import \
UltmarcDoctorSearchViewModel
from src.model.view.ultmarc_inst_info_view_model import \
UltmarcInstInfoViewModel
from src.model.view.ultmarc_inst_view_model import UltmarcInstViewModel
from src.model.view.ultmarc_inst_search_view_model import \
UltmarcInstSearchViewModel
from src.repositories.base_repository import BaseRepository
from src.repositories.inst_master_repository import InstDivMasterRepository
from src.repositories.prefc_master_repository import PrefcMasterRepository
@ -70,12 +72,12 @@ class UltmarcViewService(BaseService):
#########################
def prepare_ultmarc_doctor_search_view(
self
) -> UltmarcDoctorViewModel:
) -> UltmarcDoctorSearchViewModel:
# 医師一覧画面の表示データ取得
# 都道府県リストを取得
prefcs = self.prefc_repository.fetch_all()
ultmarc = UltmarcDoctorViewModel(
ultmarc = UltmarcDoctorSearchViewModel(
prefc_models=prefcs
)
return ultmarc
@ -118,14 +120,14 @@ class UltmarcViewService(BaseService):
#########################
def prepare_ultmarc_inst_search_view(
self
) -> UltmarcInstViewModel:
) -> UltmarcInstSearchViewModel:
# 施設一覧画面の表示データ取得
# 都道府県リストを取得
prefcs = self.prefc_repository.fetch_all()
# 施設区分リストを取得
inst_div = self.inst_div_repository.fetch_all()
ultmarc = UltmarcInstViewModel(
ultmarc = UltmarcInstSearchViewModel(
prefc_models=prefcs,
inst_div_models=inst_div
)