From ee75473d602a41bff9e907457351f609839b5bda Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 11 Oct 2023 11:35:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=A6=81=E6=9C=9B=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=20NEWDWH2021-1267=20=E5=88=A9=E7=94=A8=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E5=8C=BA=E5=88=86=E3=81=AE=E6=96=87=E8=A8=80=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/templates/docSearch.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index c8bd7609..5698807f 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -109,7 +109,7 @@ + {{ultmarc.is_checked_use_stop_div()}}> 「利用停止」医師を含む From 16deee9e4ed7333914b654f7c58266c0ac7ceec8 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 11 Oct 2023 11:43:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=A6=81=E6=9C=9B=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=20NEWDWH2021-1266=20=E3=82=B3=E3=83=BC=E3=83=9D?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=AB=E3=83=A9=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/static/css/bioStyle.css | 2 -- ecs/jskult-webapp/src/static/css/main_theme.css | 5 +++++ ecs/jskult-webapp/src/static/css/masterMainte.css | 5 ----- ecs/jskult-webapp/src/static/css/menuStyle.css | 2 -- ecs/jskult-webapp/src/static/css/pagenation.css | 2 +- ecs/jskult-webapp/src/static/css/ultStyle.css | 2 -- ecs/jskult-webapp/src/templates/_header.html | 1 + 7 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 ecs/jskult-webapp/src/static/css/main_theme.css diff --git a/ecs/jskult-webapp/src/static/css/bioStyle.css b/ecs/jskult-webapp/src/static/css/bioStyle.css index 51325f55..4b158b38 100644 --- a/ecs/jskult-webapp/src/static/css/bioStyle.css +++ b/ecs/jskult-webapp/src/static/css/bioStyle.css @@ -6,8 +6,6 @@ body { white-space: nowrap; - background-color: LightCyan; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } h1 { diff --git a/ecs/jskult-webapp/src/static/css/main_theme.css b/ecs/jskult-webapp/src/static/css/main_theme.css new file mode 100644 index 00000000..a6057540 --- /dev/null +++ b/ecs/jskult-webapp/src/static/css/main_theme.css @@ -0,0 +1,5 @@ +body { + /* Merck Sensitive Green */ + background-color: #B4DC96; + font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; +} diff --git a/ecs/jskult-webapp/src/static/css/masterMainte.css b/ecs/jskult-webapp/src/static/css/masterMainte.css index c6d7be7d..dd760425 100644 --- a/ecs/jskult-webapp/src/static/css/masterMainte.css +++ b/ecs/jskult-webapp/src/static/css/masterMainte.css @@ -4,11 +4,6 @@ table { box-sizing: initial; } -body{ - background-color: LightCyan; - font-family : "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; -} - h1{ margin-left : 1%; font-weight: 700; diff --git a/ecs/jskult-webapp/src/static/css/menuStyle.css b/ecs/jskult-webapp/src/static/css/menuStyle.css index cabd5197..4d2f9c46 100644 --- a/ecs/jskult-webapp/src/static/css/menuStyle.css +++ b/ecs/jskult-webapp/src/static/css/menuStyle.css @@ -1,7 +1,5 @@ body{ - background-color: LightCyan; background-size: 220%,220%; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } .background{ diff --git a/ecs/jskult-webapp/src/static/css/pagenation.css b/ecs/jskult-webapp/src/static/css/pagenation.css index 72e4aecc..5af4353d 100644 --- a/ecs/jskult-webapp/src/static/css/pagenation.css +++ b/ecs/jskult-webapp/src/static/css/pagenation.css @@ -67,7 +67,7 @@ div.paginationjs-pages ul { } .paginationjs-pages > ul > li.paginationjs-ellipsis.disabled > a { border: none; - background-color: LightCyan; + background-color: inherit; color: black; margin: 0 4px; padding: 0; diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css index c1ace1d4..843a796b 100644 --- a/ecs/jskult-webapp/src/static/css/ultStyle.css +++ b/ecs/jskult-webapp/src/static/css/ultStyle.css @@ -6,8 +6,6 @@ body { margin: 8px; - background-color: LightCyan; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } h1 { diff --git a/ecs/jskult-webapp/src/templates/_header.html b/ecs/jskult-webapp/src/templates/_header.html index c2476734..a0e90606 100644 --- a/ecs/jskult-webapp/src/templates/_header.html +++ b/ecs/jskult-webapp/src/templates/_header.html @@ -6,6 +6,7 @@ + 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 3/3] =?UTF-8?q?feat:=20=E6=8C=87=E6=91=98=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=20NEWDWH2021-1276=20=E6=96=BD=E8=A8=AD=E6=8B=85?= =?UTF-8?q?=E5=BD=93=E8=80=85=E3=83=9E=E3=82=B9=E3=82=BFCSV=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AEcreater,updater=E3=81=8CMUID=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=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