client models changes filds are requ.
This commit is contained in:
@@ -287,139 +287,268 @@ class FileService:
|
||||
|
||||
# ---------------------- client ----------------------------------
|
||||
|
||||
def client_trench_excavation(self, df, subcontractor_id):
|
||||
df.columns = [str(c).strip() for c in df.columns]
|
||||
# If the sheet has merged cells -> forward fill Location
|
||||
if "Location" in df.columns:
|
||||
df["Location"] = df["Location"].ffill()
|
||||
# def handle_client_file_upload(self, file, RA_Bill_No):
|
||||
|
||||
df = df.dropna(how="all") # REMOVE empty rows
|
||||
# Identify missing location rows before insert
|
||||
missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
if not missing_loc.empty:
|
||||
return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
# if not RA_Bill_No:
|
||||
# return False, "Please Enter RA Bill No ."
|
||||
|
||||
saved_count = 0
|
||||
# if not file or file.filename == "":
|
||||
# return False, "No file selected."
|
||||
# if not self.allowed_file(file.filename):
|
||||
# return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
|
||||
|
||||
try:
|
||||
for index, row in df.iterrows():
|
||||
record_data = {}
|
||||
# Insert only fields that exist in model
|
||||
for col in df.columns:
|
||||
if hasattr(TrenchExcavationClient, col):
|
||||
value = row[col]
|
||||
# Normalize empty values
|
||||
if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
value = None
|
||||
# ensure_upload_folder()
|
||||
|
||||
record_data[col] = value
|
||||
# folder = os.path.join(Config.UPLOAD_FOLDER, f"Client_Bill_{RA_Bill_No}")
|
||||
# os.makedirs(folder, exist_ok=True)
|
||||
|
||||
record = TrenchExcavationClient(
|
||||
subcontractor_id=subcontractor_id,
|
||||
**record_data
|
||||
)
|
||||
# filename = secure_filename(file.filename)
|
||||
# filepath = os.path.join(folder, filename)
|
||||
# file.save(filepath)
|
||||
|
||||
db.session.add(record)
|
||||
saved_count += 1
|
||||
# try:
|
||||
# df_tr_ex = pd.read_excel(filepath, sheet_name ="Tr.Ex.", header=12)
|
||||
# df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=12)
|
||||
# df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=11)
|
||||
|
||||
db.session.commit()
|
||||
return True, f"Clinnt Tr Ex data saved successfully. Total rows: {saved_count}"
|
||||
# print("\n=== Uploaded File tr ex ===")
|
||||
# print(df_tr_ex.head())
|
||||
# print("=============================\n")
|
||||
# print("\n=== Uploaded File mh ex ===")
|
||||
# print(df_mh_ex.head())
|
||||
# print("========================================\n")
|
||||
# print("\n=== Uploaded File MH DC ===")
|
||||
# print(df_mh_dc.head())
|
||||
# print("========================================\n")
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return False, f"Clinnt Tr Ex Save Failed: {e}"
|
||||
|
||||
# self.client_trench_excavation(df_tr_ex, RA_Bill_No)
|
||||
# self.client_manhole_excavation(df_mh_ex, RA_Bill_No)
|
||||
# self.client_manhole_domestic_chamber(df_mh_dc, RA_Bill_No)
|
||||
|
||||
# return True, "File uploaded successfully."
|
||||
|
||||
# except Exception as e:
|
||||
# return False, f"Processing failed: {e}"
|
||||
|
||||
# # Tr Ex save method (TrenchExcavationClient model)
|
||||
# def client_trench_excavation(self, df, RA_Bill_No):
|
||||
# df.columns = [str(c).strip() for c in df.columns]
|
||||
# # If the sheet has merged cells -> forward fill Location
|
||||
# if "Location" in df.columns:
|
||||
# df["Location"] = df["Location"].ffill()
|
||||
|
||||
# df = df.dropna(how="all") # REMOVE empty rows
|
||||
# # Identify missing location rows before insert
|
||||
# missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
# if not missing_loc.empty:
|
||||
# return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
|
||||
# saved_count = 0
|
||||
|
||||
# try:
|
||||
# for index, row in df.iterrows():
|
||||
# record_data = {}
|
||||
# # Insert only fields that exist in model
|
||||
# for col in df.columns:
|
||||
# if hasattr(TrenchExcavationClient, col):
|
||||
# value = row[col]
|
||||
# # Normalize empty values
|
||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
# value = None
|
||||
|
||||
# record_data[col] = value
|
||||
|
||||
# record = TrenchExcavationClient(
|
||||
# RA_Bill_No=RA_Bill_No,
|
||||
# **record_data
|
||||
# )
|
||||
|
||||
# db.session.add(record)
|
||||
# saved_count += 1
|
||||
|
||||
# db.session.commit()
|
||||
# return True, f"Clinnt Tr Ex data saved successfully. Total rows: {saved_count}"
|
||||
|
||||
# except Exception as e:
|
||||
# db.session.rollback()
|
||||
# return False, f"Clinnt Tr Ex Save Failed: {e}"
|
||||
|
||||
|
||||
# Mh Ex save method (ManholeExcavationClient model)
|
||||
def client_manhole_excavation(self, df, subcontractor_id):
|
||||
# # Mh Ex save method (ManholeExcavationClient model)
|
||||
# def client_manhole_excavation(self, df, RA_Bill_No):
|
||||
# # Clean column names (strip whitespace)
|
||||
# df.columns = [str(c).strip() for c in df.columns]
|
||||
# # If the sheet has merged cells -> forward fill Location
|
||||
# if "Location" in df.columns:
|
||||
# df["Location"] = df["Location"].ffill()
|
||||
|
||||
# # REMOVE empty rows
|
||||
# df = df.dropna(how="all")
|
||||
# # Identify missing location rows before insert
|
||||
# missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
# if not missing_loc.empty:
|
||||
# return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
|
||||
# saved_count = 0
|
||||
|
||||
# try:
|
||||
# for index, row in df.iterrows():
|
||||
# record_data = {}
|
||||
# # Insert only fields that exist in model
|
||||
# for col in df.columns:
|
||||
# if hasattr(ManholeExcavationClient, col):
|
||||
# value = row[col]
|
||||
|
||||
# # Normalize empty values
|
||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
# value = None
|
||||
|
||||
# record_data[col] = value
|
||||
|
||||
# record = ManholeExcavationClient(
|
||||
# RA_Bill_No=RA_Bill_No,
|
||||
# **record_data
|
||||
# )
|
||||
|
||||
# db.session.add(record)
|
||||
# saved_count += 1
|
||||
|
||||
# db.session.commit()
|
||||
# return True, f" Client Mh Ex. data saved successfully. Total rows: {saved_count}"
|
||||
|
||||
# except Exception as e:
|
||||
# db.session.rollback()
|
||||
# return False, f"Client Mh Ex. Save Failed: {e}"
|
||||
|
||||
|
||||
# # Mh and Dc save method (ManholeDomesticChamberClient model)
|
||||
# def client_manhole_domestic_chamber(self, df, RA_Bill_No):
|
||||
# Clean column names (strip whitespace)
|
||||
df.columns = [str(c).strip() for c in df.columns]
|
||||
# If the sheet has merged cells -> forward fill Location
|
||||
if "Location" in df.columns:
|
||||
df["Location"] = df["Location"].ffill()
|
||||
# df.columns = [str(c).strip() for c in df.columns]
|
||||
# # If the sheet has merged cells -> forward fill Location
|
||||
# if "Location" in df.columns:
|
||||
# df["Location"] = df["Location"].ffill()
|
||||
|
||||
# REMOVE empty rows
|
||||
df = df.dropna(how="all")
|
||||
# Identify missing location rows before insert
|
||||
missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
if not missing_loc.empty:
|
||||
return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
# # REMOVE empty rows
|
||||
# df = df.dropna(how="all")
|
||||
# # Identify missing location rows before insert
|
||||
# missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
# if not missing_loc.empty:
|
||||
# return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
|
||||
saved_count = 0
|
||||
# saved_count = 0
|
||||
|
||||
# try:
|
||||
# for index, row in df.iterrows():
|
||||
# record_data = {}
|
||||
|
||||
# # Insert only fields that exist in model
|
||||
# for col in df.columns:
|
||||
# if hasattr(ManholeDomesticChamberClient, col):
|
||||
# value = row[col]
|
||||
# # Normalize empty values
|
||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
# value = None
|
||||
|
||||
# record_data[col] = value
|
||||
|
||||
# record = ManholeDomesticChamberClient(
|
||||
# RA_Bill_No=RA_Bill_No,
|
||||
# **record_data
|
||||
# )
|
||||
|
||||
# db.session.add(record)
|
||||
# saved_count += 1
|
||||
|
||||
# db.session.commit()
|
||||
# return True, f"Mh and Dc data saved successfully. Total rows: {saved_count}"
|
||||
|
||||
# except Exception as e:
|
||||
# db.session.rollback()
|
||||
# return False, f"Mh and Dc data Save Failed: {e}"
|
||||
|
||||
def handle_client_file_upload(self, file, RA_Bill_No):
|
||||
|
||||
if not RA_Bill_No:
|
||||
return False, "Please Enter RA Bill No."
|
||||
|
||||
if not file or file.filename == "":
|
||||
return False, "No file selected."
|
||||
|
||||
if not self.allowed_file(file.filename):
|
||||
return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
|
||||
|
||||
ensure_upload_folder()
|
||||
|
||||
folder = os.path.join(Config.UPLOAD_FOLDER, f"Client_Bill_{RA_Bill_No}")
|
||||
os.makedirs(folder, exist_ok=True)
|
||||
|
||||
filename = secure_filename(file.filename)
|
||||
filepath = os.path.join(folder, filename)
|
||||
file.save(filepath)
|
||||
|
||||
try:
|
||||
for index, row in df.iterrows():
|
||||
df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=12)
|
||||
df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=12)
|
||||
df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=11)
|
||||
|
||||
# Single transaction
|
||||
self._save_client_data(df_tr_ex, TrenchExcavationClient, "Trench Excavation", RA_Bill_No)
|
||||
self._save_client_data(df_mh_ex, ManholeExcavationClient, "Manhole Excavation", RA_Bill_No)
|
||||
self._save_client_data(df_mh_dc, ManholeDomesticChamberClient, "MH & DC", RA_Bill_No)
|
||||
|
||||
db.session.commit()
|
||||
return True, "Client file uploaded and all data saved successfully."
|
||||
|
||||
except ClientDataSaveError as e:
|
||||
db.session.rollback()
|
||||
return False, str(e)
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return False, f"Unexpected system error: {e}"
|
||||
|
||||
|
||||
def _save_client_data(self, df, model, RA_Bill_No):
|
||||
|
||||
# Clean column names
|
||||
df.columns = [str(c).strip() for c in df.columns]
|
||||
|
||||
# Forward fill Location (merged cells issue)
|
||||
if "Location" in df.columns:
|
||||
df["Location"] = df["Location"].ffill()
|
||||
|
||||
# Remove fully empty rows
|
||||
df = df.dropna(how="all")
|
||||
|
||||
# Validate Location
|
||||
if "Location" in df.columns:
|
||||
missing_loc = df[
|
||||
df["Location"].isna() |
|
||||
(df["Location"].astype(str).str.strip() == "")
|
||||
]
|
||||
if not missing_loc.empty:
|
||||
raise Exception(
|
||||
f"{model.__name__}: Empty Location at rows {missing_loc.index.tolist()}"
|
||||
)
|
||||
|
||||
# Insert rows
|
||||
for _, row in df.iterrows():
|
||||
record_data = {}
|
||||
# Insert only fields that exist in model
|
||||
|
||||
for col in df.columns:
|
||||
if hasattr(ManholeExcavationClient, col):
|
||||
if hasattr(model, col):
|
||||
value = row[col]
|
||||
|
||||
# Normalize empty values
|
||||
if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
value = None
|
||||
|
||||
record_data[col] = value
|
||||
|
||||
record = ManholeExcavationClient(
|
||||
subcontractor_id=subcontractor_id,
|
||||
record = model(
|
||||
RA_Bill_No=RA_Bill_No,
|
||||
**record_data
|
||||
)
|
||||
|
||||
db.session.add(record)
|
||||
saved_count += 1
|
||||
|
||||
db.session.commit()
|
||||
return True, f" Client Mh Ex. data saved successfully. Total rows: {saved_count}"
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return False, f"Client Mh Ex. Save Failed: {e}"
|
||||
|
||||
|
||||
# Mh and Dc save method (ManholeDomesticChamberClient model)
|
||||
def client_manhole_domestic_chamber(self, df, subcontractor_id):
|
||||
# Clean column names (strip whitespace)
|
||||
df.columns = [str(c).strip() for c in df.columns]
|
||||
# If the sheet has merged cells -> forward fill Location
|
||||
if "Location" in df.columns:
|
||||
df["Location"] = df["Location"].ffill()
|
||||
|
||||
# REMOVE empty rows
|
||||
df = df.dropna(how="all")
|
||||
# Identify missing location rows before insert
|
||||
missing_loc = df[df["Location"].isna() | (df["Location"].astype(str).str.strip() == "")]
|
||||
if not missing_loc.empty:
|
||||
return False, f"Error: Some rows have empty Location. Rows: {missing_loc.index.tolist()}"
|
||||
|
||||
saved_count = 0
|
||||
|
||||
try:
|
||||
for index, row in df.iterrows():
|
||||
record_data = {}
|
||||
|
||||
# Insert only fields that exist in model
|
||||
for col in df.columns:
|
||||
if hasattr(ManholeDomesticChamberClient, col):
|
||||
value = row[col]
|
||||
# Normalize empty values
|
||||
if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
||||
value = None
|
||||
|
||||
record_data[col] = value
|
||||
|
||||
record = ManholeDomesticChamberClient(
|
||||
subcontractor_id=subcontractor_id,
|
||||
**record_data
|
||||
)
|
||||
|
||||
db.session.add(record)
|
||||
saved_count += 1
|
||||
|
||||
db.session.commit()
|
||||
return True, f"Mh and Dc data saved successfully. Total rows: {saved_count}"
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return False, f"Mh and Dc data Save Failed: {e}"
|
||||
|
||||
Reference in New Issue
Block a user