pjpatil12/Comparison_Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create user , user login register routes and pages

Browse Source
This commit is contained in:
pjpatil12
2026-01-10 01:04:21 +05:30
parent fe9b056128
commit 54f3d16b57
17 changed files with 322 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/routes/auth.py
View File

@@ -1,31 +1,45 @@
from flask import Blueprint, request, render_template, redirect, flash, session
from app.services.user_service import UserService
from flask import Blueprint, render_template, request, redirect, url_for, flash, session
from app.services.user_service import UserService
auth_bp = Blueprint("auth", __name__, url_prefix="/auth")
auth_bp = Blueprint("auth", __name__)
# LOGIN PAGE
@auth_bp.route("/", methods=["GET", "POST"])
@auth_bp.route("/login", methods=["GET", "POST"])
def login():
if request.method == "POST":
user = UserService.validate_login(
request.form["email"],
request.form["password"]
)
email = request.form.get("email")
password = request.form.get("password")
user = UserService.validate_login(email, password)
if user:
session["user_id"] = user.id
return redirect("/dashboard")
flash("Invalid credentials", "danger")
return render_template("login.html")
session["user_name"] = user.name
flash("Login successful", "success")
return redirect(url_for("dashboard.dashboard"))
# REGISTER API ONLY
@auth_bp.route("/register", methods=["POST"])
def register():
data = request.json
UserService.register_user(data["name"], data["email"], data["password"])
return {"message": "User registered successfully"}, 201
flash("Invalid email or password", "danger")
return render_template("login.html", title="Login")
# LOGOUT
@auth_bp.route("/logout")
def logout():
session.clear()
return redirect("/auth/login")
flash("Logged out successfully", "info")
return redirect(url_for("auth.login"))
@auth_bp.route("/register", methods=["GET", "POST"])
def register():
if request.method == "POST":
name = request.form.get("name")
email = request.form.get("email")
password = request.form.get("password")
user = UserService.register_user(name, email, password)
if not user:
flash("Email already exists", "danger")
return redirect(url_for("auth.register"))
flash("User registered successfully", "success")
return redirect(url_for("auth.login"))
return render_template("register.html", title="Register")

5
app/routes/dashboard.py
View File

@@ -1,8 +1,9 @@
from flask import Blueprint, render_template
from app.utils.helpers import login_required
dashboard_bp = Blueprint("dashboard", __name__)
dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
@dashboard_bp.route("/")
@dashboard_bp.route("/dashboard")
@login_required
def dashboard():
return render_template("dashboard.html", title="Dashboard")

3
app/routes/file_format.py
View File

@@ -1,14 +1,17 @@
from flask import Blueprint, render_template, send_from_directory, abort, current_app
from app.utils.helpers import login_required
import os
file_format = Blueprint("file_format", __name__)
@file_format.route("/file_format")
@login_required
def download_format():
return render_template("ex_format.html", title="Download File Formats")
@file_format.route("/file_format/download/<filename>")
@login_required
def download_excel_format(filename):
download_folder = os.path.join(

12
app/routes/file_import.py
View File

@@ -1,11 +1,12 @@
from flask import Blueprint, render_template, request, flash
from app.services.file_service import FileService
from app.models.subcontractor_model import Subcontractor
from app.utils.helpers import login_required
file_import_bp = Blueprint("file_import", __name__, url_prefix="/file")
# this route import Subcontractor files
@file_import_bp.route("/import", methods=["GET", "POST"])
@login_required
def import_file():
subcontractors = Subcontractor.query.all()
@@ -13,17 +14,22 @@ def import_file():
file = request.files.get("file")
subcontractor_id = request.form.get("subcontractor_id")
RA_Bill_No = request.form.get("RA_Bill_No")
service = FileService()
success, msg = service.handle_file_upload(file, subcontractor_id, RA_Bill_No)
flash(msg, "success" if success else "danger")
return render_template("file_import.html", title="Sub-cont. File Import", subcontractors=subcontractors)
return render_template(
"file_import.html",
title="Sub-cont. File Import",
subcontractors=subcontractors
)
# this route import client files
@file_import_bp.route("/import_client", methods=["GET", "POST"])
@login_required
def client_import_file():
subcontractors = Subcontractor.query.all()

5
app/routes/file_report.py
View File

@@ -6,8 +6,7 @@ from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
from app.models.mh_ex_client_model import ManholeExcavationClient
from app.models.tr_ex_client_model import TrenchExcavationClient
from app.models.mh_dc_client_model import ManholeDomesticChamberClient
from app import db
from app.utils.helpers import login_required
import pandas as pd
import io
@@ -110,6 +109,7 @@ class SubcontractorBill:
# get report by contractor id and dowanload
@file_report_bp.route("/report", methods=["GET", "POST"])
@login_required
def report_file():
subcontractors = Subcontractor.query.all()
@@ -172,6 +172,7 @@ class ClientBill:
@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
@login_required
def client_vs_all_subcontractor():

135
app/routes/generate_comparison_report.py
View File

@@ -1,7 +1,6 @@
from flask import Blueprint, render_template, request, send_file, flash
import pandas as pd
import io
import re
from app.models.subcontractor_model import Subcontractor
from app.models.trench_excavation_model import TrenchExcavation
@@ -10,14 +9,20 @@ from app.models.manhole_excavation_model import ManholeExcavation
from app.models.mh_ex_client_model import ManholeExcavationClient
from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
from app.models.mh_dc_client_model import ManholeDomesticChamberClient
from app.utils.helpers import login_required
generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
# NORMALIZER
def normalize_key(value):
if value is None:
return None
return str(value).strip().upper()
# HEADER FORMATTER
def format_header(header):
# Handle Client- / Subcontractor-
if "-" in header:
prefix, rest = header.split("-", 1)
prefix = prefix.title()
@@ -29,7 +34,6 @@ def format_header(header):
i = 0
while i < len(parts):
# Detect num_num → num.num
if i + 1 < len(parts) and parts[i].isdigit() and parts[i + 1].isdigit():
result.append(f"{parts[i]}.{parts[i + 1]}")
i += 2
@@ -41,32 +45,52 @@ def format_header(header):
return f"{prefix}-{final_text}" if prefix else final_text
# LOOKUP CREATOR
# LOOKUP CREATOR
def make_lookup(rows, key_field):
return {
(r.get("Location"), r.get(key_field)): r
for r in rows
if r.get("Location") and r.get(key_field)
}
lookup = {}
for r in rows:
location = normalize_key(r.get("Location"))
key_val = normalize_key(r.get(key_field))
if location and key_val:
lookup[(location, key_val)] = r
return lookup
# GENERIC COMPARISON BUILDER
# COMPARISON BUILDER
def build_comparison(client_rows, contractor_rows, key_field):
contractor_lookup = make_lookup(contractor_rows, key_field)
output = []
for c in client_rows:
s = contractor_lookup.get((c.get("Location"), c.get(key_field)))
client_location = normalize_key(c.get("Location"))
client_key = normalize_key(c.get(key_field))
if not client_location or not client_key:
continue
s = contractor_lookup.get((client_location, client_key))
if not s:
continue
client_total = sum(v or 0 for k, v in c.items() if k.endswith("_total"))
sub_total = sum(v or 0 for k, v in s.items() if k.endswith("_total"))
client_total = sum(
float(v or 0)
for k, v in c.items()
if k.endswith("_total")
)
sub_total = sum(
float(v or 0)
for k, v in s.items()
if k.endswith("_total")
)
diff = client_total - sub_total
row = {
"Location": c.get("Location"),
key_field.replace("_", " "): c.get(key_field)
"Location": client_location,
key_field.replace("_", " "): client_key
}
# CLIENT DATA
@@ -94,49 +118,31 @@ def build_comparison(client_rows, contractor_rows, key_field):
return df
# EXCEL SHEET WRITER (SEPARATED)
# EXCEL SHEET WRITER
def write_sheet(writer, df, sheet_name, subcontractor_name):
workbook = writer.book
df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
ws = writer.sheets[sheet_name]
title_fmt = workbook.add_format({
"bold": True,
"font_size": 14
})
title_fmt = workbook.add_format({"bold": True, "font_size": 14})
client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
client_fmt = workbook.add_format({
"bold": True,
"border": 1,
"bg_color": "#D9EDF7"
})
sub_fmt = workbook.add_format({
"bold": True,
"border": 1,
"bg_color": "#F7E1D9"
})
total_fmt = workbook.add_format({
"bold": True,
"border": 1,
"bg_color": "#FFF2CC"
})
diff_fmt = workbook.add_format({
"bold": True,
"border": 1,
"bg_color": "#E2EFDA"
})
# MAIN HEADING
ws.merge_range(
0, 0, 0, len(df.columns) - 1,
f"CLIENT vs SUBCONTRACTOR – {subcontractor_name}",
"CLIENT vs SUBCONTRACTOR",
title_fmt
)
ws.merge_range(
1, 0, 1, len(df.columns) - 1,
f"Subcontractor Name - {subcontractor_name}",
title_fmt
)
# COLUMN HEADERS
for col_num, col_name in enumerate(df.columns):
if col_name.startswith("Client-"):
ws.write(3, col_num, col_name, client_fmt)
@@ -147,13 +153,14 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
elif col_name == "Diff":
ws.write(3, col_num, col_name, diff_fmt)
else:
ws.write(3, col_num, col_name)
ws.write(3, col_num, col_name, default_header_fmt)
ws.set_column(col_num, col_num, 20)
# old report generate ROUTE
# REPORT ROUTE
@generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
@login_required
def comparison_report():
subcontractors = Subcontractor.query.all()
@@ -161,47 +168,30 @@ def comparison_report():
subcontractor_id = request.form.get("subcontractor_id")
if not subcontractor_id:
flash("Please select subcontractor", "danger")
return render_template(
"generate_comparison_report.html",
subcontractors=subcontractors
)
return render_template("generate_comparison_report.html",subcontractors=subcontractors)
subcontractor = Subcontractor.query.get_or_404(subcontractor_id)
# ===================== DATA =====================
# -------- DATA --------
tr_client = [r.serialize() for r in TrenchExcavationClient.query.all()]
tr_sub = [r.serialize() for r in TrenchExcavation.query.filter_by(
subcontractor_id=subcontractor_id
).all()]
df_tr = build_comparison(tr_client, tr_sub, "MH_NO")
print("-- tr clint --:",tr_client )
print("-- tr sub --:",tr_sub )
mh_client = [r.serialize() for r in ManholeExcavationClient.query.all()]
mh_sub = [r.serialize() for r in ManholeExcavation.query.filter_by(
subcontractor_id=subcontractor_id
).all()]
df_mh = build_comparison(mh_client, mh_sub, "MH_NO")
# print("-- mh clint --:",mh_client)
# print("-- mh sub --:",mh_sub )
dc_client = [r.serialize() for r in ManholeDomesticChamberClient.query.all()]
dc_sub = [r.serialize() for r in ManholeDomesticChamber.query.filter_by(
subcontractor_id=subcontractor_id
).all()]
df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
# print("-- mh dc clint --:",dc_client )
# print("-- mh dc sub --:", dc_sub)
# ===================== EXCEL =====================
# -------- EXCEL --------
output = io.BytesIO()
filename = f"{subcontractor.subcontractor_name}_Comparison_Report.xlsx"
@@ -218,7 +208,6 @@ def comparison_report():
mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
)
return render_template(
"generate_comparison_report.html",
subcontractors=subcontractors
)
return render_template("generate_comparison_report.html",subcontractors=subcontractors)

7
app/routes/subcontractor_routes.py
View File

@@ -1,15 +1,18 @@
from flask import Blueprint, render_template, request, redirect, flash
from app import db
from app.models.subcontractor_model import Subcontractor
from app.utils.helpers import login_required
subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
# ---------------- ADD -----------------
@subcontractor_bp.route("/add")
@login_required
def add_subcontractor():
return render_template("subcontractor/add.html")
@subcontractor_bp.route("/save", methods=["POST"])
@login_required
def save_subcontractor():
subcontractor = Subcontractor(
subcontractor_name=request.form.get("subcontractor_name"),
@@ -26,18 +29,21 @@ def save_subcontractor():
# ---------------- LIST -----------------
@subcontractor_bp.route("/list")
@login_required
def subcontractor_list():
subcontractors = Subcontractor.query.all()
return render_template("subcontractor/list.html", subcontractors=subcontractors)
# ---------------- EDIT -----------------
@subcontractor_bp.route("/edit/<int:id>")
@login_required
def edit_subcontractor(id):
subcontractor = Subcontractor.query.get_or_404(id)
return render_template("subcontractor/edit.html", subcontractor=subcontractor)
# ---------------- UPDATE -----------------
@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
@login_required
def update_subcontractor(id):
subcontractor = Subcontractor.query.get_or_404(id)
@@ -54,6 +60,7 @@ def update_subcontractor(id):
# ---------------- DELETE -----------------
@subcontractor_bp.route("/delete/<int:id>")
@login_required
def delete_subcontractor(id):
subcontractor = Subcontractor.query.get_or_404(id)

4
app/routes/user.py
View File

@@ -1,9 +1,11 @@
from flask import Blueprint, render_template
from app.services.user_service import UserService
from app.utils.helpers import login_required
user_bp = Blueprint("user", __name__, url_prefix="/user")
@user_bp.route("/list")
@login_required
def list_users():
users = UserService().get_all_users()
users = UserService.get_all_users()
return render_template("users.html", users=users, title="Users")