diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py index ed966685..f440332d 100644 --- a/ecs/jskult-webapp/src/controller/ultmarc.py +++ b/ecs/jskult-webapp/src/controller/ultmarc.py @@ -27,15 +27,20 @@ router.route_class = AuthenticatedRoute @router.get('/docSearch') def ultmarc_view( request: Request, - # batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)), + batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)), ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)) ): session: UserSession = request.session # バッチ処理中の場合、機能を利用させない + 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) + # # 検索項目の取得 ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session) + ultmarc.is_batch_processing = is_batch_processing + # セッション書き換え session.update( actions=[ diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py index 1e3cf236..894573e4 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py @@ -14,7 +14,7 @@ from src.system_var import environment class UltmarcDoctorViewModel(BaseModel): subtitle: str = '医師検索一覧' - batch_status: Optional[str] + is_batch_processing: Optional[bool] prefc_models: list[PrefcMasterModel] doctor_data: Optional[list[BisDisplayModel]] = [] form_data: Optional[BioModel] diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index 45189de3..26d17b9f 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -162,7 +162,10 @@ if (!isset($isDBSuccess)) { // バッチ処理中判断 if(getDateBatchJSString($dbs, $user, $pass) && $isDBSuccess){ ?> --> -