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

feat: レビュー指摘対応と単体試験不具合対応

Browse Source
This commit is contained in:
高木要 2023-07-19 15:19:01 +09:00
parent bd6b2bb0ca
commit 7bf776fd36
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,18 +136,15 @@ async def inst_emp_csv_upload(
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BACKUP_PROCESSING)
# 画面表示用のモデル
csv_upload_form.csv_file.file.seek(0, 2)
if csv_upload_form.csv_file.file.tell() >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE:
if csv_upload_form.csv_file.size >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE:
error_message_list = []
error_message_list.append('選択されたCSVファイルサイズが大きいです。100MB未満にしてください。')
mainte_csv_up = InstEmpCsvUploadViewModel(
is_verified=True,
error_message_list=error_message_list,
select_function=csv_upload_form.select_function,
select_table=csv_upload_form.select_table
)
select_table=csv_upload_form.select_table)
else:
csv_upload_form.csv_file.file.seek(0)
mainte_csv_up = master_mainte_service.prepare_mainte_csv_up_view(
TextIOWrapper(BytesIO(await csv_upload_form.csv_file.read()), encoding='utf-8'),
csv_upload_form.csv_file.filename,

2
ecs/jskult-webapp/src/static/function/businessLogicScript.js
View File

@ -219,7 +219,7 @@ function checkNumberOnlyForm($this)
// メニューへボタンの関数
// 機能概要：マスターメンテメニュー画面に遷移する
function backToMainteMenu(){
location.href = "/menu/";
location.href = "/masterMainte/masterMainteMenu/";
}
// 確認ダイアログ

4
ecs/jskult-webapp/src/templates/instEmpCsvDL.html
View File

@ -44,7 +44,7 @@
<h1>
<table class="headerTable">
<tr>
<td class="headerTdLeft">施設担当者データCSVダウンロード</td>
<td class="headerTdLeft"><h1>施設担当者データCSVダウンロード</h1></td>
<td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ" onclick="backToMainteMenu()"></td>
</tr>
</table>
@ -85,7 +85,7 @@
<!-- 適用期間内 -->
<td class="searchLabelTd">適用期間内：</td>
<td class="searchInputTd">
<input class="searchDateTextbox date_picker" type="text" name="ctrl_apply_date" value="{{mainte_csv_dl.apply_date | safe}}" maxlength='10'
<input class="searchTextbox date_picker" type="text" name="ctrl_apply_date" value="{{mainte_csv_dl.apply_date | safe}}" maxlength='10'
onchange="formBtDisabled()"
oninput="formBtDisabled()"
>

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

@ -29,7 +29,7 @@
<h1>
<table class="headerTable">
<tr>
<td class="headerTdLeft">施設担当者データCSVアップロード</td>
<td class="headerTdLeft"><h1>施設担当者データCSVアップロード</h1></td>
<td class="headerTdRight">
{% if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() %}
<input type="button" class="header_buttonSize" onclick="location.href='/masterMainte/instEmpCsvUL' " value="戻る">

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

@ -24,7 +24,7 @@
<h1>
<table class="headerTable">
<tr>
<td class="headerTdLeft">テーブル上書きコピー</td>
<td class="headerTdLeft"><h1>テーブル上書きコピー</h1></td>
<td class="headerTdRight"><input type="button" name="back" class="header_buttonSize" value="メニューへ" onclick="backToMainteMenu()"></td>
</tr>
</table>