file format of client and sub-con excel files and download exce formate
This commit is contained in:
@@ -18,6 +18,8 @@ def create_app():
|
|||||||
from app.routes.file_report import file_report_bp
|
from app.routes.file_report import file_report_bp
|
||||||
from app.routes.generate_comparison_report import generate_report_bp
|
from app.routes.generate_comparison_report import generate_report_bp
|
||||||
|
|
||||||
|
from app.routes.file_format import file_format
|
||||||
|
|
||||||
# app.register_blueprint(user_bp)
|
# app.register_blueprint(user_bp)
|
||||||
app.register_blueprint(subcontractor_bp)
|
app.register_blueprint(subcontractor_bp)
|
||||||
app.register_blueprint(dashboard_bp)
|
app.register_blueprint(dashboard_bp)
|
||||||
@@ -25,6 +27,7 @@ def create_app():
|
|||||||
app.register_blueprint(file_report_bp)
|
app.register_blueprint(file_report_bp)
|
||||||
app.register_blueprint(generate_report_bp)
|
app.register_blueprint(generate_report_bp)
|
||||||
|
|
||||||
|
app.register_blueprint(file_format)
|
||||||
|
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
|||||||
27
app/routes/file_format.py
Normal file
27
app/routes/file_format.py
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
from flask import Blueprint, render_template, send_from_directory, abort, current_app
|
||||||
|
import os
|
||||||
|
|
||||||
|
file_format = Blueprint("file_format", __name__)
|
||||||
|
|
||||||
|
@file_format.route("/file_format")
|
||||||
|
def download_format():
|
||||||
|
return render_template("ex_format.html", title="Download File Formats")
|
||||||
|
|
||||||
|
|
||||||
|
@file_format.route("/file_format/download/<filename>")
|
||||||
|
def download_excel_format(filename):
|
||||||
|
|
||||||
|
download_folder = os.path.join(
|
||||||
|
current_app.root_path, "static", "downloads/format"
|
||||||
|
)
|
||||||
|
|
||||||
|
file_path = os.path.join(download_folder, filename)
|
||||||
|
|
||||||
|
if not os.path.exists(file_path):
|
||||||
|
abort(404)
|
||||||
|
|
||||||
|
return send_from_directory(
|
||||||
|
directory=download_folder,
|
||||||
|
path=filename,
|
||||||
|
as_attachment=True
|
||||||
|
)
|
||||||
@@ -13,10 +13,8 @@ def import_file():
|
|||||||
file = request.files.get("file")
|
file = request.files.get("file")
|
||||||
subcontractor_id = request.form.get("subcontractor_id")
|
subcontractor_id = request.form.get("subcontractor_id")
|
||||||
RA_Bill_No = request.form.get("RA_Bill_No")
|
RA_Bill_No = request.form.get("RA_Bill_No")
|
||||||
# file_type = request.form.get("file_type")
|
|
||||||
|
|
||||||
service = FileService()
|
service = FileService()
|
||||||
# success, msg = service.handle_file_upload(file, subcontractor_id, file_type)
|
|
||||||
success, msg = service.handle_file_upload(file, subcontractor_id, RA_Bill_No)
|
success, msg = service.handle_file_upload(file, subcontractor_id, RA_Bill_No)
|
||||||
|
|
||||||
flash(msg, "success" if success else "danger")
|
flash(msg, "success" if success else "danger")
|
||||||
@@ -31,8 +29,6 @@ def client_import_file():
|
|||||||
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
file = request.files.get("file")
|
file = request.files.get("file")
|
||||||
# subcontractor_id = request.form.get("subcontractor_id")
|
|
||||||
# file_type = request.form.get("file_type")
|
|
||||||
RA_Bill_No = request.form.get("RA_Bill_No")
|
RA_Bill_No = request.form.get("RA_Bill_No")
|
||||||
|
|
||||||
service = FileService()
|
service = FileService()
|
||||||
|
|||||||
@@ -1,567 +1,3 @@
|
|||||||
# import os
|
|
||||||
# import pandas as pd
|
|
||||||
# from werkzeug.utils import secure_filename
|
|
||||||
# from app.config import Config
|
|
||||||
# from app import db
|
|
||||||
# from app.models.trench_excavation_model import TrenchExcavation
|
|
||||||
# from app.models.manhole_excavation_model import ManholeExcavation
|
|
||||||
# from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
|
|
||||||
|
|
||||||
# from app.models.tr_ex_client_model import TrenchExcavationClient
|
|
||||||
# from app.models.mh_ex_client_model import ManholeExcavationClient
|
|
||||||
# from app.models.mh_dc_client_model import ManholeDomesticChamberClient
|
|
||||||
|
|
||||||
|
|
||||||
# from app.utils.file_utils import ensure_upload_folder
|
|
||||||
|
|
||||||
|
|
||||||
# class FileService:
|
|
||||||
|
|
||||||
# def allowed_file(self, filename):
|
|
||||||
# return "." in filename and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS
|
|
||||||
|
|
||||||
# # def handle_file_upload(self, file, subcontractor_id, file_type):
|
|
||||||
# def handle_file_upload(self, file, subcontractor_id, RA_Bill_No):
|
|
||||||
|
|
||||||
# if not subcontractor_id:
|
|
||||||
# return False, "Please select subcontractor."
|
|
||||||
# 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"sub_{subcontractor_id}")
|
|
||||||
# os.makedirs(folder, exist_ok=True)
|
|
||||||
|
|
||||||
# filename = secure_filename(file.filename)
|
|
||||||
# filepath = os.path.join(folder, filename)
|
|
||||||
# file.save(filepath)
|
|
||||||
|
|
||||||
# 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)
|
|
||||||
|
|
||||||
# self.process_trench_excavation(df_tr_ex, subcontractor_id, RA_Bill_No)
|
|
||||||
# self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
|
|
||||||
# self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
|
|
||||||
|
|
||||||
# return True, "File uploaded successfully."
|
|
||||||
|
|
||||||
# except Exception as e:
|
|
||||||
# return False, f"Processing failed: {e}"
|
|
||||||
|
|
||||||
|
|
||||||
# # Trench Excavation save method (TrenchExcavation model)
|
|
||||||
# def process_trench_excavation(self, df, subcontractor_id,RA_Bill_No):
|
|
||||||
|
|
||||||
# print("trench_excavation RA_Bill_No :",RA_Bill_No)
|
|
||||||
|
|
||||||
# print("=== trench_excavation ===")
|
|
||||||
# print(df.columns.tolist())
|
|
||||||
# print("===================")
|
|
||||||
|
|
||||||
# # Clean column names
|
|
||||||
# df.columns = (
|
|
||||||
# df.columns.astype(str)
|
|
||||||
# .str.strip()
|
|
||||||
# .str.replace(r"[^\w]", "_", regex=True)
|
|
||||||
# .str.replace("__+", "_", regex=True)
|
|
||||||
# .str.strip("_")
|
|
||||||
# )
|
|
||||||
|
|
||||||
# # Remove completely empty rows
|
|
||||||
# df = df.dropna(how="all")
|
|
||||||
|
|
||||||
# # Forward fill merged Location
|
|
||||||
# if "Location" in df.columns:
|
|
||||||
# df["Location"] = df["Location"].ffill()
|
|
||||||
|
|
||||||
# saved_count = 0
|
|
||||||
# skipped_count = 0
|
|
||||||
|
|
||||||
# try:
|
|
||||||
# for index, row in df.iterrows():
|
|
||||||
# record_data = {}
|
|
||||||
# location = row.get("Location")
|
|
||||||
# mh_no = row.get("MH_NO")
|
|
||||||
|
|
||||||
# if (pd.isna(location) or str(location).strip() == "" or pd.isna(mh_no) or str(mh_no).strip() == ""):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# # Map only model columns
|
|
||||||
# for col in df.columns:
|
|
||||||
# if hasattr(TrenchExcavation, col):
|
|
||||||
# value = row[col]
|
|
||||||
|
|
||||||
# # Normalize empty values
|
|
||||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan"]:
|
|
||||||
# value = None
|
|
||||||
|
|
||||||
# record_data[col] = value
|
|
||||||
|
|
||||||
# # If all mapped fields are None → skip
|
|
||||||
# if all(v is None for v in record_data.values()):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# record = TrenchExcavation(
|
|
||||||
# subcontractor_id=subcontractor_id, RA_Bill_No=RA_Bill_No,
|
|
||||||
# **record_data
|
|
||||||
# )
|
|
||||||
|
|
||||||
# print("trench_excavation Saving Row → Location:", record.Location, " MH_NO:", record.MH_NO)
|
|
||||||
|
|
||||||
# db.session.add(record)
|
|
||||||
# saved_count += 1
|
|
||||||
|
|
||||||
# db.session.commit()
|
|
||||||
|
|
||||||
# return True, (
|
|
||||||
# f"Trench Excavation saved successfully. "
|
|
||||||
# f"Inserted: {saved_count}, Skipped: {skipped_count}"
|
|
||||||
# )
|
|
||||||
|
|
||||||
# except Exception as e:
|
|
||||||
# db.session.rollback()
|
|
||||||
# return False, f"Trench Excavation save failed: {e}"
|
|
||||||
|
|
||||||
|
|
||||||
# # Manhole Excavation save method (ManholeExcavation model)
|
|
||||||
# def process_manhole_excavation(self, df, subcontractor_id, RA_Bill_No):
|
|
||||||
|
|
||||||
# print("manhole_excavation RA_Bill_No:",RA_Bill_No)
|
|
||||||
|
|
||||||
# print("=== manhole_excavation ===")
|
|
||||||
# print(df.columns.tolist())
|
|
||||||
# print("===================")
|
|
||||||
|
|
||||||
# # Clean column names
|
|
||||||
# df.columns = (
|
|
||||||
# df.columns.astype(str)
|
|
||||||
# .str.strip()
|
|
||||||
# .str.replace(r"[^\w]", "_", regex=True)
|
|
||||||
# .str.replace("__+", "_", regex=True)
|
|
||||||
# .str.strip("_")
|
|
||||||
# )
|
|
||||||
|
|
||||||
# # Remove completely empty rows
|
|
||||||
# df = df.dropna(how="all")
|
|
||||||
|
|
||||||
# # Forward fill merged Location
|
|
||||||
# if "Location" in df.columns:
|
|
||||||
# df["Location"] = df["Location"].ffill()
|
|
||||||
|
|
||||||
# saved_count = 0
|
|
||||||
# skipped_count = 0
|
|
||||||
|
|
||||||
# try:
|
|
||||||
# for index, row in df.iterrows():
|
|
||||||
# record_data = {}
|
|
||||||
# location = row.get("Location")
|
|
||||||
# mh_no = row.get("MH_NO")
|
|
||||||
|
|
||||||
# if (pd.isna(location) or str(location).strip() == "" or pd.isna(mh_no) or str(mh_no).strip() == ""):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# # Map only model columns
|
|
||||||
# for col in df.columns:
|
|
||||||
# if hasattr(ManholeExcavation, col):
|
|
||||||
# value = row[col]
|
|
||||||
|
|
||||||
# # Normalize empty values
|
|
||||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan"]:
|
|
||||||
# value = None
|
|
||||||
|
|
||||||
# record_data[col] = value
|
|
||||||
|
|
||||||
# # If all mapped fields are None → skip
|
|
||||||
# if all(v is None for v in record_data.values()):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# record = ManholeExcavation(
|
|
||||||
# subcontractor_id=subcontractor_id, RA_Bill_No=RA_Bill_No,
|
|
||||||
# **record_data
|
|
||||||
# )
|
|
||||||
|
|
||||||
# print("manhole_excavation Saving Row → Location:", record.Location, " MH_NO:", record.MH_NO)
|
|
||||||
|
|
||||||
# db.session.add(record)
|
|
||||||
# saved_count += 1
|
|
||||||
|
|
||||||
# db.session.commit()
|
|
||||||
|
|
||||||
# return True, (
|
|
||||||
# f"Manhole Excavation saved successfully. "
|
|
||||||
# f"Inserted: {saved_count}, Skipped: {skipped_count}"
|
|
||||||
# )
|
|
||||||
|
|
||||||
# except Exception as e:
|
|
||||||
# db.session.rollback()
|
|
||||||
# return False, f"Manhole Excavation save failed: {e}"
|
|
||||||
|
|
||||||
# # Manhole and Domestic Chamber Construction save method (ManholeDomesticChamber model)
|
|
||||||
# def process_manhole_domestic_chamber(self, df, subcontractor_id, RA_Bill_No):
|
|
||||||
|
|
||||||
# print("manhole_domestic_chamber RA_Bill_No :",RA_Bill_No)
|
|
||||||
|
|
||||||
# print("=== manhole_domestic_chamber ===")
|
|
||||||
# print(df.columns.tolist())
|
|
||||||
# print("===================")
|
|
||||||
|
|
||||||
# # Clean column names
|
|
||||||
# df.columns = (
|
|
||||||
# df.columns.astype(str)
|
|
||||||
# .str.strip()
|
|
||||||
# .str.replace(r"[^\w]", "_", regex=True)
|
|
||||||
# .str.replace("__+", "_", regex=True)
|
|
||||||
# .str.strip("_")
|
|
||||||
# )
|
|
||||||
|
|
||||||
# # Remove completely empty rows
|
|
||||||
# df = df.dropna(how="all")
|
|
||||||
|
|
||||||
# # Forward fill merged Location
|
|
||||||
# if "Location" in df.columns:
|
|
||||||
# df["Location"] = df["Location"].ffill()
|
|
||||||
|
|
||||||
# saved_count = 0
|
|
||||||
# skipped_count = 0
|
|
||||||
|
|
||||||
# try:
|
|
||||||
# for index, row in df.iterrows():
|
|
||||||
# record_data = {}
|
|
||||||
# location = row.get("Location")
|
|
||||||
# Node_No = row.get("Node_No")
|
|
||||||
|
|
||||||
# if (pd.isna(location) or str(location).strip() == "" or pd.isna(Node_No) or str(Node_No).strip() == ""):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# # Map only model columns
|
|
||||||
# for col in df.columns:
|
|
||||||
# if hasattr(ManholeDomesticChamber, col):
|
|
||||||
# value = row[col]
|
|
||||||
|
|
||||||
# # Normalize empty values
|
|
||||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan"]:
|
|
||||||
# value = None
|
|
||||||
|
|
||||||
# record_data[col] = value
|
|
||||||
|
|
||||||
# # If all mapped fields are None → skip
|
|
||||||
# if all(v is None for v in record_data.values()):
|
|
||||||
# skipped_count += 1
|
|
||||||
# continue
|
|
||||||
|
|
||||||
# record = ManholeDomesticChamber(
|
|
||||||
# subcontractor_id=subcontractor_id, RA_Bill_No=RA_Bill_No,
|
|
||||||
# **record_data
|
|
||||||
# )
|
|
||||||
|
|
||||||
# print("manhole_domestic_chamber Saving Row → Location:", record.Location, " Node_No:", record.Node_No)
|
|
||||||
|
|
||||||
# db.session.add(record)
|
|
||||||
# saved_count += 1
|
|
||||||
|
|
||||||
# db.session.commit()
|
|
||||||
|
|
||||||
# return True, (
|
|
||||||
# f"Manhole Domestic Chamber saved successfully. "
|
|
||||||
# f"Inserted: {saved_count}, Skipped: {skipped_count}"
|
|
||||||
# )
|
|
||||||
|
|
||||||
# except Exception as e:
|
|
||||||
# db.session.rollback()
|
|
||||||
# return False, f"Manhole Domestic Chamber save failed: {e}"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# # ---------------------- client ----------------------------------
|
|
||||||
|
|
||||||
# # 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:
|
|
||||||
# # 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)
|
|
||||||
|
|
||||||
# # 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")
|
|
||||||
|
|
||||||
|
|
||||||
# # 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, 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()
|
|
||||||
|
|
||||||
# # # 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(
|
|
||||||
# # 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:
|
|
||||||
# df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=4)
|
|
||||||
# df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=4)
|
|
||||||
# df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=3)
|
|
||||||
# print("------------------")
|
|
||||||
# print("df_tr_ex :",df_tr_ex)
|
|
||||||
# print("------------------")
|
|
||||||
# print("df_mh_ex :",df_mh_ex)
|
|
||||||
# print("------------------")
|
|
||||||
# print("df_mh_dc :",df_mh_dc)
|
|
||||||
# print("------------------")
|
|
||||||
|
|
||||||
# # 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 = {}
|
|
||||||
|
|
||||||
# for col in df.columns:
|
|
||||||
# if hasattr(model, col):
|
|
||||||
# value = row[col]
|
|
||||||
|
|
||||||
# if pd.isna(value) or str(value).strip() in ["", "-", "—", "nan", "NaN"]:
|
|
||||||
# value = None
|
|
||||||
|
|
||||||
# record_data[col] = value
|
|
||||||
|
|
||||||
# record = model(
|
|
||||||
# RA_Bill_No=RA_Bill_No,
|
|
||||||
# **record_data
|
|
||||||
# )
|
|
||||||
|
|
||||||
# db.session.add(record)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
from werkzeug.utils import secure_filename
|
from werkzeug.utils import secure_filename
|
||||||
@@ -582,18 +18,14 @@ from app.utils.file_utils import ensure_upload_folder
|
|||||||
|
|
||||||
class FileService:
|
class FileService:
|
||||||
|
|
||||||
# ---------------------------------------------------
|
|
||||||
# Common helpers
|
|
||||||
# ---------------------------------------------------
|
|
||||||
def allowed_file(self, filename):
|
def allowed_file(self, filename):
|
||||||
return (
|
return (
|
||||||
"." in filename
|
"." in filename
|
||||||
and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS
|
and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS
|
||||||
)
|
)
|
||||||
|
|
||||||
# ===================================================
|
# -------------------------- SUBCONTRACTORFILE UPLOAD -------------------------
|
||||||
# SUBCONTRACTOR FILE UPLOAD
|
# SUBCONTRACTOR FILE UPLOAD
|
||||||
# ===================================================
|
|
||||||
def handle_file_upload(self, file, subcontractor_id, RA_Bill_No):
|
def handle_file_upload(self, file, subcontractor_id, RA_Bill_No):
|
||||||
|
|
||||||
if not subcontractor_id:
|
if not subcontractor_id:
|
||||||
@@ -626,15 +58,13 @@ class FileService:
|
|||||||
self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
|
self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
|
||||||
self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
|
self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
|
||||||
|
|
||||||
return True, "File uploaded successfully."
|
return True, "SUBCONTRACTOR File uploaded successfully."
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return False, f"Processing failed: {e}"
|
return False, f"Processing failed(SUBCONTRACTOR): {e}"
|
||||||
|
|
||||||
# ---------------------------------------------------
|
|
||||||
# Trench Excavation (Subcontractor)
|
# Trench Excavation (Subcontractor)
|
||||||
# ---------------------------------------------------
|
|
||||||
def process_trench_excavation(self, df, subcontractor_id, RA_Bill_No):
|
def process_trench_excavation(self, df, subcontractor_id, RA_Bill_No):
|
||||||
|
|
||||||
df.columns = (
|
df.columns = (
|
||||||
@@ -685,9 +115,7 @@ class FileService:
|
|||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
# ---------------------------------------------------
|
|
||||||
# Manhole Excavation (Subcontractor)
|
# Manhole Excavation (Subcontractor)
|
||||||
# ---------------------------------------------------
|
|
||||||
def process_manhole_excavation(self, df, subcontractor_id, RA_Bill_No):
|
def process_manhole_excavation(self, df, subcontractor_id, RA_Bill_No):
|
||||||
|
|
||||||
df.columns = (
|
df.columns = (
|
||||||
@@ -738,9 +166,8 @@ class FileService:
|
|||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
# ---------------------------------------------------
|
|
||||||
# Manhole & Domestic Chamber (Subcontractor)
|
# Manhole & Domestic Chamber (Subcontractor)
|
||||||
# ---------------------------------------------------
|
|
||||||
def process_manhole_domestic_chamber(self, df, subcontractor_id, RA_Bill_No):
|
def process_manhole_domestic_chamber(self, df, subcontractor_id, RA_Bill_No):
|
||||||
|
|
||||||
df.columns = (
|
df.columns = (
|
||||||
@@ -791,9 +218,8 @@ class FileService:
|
|||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
# ===================================================
|
|
||||||
# CLIENT FILE UPLOAD (FINAL FIXED VERSION)
|
# ------------------- CLIENT FILE UPLOAD --------------------------
|
||||||
# ===================================================
|
|
||||||
def handle_client_file_upload(self, file, RA_Bill_No):
|
def handle_client_file_upload(self, file, RA_Bill_No):
|
||||||
|
|
||||||
if not RA_Bill_No:
|
if not RA_Bill_No:
|
||||||
@@ -827,9 +253,9 @@ class FileService:
|
|||||||
print("df_mh_dc :",df_mh_dc)
|
print("df_mh_dc :",df_mh_dc)
|
||||||
print("------------------")
|
print("------------------")
|
||||||
|
|
||||||
self._save_client_data(df_tr_ex, TrenchExcavationClient, RA_Bill_No)
|
self.save_client_data(df_tr_ex, TrenchExcavationClient, RA_Bill_No)
|
||||||
self._save_client_data(df_mh_ex, ManholeExcavationClient, RA_Bill_No)
|
self.save_client_data(df_mh_ex, ManholeExcavationClient, RA_Bill_No)
|
||||||
self._save_client_data(df_mh_dc, ManholeDomesticChamberClient, RA_Bill_No)
|
self.save_client_data(df_mh_dc, ManholeDomesticChamberClient, RA_Bill_No)
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return True, "Client file uploaded and all data saved successfully."
|
return True, "Client file uploaded and all data saved successfully."
|
||||||
@@ -838,10 +264,8 @@ class FileService:
|
|||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return False, f"Client data save failed: {e}"
|
return False, f"Client data save failed: {e}"
|
||||||
|
|
||||||
# ---------------------------------------------------
|
# Client all model Save Method
|
||||||
# Common Client Save Method (FIXED)
|
def save_client_data(self, df, model, RA_Bill_No):
|
||||||
# ---------------------------------------------------
|
|
||||||
def _save_client_data(self, df, model, RA_Bill_No):
|
|
||||||
|
|
||||||
df.columns = [str(c).strip() for c in df.columns]
|
df.columns = [str(c).strip() for c in df.columns]
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,10 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
<!-- File format download -->
|
||||||
|
<li class="nav-item"><a class="nav-link" href="/file_format">Formats</a></li>
|
||||||
|
|
||||||
|
<!-- user -->
|
||||||
<li class="nav-item"><a class="nav-link" href="/user/list">Users</a></li>
|
<li class="nav-item"><a class="nav-link" href="/user/list">Users</a></li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
66
app/templates/ex_format.html
Normal file
66
app/templates/ex_format.html
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<h2 class="mb-4">Download File Formats</h2>
|
||||||
|
|
||||||
|
<div class="row g-4">
|
||||||
|
|
||||||
|
<!-- Subcontractor Format -->
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="card text-center shadow-sm h-100">
|
||||||
|
<div class="card-body d-flex flex-column justify-content-center">
|
||||||
|
<div class="mb-3 fs-1 text-primary">
|
||||||
|
⬇️
|
||||||
|
</div>
|
||||||
|
<h5 class="card-title">Subcontractor Upload Format</h5>
|
||||||
|
<p class="text-muted mb-2">Excel (.xlsx)</p>
|
||||||
|
<p class="small text-secondary">File size: 245 KB</p>
|
||||||
|
|
||||||
|
<a href="{{ url_for('file_format.download_excel_format', filename='subcontractor_format.xlsx') }}"
|
||||||
|
class="btn btn-outline-primary mt-auto">
|
||||||
|
Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Client Format -->
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="card text-center shadow-sm h-100">
|
||||||
|
<div class="card-body d-flex flex-column justify-content-center">
|
||||||
|
<div class="mb-3 fs-1 text-success">
|
||||||
|
⬇️
|
||||||
|
</div>
|
||||||
|
<h5 class="card-title">Client Upload Format</h5>
|
||||||
|
<p class="text-muted mb-2">Excel (.xlsx)</p>
|
||||||
|
<p class="small text-secondary">File size: 310 KB</p>
|
||||||
|
|
||||||
|
<a href="{{ url_for('file_format.download_excel_format', filename='client_format.xlsx') }}"
|
||||||
|
class="btn btn-outline-success mt-auto">
|
||||||
|
Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- MH & DC Format -->
|
||||||
|
<!-- <div class="col-md-4">
|
||||||
|
<div class="card text-center shadow-sm h-100">
|
||||||
|
<div class="card-body d-flex flex-column justify-content-center">
|
||||||
|
<div class="mb-3 fs-1 text-warning">
|
||||||
|
⬇️
|
||||||
|
</div>
|
||||||
|
<h5 class="card-title">Manhole & DC Format</h5>
|
||||||
|
<p class="text-muted mb-2">Excel (.xlsx)</p>
|
||||||
|
<p class="small text-secondary">File size: 190 KB</p>
|
||||||
|
|
||||||
|
<a href="{{ url_for('file_format.download_excel_format', filename='mh_dc_format.xlsx') }}"
|
||||||
|
class="btn btn-outline-warning mt-auto">
|
||||||
|
Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user