From 8e4e6eb757abbc8549fce3363af126e5aacb2521 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 11 Oct 2023 11:54:28 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C=20?= =?UTF-8?q?NEWDWH2021-1276=20=E6=96=BD=E8=A8=AD=E6=8B=85=E5=BD=93=E8=80=85?= =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BFCSV=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?creater,updater=E3=81=8CMUID=E3=81=AB=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/master_mainte.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index ac9fa50b..e9d4ed14 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -19,6 +19,7 @@ from src.model.view.master_mainte_menu_view_model import \ from src.model.view.table_override_view_model import TableOverrideViewModel from src.router.session_router import AuthenticatedRoute from src.services.batch_status_service import BatchStatusService +from src.services.login_service import LoginService from src.services.master_mainte_service import MasterMainteService from src.system_var import constants from src.templates import templates @@ -164,7 +165,8 @@ def new_inst_result_view( request: Request, csv_upload_form: Optional[MasterMainteCsvUpModel] = Depends(MasterMainteCsvUpModel.as_form), master_mainte_service: MasterMainteService = Depends(get_service(MasterMainteService)), - batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)) + batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)), + login_service: LoginService = Depends(get_service(LoginService)) ): session: UserSession = request.session @@ -179,9 +181,10 @@ def new_inst_result_view( # dump処理中の場合、ログアウトさせる if batch_status_service.is_dump_processing(): raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BACKUP_PROCESSING) - - # 画面表示用のモデル - mainte_csv_up = master_mainte_service.prepare_mainte_new_inst_view(session.user_id, csv_upload_form) + # ユーザIDからユーザ名を取得 + user_name = login_service.logged_in_user(session.user_id).user_name + # CSVデータを登録し、登録完了画面のモデルを返却する + mainte_csv_up = master_mainte_service.prepare_mainte_new_inst_view(user_name, csv_upload_form) # レスポンス session_key = session.session_key