From 175b4c41af7d04734aa820a6d763195f69181af8 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 28 Jul 2023 17:14:08 +0900 Subject: [PATCH] =?UTF-8?q?feat:;=20=E3=83=9E=E3=82=B9=E3=82=BF=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/inst_emp_csv_download_view_model.py | 38 +++++++++---------- .../view/inst_emp_csv_upload_view_model.py | 23 ++++++----- .../model/view/table_override_view_model.py | 3 +- .../src/templates/instEmpCsvDL.html | 20 +++++----- .../src/templates/instEmpCsvUL.html | 6 +-- .../src/templates/tableOverride.html | 6 +-- 6 files changed, 47 insertions(+), 49 deletions(-) diff --git a/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py b/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py index a0bd7f3d..aa04068d 100644 --- a/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py +++ b/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py @@ -1,28 +1,28 @@ from pydantic import BaseModel -from typing import Optional + from src.util.string_util import is_not_empty class InstEmpCsvDownloadViewModel(BaseModel): subtitle: str = '施設担当者データCSVダウンロード' - is_search: Optional[bool] = False - ta_cd: Optional[str] = '' - inst_cd: Optional[str] = '' - emp_cd: Optional[str] = '' - apply_date_from: Optional[str] = '' - start_date_from: Optional[str] = '' - start_date_to: Optional[str] = '' - end_date_from: Optional[str] = '' - end_date_to: Optional[str] = '' - create_date_from: Optional[str] = '' - create_date_to: Optional[str] = '' - update_date_from: Optional[str] = '' - update_date_to: Optional[str] = '' - select_table: Optional[str] = '' - data_count: Optional[int] = 0 - result_msg: Optional[str] = '' - download_file_url: Optional[str] = '' - file_name: Optional[str] = '' + is_search: bool = False + ta_cd: str = '' + inst_cd: str = '' + emp_cd: str = '' + apply_date_from: str = '' + start_date_from: str = '' + start_date_to: str = '' + end_date_from: str = '' + end_date_to: str = '' + create_date_from: str = '' + create_date_to: str = '' + update_date_from: str = '' + update_date_to: str = '' + select_table: str = '' + data_count: int = 0 + result_msg: str = '' + download_file_url: str = '' + file_name: str = '' def is_select_table_empty(self): return not is_not_empty(self.select_table) diff --git a/ecs/jskult-webapp/src/model/view/inst_emp_csv_upload_view_model.py b/ecs/jskult-webapp/src/model/view/inst_emp_csv_upload_view_model.py index b2ab8051..f7d40c00 100644 --- a/ecs/jskult-webapp/src/model/view/inst_emp_csv_upload_view_model.py +++ b/ecs/jskult-webapp/src/model/view/inst_emp_csv_upload_view_model.py @@ -1,21 +1,20 @@ -from typing import Optional - from pydantic import BaseModel + from src.system_var import constants class InstEmpCsvUploadViewModel(BaseModel): subtitle: str = '施設担当者データCSVアップロード' - is_verified: Optional[bool] - is_insert: Optional[bool] - error_message_list: Optional[list[str]] - select_function: Optional[str] - select_table: Optional[str] - csv_file_name: Optional[str] - csv_upload_list: Optional[list[dict]] - json_upload_data: Optional[str] - result_message_list: Optional[list[str]] - select_function_message: Optional[str] + is_verified: bool = False + is_insert: bool = False + error_message_list: list[str] = None + select_function: str = None + select_table: str = None + csv_file_name: str = None + csv_upload_list: list[dict] = None + json_upload_data: str = None + result_message_list: list[str] = None + select_function_message: str = None def select_table_message(self): return self.__dummy_table() if self.select_table == 'dummy' else self.__real_table() diff --git a/ecs/jskult-webapp/src/model/view/table_override_view_model.py b/ecs/jskult-webapp/src/model/view/table_override_view_model.py index d97a1928..2301527a 100644 --- a/ecs/jskult-webapp/src/model/view/table_override_view_model.py +++ b/ecs/jskult-webapp/src/model/view/table_override_view_model.py @@ -1,8 +1,7 @@ from pydantic import BaseModel -from typing import Optional class TableOverrideViewModel(BaseModel): subtitle: str = 'テーブル上書きコピー' - is_override: Optional[bool] = False + is_override: bool = False diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html index d8ac4d5b..8bdc70ba 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html @@ -13,18 +13,18 @@ formBtDisabled(); // DatePickerを有効化 enableDatePicker(); -{% if mainte_csv_dl.is_search and mainte_csv_dl.data_count > 0 and mainte_csv_dl.is_download_file_url_empty() is false %} + // {% if mainte_csv_dl.is_search and mainte_csv_dl.data_count > 0 and mainte_csv_dl.is_download_file_url_empty() is false %} // CSV自動ダウンロード処理 - var link_tag = document.createElement("a"); + const link_tag = document.createElement("a"); link_tag.Target="_blank"; link_tag.id = "download_url_link"; - link_tag.style.display = 'none'; + link_tag.style.display = 'none'; link_tag.setAttribute("href", "{{mainte_csv_dl.download_file_url | safe}}"); link_tag.setAttribute("download", "{{mainte_csv_dl.file_name}}"); document.getElementById("notification").appendChild(link_tag); document.getElementById("download_url_link").click(); document.getElementById("download_url_link").remove(); -{% endif %} + // {% endif %} }; function Form_Submit_Disp_Dialog(){ var msg = 'CSVファイルを出力しますか？'; @@ -33,8 +33,8 @@ document.getElementById("csvOutputMsg").style.display = "none"; } else { return false; - } - } + } + } @@ -98,7 +98,7 @@ oninput="formBtDisabled()" > ～ - @@ -111,7 +111,7 @@ oninput="formBtDisabled()" > ～ - @@ -122,13 +122,13 @@ 対象テーブル： -