diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py index f440332d..19d43e5e 100644 --- a/ecs/jskult-webapp/src/controller/ultmarc.py +++ b/ecs/jskult-webapp/src/controller/ultmarc.py @@ -6,7 +6,7 @@ from starlette import status from src.depends.services import get_service from src.model.internal.session import UserSession -from src.model.request.bio import BioModel +from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.model.view.bio_view_model import BioViewModel from src.router.session_router import AuthenticatedRoute from src.services.batch_status_service import BatchStatusService @@ -25,7 +25,7 @@ router.route_class = AuthenticatedRoute @router.get('/docSearch') -def ultmarc_view( +def ultmarc_doctor_view( request: Request, batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)), ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)) @@ -59,25 +59,30 @@ def ultmarc_view( return templates_response -@router.post('/BioSearchList') -def search_bio( +@router.post('/docSearch') +def search_doc( request: Request, - bio_form: Optional[BioModel] = Depends(BioModel.as_form), - bio_service: BioViewService = Depends(get_service(BioViewService)), + ultmarc_doctor_form: Optional[UltmarcDoctorModel] = Depends(UltmarcDoctorModel.as_form), + ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)), batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)) ): # error_log(date("Y/m/d H:i:s") . " [INFO] UserId:" . $UserId . "\r\n", 3, "$execLog"); session: UserSession = request.session # バッチ処理中の場合、機能を利用させない - if batch_status_service.is_batch_processing(): - raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING) + # is_batch_processing = batch_status_service.is_batch_processing() + # if batch_status_service.is_batch_processing(): + # raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING) # 生物由来データを検索 - bio_sales_view_data = bio_service.search_bio_data(bio_form) + ultmarc_doctor_data = [] # 検索項目などのデータを取得 - bio: BioViewModel = bio_service.prepare_bio_view(session) - bio.bio_data = bio_sales_view_data - bio.form_data = bio_form + ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session) + ultmarc.is_batch_processing = batch_status_service.is_batch_processing() + ultmarc.doctor_data = ultmarc_doctor_data + + # bio: BioViewModel = bio_service.prepare_bio_view(session) + # bio.bio_data = ultmarc_doctor_data + # bio.form_data = bio_form # セッション書き換え session.update( actions=[ @@ -87,9 +92,9 @@ def search_bio( ) session_key = set_session(session) templates_response = templates.TemplateResponse( - 'bioSearchList.html', { + 'docSearch.html', { 'request': request, - 'bio': bio + 'ultmarc': ultmarc, }, headers={'session_key': session_key} ) diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py new file mode 100644 index 00000000..5935c076 --- /dev/null +++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py @@ -0,0 +1,51 @@ +from typing import Optional + +from fastapi import Form +from pydantic import BaseModel + +from src.util.sanitize import sanitize + + +@sanitize +class UltmarcDoctorModel(BaseModel): + dcf_pcf_dr_cd: Optional[str] + dr_name: Optional[str] + dr_name_kana: Optional[str] + dcf_dsf_inst_cd: Optional[str] + form_inst_name_kanji: Optional[str] + form_inst_name_kana: Optional[str] + prefc_cd: Optional[str] + blng_sec_name: Optional[str] + trt_course_name: Optional[str] + alma: Optional[str] + grad_y: Optional[str] + + @classmethod + def as_form( + cls, + ctrl_dcf_pcf_dr_cd: str = Form(None), + ctrl_dr_name: str = Form(None), + ctrl_dr_name_kana: str = Form(None), + ctrl_dcf_dsf_inst_cd: str = Form(None), + ctrl_form_inst_name_kanji: str = Form(None), + ctrl_form_inst_name_kana: str = Form(None), + ctrl_prefc_cd: str = Form(None), + ctrl_blng_sec_name: str = Form(None), + ctrl_trt_course_name: str = Form(None), + ctrl_alma: str = Form(None), + ctrl_grad_y: str = Form(None) + ): + + return cls( + dcf_pcf_dr_cd=ctrl_dcf_pcf_dr_cd, + dr_name=ctrl_dr_name, + dr_name_kana=ctrl_dr_name_kana, + dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd, + form_inst_name_kanji=ctrl_form_inst_name_kanji, + form_inst_name_kana=ctrl_form_inst_name_kana, + prefc_cd=ctrl_prefc_cd, + blng_sec_name=ctrl_blng_sec_name, + trt_course_name=ctrl_trt_course_name, + alma=ctrl_alma, + grad_y=ctrl_grad_y + ) diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index 26d17b9f..d639d28f 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -180,15 +180,14 @@ if (!isset($isDBSuccess)) {