From e007b3ee87c476dd0e885ee5b8a1c8f025a24427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 26 Jul 2023 13:47:17 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20staging=E7=92=B0=E5=A2=83=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E5=AF=BE=E5=BF=9C=E3=80=81=E5=8D=98=E4=BD=93?= =?UTF-8?q?=E8=A9=A6=E9=A8=93=E7=B5=90=E6=9E=9C=E3=83=AC=E3=83=93=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/internal/master_mainte_csv.py | 23 +++++++++++++------ .../src/services/master_mainte_service.py | 3 ++- .../src/static/css/masterMainte.css | 2 ++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py b/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py index 16591161..e288ce3a 100644 --- a/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py +++ b/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py @@ -136,9 +136,12 @@ class MasterMainteCSVItem(metaclass=ABCMeta): return (error_list, start_date_time, end_date_time) def get_csv_value(self, column_no: int): - if len(self.csv_row) <= column_no: - return '' - return self.csv_row[column_no] + try: + column_value = self.csv_row[column_no] + except IndexError: + column_value = '' + + return column_value @abstractmethod def csv_row_data(self) -> dict: @@ -278,12 +281,15 @@ class MasterMainteNewInstEmpCSVItem(MasterMainteCSVItem): def check_existing_date(self) -> list[str]: error_list = [] + if not self.start_date or not self.end_date: + return error_list + (error_list, start_date_time, end_date_time) = super().check_term_date( self.start_date, self.end_date, constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_START_DATE], constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_END_DATE]) - if len(error_list) > 0 or not self.start_date or not self.end_date: + if len(error_list) > 0: return error_list if start_date_time > end_date_time: @@ -430,10 +436,10 @@ class MasterMainteChangeInstEmpCSVItem(MasterMainteCSVItem): return error_list def check_bu_cd_exists(self) -> list[str]: - """BuCd存在チェック""" error_list = [] - if is_not_empty(self.bu_cd) and super().is_exist_bu_cd() is False: + if is_not_empty(self.bu_cd) and self.comment == '追加'\ + and super().is_exist_bu_cd() is False: error_list.append(f'{self.line_num}行目の{constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_BU_CD_COL_NO]}\ はビジネスユニットマスタに存在しないコードです。') return error_list @@ -456,12 +462,15 @@ class MasterMainteChangeInstEmpCSVItem(MasterMainteCSVItem): {constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_INST_EMP_START_DATE_COL_NO]}が\ {end_date_col_name}よりも後の日付になっています。' + if not start_date or not end_date: + return error_list + (error_list, start_date_time, end_date_time) = super().check_term_date( start_date, end_date, constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_INST_EMP_START_DATE_COL_NO], end_date_col_name) - if len(error_list) > 0 or not start_date or not end_date: + if len(error_list) > 0: return error_list if start_date_time > end_date_time: diff --git a/ecs/jskult-webapp/src/services/master_mainte_service.py b/ecs/jskult-webapp/src/services/master_mainte_service.py index 04fdd69c..e9620eda 100644 --- a/ecs/jskult-webapp/src/services/master_mainte_service.py +++ b/ecs/jskult-webapp/src/services/master_mainte_service.py @@ -1,6 +1,7 @@ import os import json import html +import csv import pandas as pd @@ -193,7 +194,7 @@ class MasterMainteService(BaseService): header_df = pd.DataFrame([header_data], index=None) output_df = pd.concat([header_df, data_frame]) # ヘッダー行としてではなく、1レコードとして出力する - output_df.to_csv(output_file_path, encoding="utf-8_sig", index=False, header=False) + output_df.to_csv(output_file_path, encoding="utf-8_sig", quoting=csv.QUOTE_ALL, index=False, header=False) return output_file_path diff --git a/ecs/jskult-webapp/src/static/css/masterMainte.css b/ecs/jskult-webapp/src/static/css/masterMainte.css index 4126f298..c6d7be7d 100644 --- a/ecs/jskult-webapp/src/static/css/masterMainte.css +++ b/ecs/jskult-webapp/src/static/css/masterMainte.css @@ -56,6 +56,7 @@ h1{ padding-bottom: 1%; border-bottom: solid 1px gray; width: 94%; + border-collapse: initial; } .searchLabelTd{ @@ -172,5 +173,6 @@ table.inputData tbody td { margin-bottom: 2%; border-bottom: solid 1px gray; width: 94%; + border-collapse: initial; }