nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #282 feature-NEWDWH2021-1275 into develop

Browse Source
This commit is contained in:
朝倉 明日香 2023-10-12 17:52:06 +09:00
commit d113641c6a
9 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ecs/jskult-webapp/src/controller/master_mainte.py
View File

@ -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

2
ecs/jskult-webapp/src/static/css/bioStyle.css
View File

@ -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 {

5
ecs/jskult-webapp/src/static/css/main_theme.css Normal file
View File

@ -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;
}

5
ecs/jskult-webapp/src/static/css/masterMainte.css
View File

@ -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;

2
ecs/jskult-webapp/src/static/css/menuStyle.css
View File

@ -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{

2
ecs/jskult-webapp/src/static/css/pagenation.css
View File

@ -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;

2
ecs/jskult-webapp/src/static/css/ultStyle.css
View File

@ -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 {

1
ecs/jskult-webapp/src/templates/_header.html
View File

@ -6,6 +6,7 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css" integrity="sha384-b6lVK+yci+bfDmaY1u0zE8YYJt0TZxLEAFyYSLHId4xoVvsrQu3INevFKo+Xir8e" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
<link rel="stylesheet" href="/static/css/main_theme.css">
<link rel="stylesheet" href="/static/css/pagenation.css">
<link rel="stylesheet" href="/static/css/datepicker.css">
<link rel="stylesheet" href="/static/css/loading.css">

2
ecs/jskult-webapp/src/templates/docSearch.html
View File

@ -109,7 +109,7 @@
<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y"
value="{{ultmarc.is_input_grad_y()}}" maxlength='4' oninput="formBtDisabled()"></td>
<td class="docSearchColumnTd"><label><input type="checkbox" name="use_stop_div_ctrl" value="true"
{{ultmarc.is_checked_use_stop_div()}}> 利用停止区分を含む</label></td>
{{ultmarc.is_checked_use_stop_div()}}> 「利用停止」医師を含む</label></td>
<td class="search_btTd">
<input class="buttonSize" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();">
<input class="buttonSize" id="search_bt" name="search_bt" value="検索" type="submit">