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
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 @@
+
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()}}> 「利用停止」医師を含む
|