diff --git a/app/routes/engineering_master_routes.py b/app/routes/engineering_master_routes.py index 71cb99f..4a2fea5 100644 --- a/app/routes/engineering_master_routes.py +++ b/app/routes/engineering_master_routes.py @@ -4,7 +4,7 @@ from flask import ( request, redirect, url_for, - flash + flash, jsonify ) from app.models.subcontractor_model import Subcontractor @@ -26,26 +26,8 @@ def engineering_master(): "engineering/index.html", title="Engineering Masters" ) - - -@engi_bp.route("/subcontractor-rate") -def add_subcontractor_rates(): - subcontractors = Subcontractor.query.filter_by(status="Active").all() - - if request.method == "POST": - try: - SubcontractorRateService.save_rate(request.form) - flash(SuccessMessage.SAVE, "success") - return redirect(url_for("engineering.add_subcontractor_rates")) - except Exception as e: - flash(ErrorMessage.INTERNAL_SERVER_ERROR, "danger") - - return render_template( - "engineering/add_rate.html", - title="Subcontractor Rate Master", - subcontractors=subcontractors - ) - + +# Client rate model @engi_bp.route("/client-rate") def client_rates(): @@ -54,3 +36,72 @@ def client_rates(): title="Client Rate Master" ) +@engi_bp.route("/subcontractor-rate", methods=["GET", "POST"]) +def add_subcontractor_rates(): + + subcontractors = Subcontractor.query.filter_by(status="Active").all() + + if request.method == "POST": + result = SubcontractorRateService.save_or_update(request.form) + if result["success"]: + flash(result["message"], "success") + return redirect(url_for("engineering.add_subcontractor_rates")) + else: + flash(result["message"], "danger") + + rates = SubcontractorRateService.get_all_rates() + + return render_template( + "engineering/contractor_rate.html", + title="Subcontractor Rate Master", + subcontractors=subcontractors, + rates=rates + ) + +@engi_bp.route("/subcontractor-rate/edit/", methods=["GET", "POST"]) +def edit_rate(rate_id): + + subcontractors = Subcontractor.query.filter_by(status="Active").all() + + if request.method == "POST": + + result = SubcontractorRateService.save_or_update(request.form) + + if result["success"]: + flash(result["message"], "success") + return redirect(url_for("engineering.add_subcontractor_rates")) + + flash(result["message"], "danger") + + rate = SubcontractorRateService.get_rate(rate_id) + + rates = SubcontractorRateService.get_all_rates() + + return render_template( + "engineering/contractor_rate.html", + subcontractors=subcontractors, + rate=rate, + rates=rates + ) + +@engi_bp.route("/subcontractor-rate/delete/") +def delete_rate(rate_id): + SubcontractorRateService.delete_rate(rate_id) + flash("Rate deleted successfully.", "success") + return redirect(url_for("engineering.add_subcontractor_rates")) + + +@engi_bp.route("/check-rate") +def check_rate(): + + exists = SubcontractorRateService.check_duplicate( + subcontractor_id=request.args.get("subcontractor_id"), + category=request.args.get("category"), + item_name=request.args.get("item_name"), + rate_id=request.args.get("rate_id") + ) + + return jsonify({ + "exists": exists + }) + diff --git a/app/services/subcontractor_rate_service.py b/app/services/subcontractor_rate_service.py index 951c378..a21107c 100644 --- a/app/services/subcontractor_rate_service.py +++ b/app/services/subcontractor_rate_service.py @@ -1,28 +1,66 @@ from app.services.db_service import db from app.models.subcontractor_rate_model import SubcontractorRate +from sqlalchemy import func class SubcontractorRateService: @staticmethod - def save_rate(form): + def save_or_update(form): - rate = SubcontractorRate( - subcontractor_id=form.get("subcontractor_id"), - category=form.get("category"), - item_code=form.get("item_code"), - item_name=form.get("item_name"), - unit=form.get("unit"), - rate=form.get("rate"), - effective_from=form.get("effective_from"), - effective_to=form.get("effective_to") or None, - status=form.get("status") + rate_id = form.get("id") + + subcontractor_id = form.get("subcontractor_id") + category = form.get("category") + item_name = form.get("item_name").strip() + + # ----------------------------- + # Duplicate Validation + # ----------------------------- + duplicate = ( + SubcontractorRate.query + .filter( + SubcontractorRate.subcontractor_id == subcontractor_id, + SubcontractorRate.category == category, + func.lower(SubcontractorRate.item_name) == item_name.lower() + ) + .first() ) - db.session.add(rate) + # Ignore current record while editing + if duplicate and (not rate_id or duplicate.id != int(rate_id)): + return { + "success": False, + "message": "Category and Rate already exists for this Subcontractor." + } + + # ----------------------------- + # Insert / Update + # ----------------------------- + if rate_id: + rate = SubcontractorRate.query.get_or_404(rate_id) + else: + rate = SubcontractorRate() + + rate.subcontractor_id = subcontractor_id + rate.category = category + rate.item_code = form.get("item_code") + rate.item_name = item_name + rate.unit = form.get("unit") + rate.rate = form.get("rate") + rate.effective_from = form.get("effective_from") + rate.effective_to = form.get("effective_to") or None + rate.status = form.get("status") + + if not rate_id: + db.session.add(rate) + db.session.commit() - return rate - + + return { + "success": True, + "message": "Saved Successfully." + } @staticmethod def get_all_rates(): @@ -32,34 +70,33 @@ class SubcontractorRateService: .order_by(SubcontractorRate.created_at.desc()) .all() ) + + @staticmethod def get_rate(rate_id): return SubcontractorRate.query.get_or_404(rate_id) - @staticmethod - def update_rate(rate_id, form): - - rate = SubcontractorRate.query.get_or_404(rate_id) - - rate.subcontractor_id = form.get("subcontractor_id") - rate.category = form.get("category") - rate.item_code = form.get("item_code") - rate.item_name = form.get("item_name") - rate.unit = form.get("unit") - rate.rate = form.get("rate") - rate.effective_from = form.get("effective_from") - rate.effective_to = form.get("effective_to") or None - rate.status = form.get("status") - - db.session.commit() - return rate - - @staticmethod def delete_rate(rate_id): - rate = SubcontractorRate.query.get_or_404(rate_id) - db.session.delete(rate) + db.session.commit() + - db.session.commit() \ No newline at end of file + @staticmethod + def check_duplicate(subcontractor_id, category, item_name, rate_id=None): + + query = SubcontractorRate.query.filter( + SubcontractorRate.subcontractor_id == subcontractor_id, + SubcontractorRate.category == category, + func.lower(SubcontractorRate.item_name) == item_name.strip().lower() + ) + + if rate_id: + query = query.filter(SubcontractorRate.id != int(rate_id)) + + return query.first() is not None + + + + \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index cca715e..28de0ef 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -124,10 +124,21 @@ Client vs Subcontractor - + + +
  • + + Formats + +
    • +
  • @@ -144,22 +155,13 @@
  • - Client Standard Rates + Client Rates -
    • - - -
  • - - Formats - -
    • - + - - +
    • - +
  • - - Dashboard + + Masters
    • @@ -199,12 +201,13 @@ - +
    • @@ -223,9 +226,7 @@ Secured by LCEPL - - @@ -379,6 +380,7 @@ showLoader(); const btn = this.querySelector("button[type='submit']"); + const originalBtnHtml = btn ? btn.innerHTML : null; if(btn){ btn.disabled = true; @@ -388,10 +390,24 @@ `; } + + setTimeout(function () { + hideLoader(); + if (btn) { + btn.disabled = false; + btn.innerHTML = originalBtnHtml; + } + }, 3000); + }); }); }); + + window.addEventListener("pageshow", function () { + hideLoader(); + }); + diff --git a/app/templates/engineering/add_rate.html b/app/templates/engineering/add_rate.html deleted file mode 100644 index 2b8f2a7..0000000 --- a/app/templates/engineering/add_rate.html +++ /dev/null @@ -1,236 +0,0 @@ -{% extends "base.html" %} -{% block content %} -
    - -
    - -
    -

    - - Subcontractor Rate Master -

    -
    - -
    - -
    - -
    - - -
    - - - -
    - - -
    - - - - - -
    - - -
    - - - - - -
    - -
    - -
    - - -
    - - - - - -
    - - -
    - - - - - -
    - - -
    - - - - - -
    - - -
    - - - - - -
    - -
    - -
    - - -
    - - - - - -
    - - -
    - - - - - -
    - -
    - -
    - -
    - - - - - -
    - -
    - -
    - -
    - -
    - - -{% endblock %} \ No newline at end of file diff --git a/app/templates/engineering/client_rate.html b/app/templates/engineering/client_rate.html new file mode 100644 index 0000000..a41a2b1 --- /dev/null +++ b/app/templates/engineering/client_rate.html @@ -0,0 +1,20 @@ +{% extends "base.html" %} +{% block content %} + +
    + +
    + +
    + +

    + + Client Rate Master +

    + +
    + +
    + + +{% endblock %} \ No newline at end of file diff --git a/app/templates/engineering/contractor_rate.html b/app/templates/engineering/contractor_rate.html new file mode 100644 index 0000000..5f892a9 --- /dev/null +++ b/app/templates/engineering/contractor_rate.html @@ -0,0 +1,384 @@ +{% extends "base.html" %} +{% block content %} + +
    + +
    + +
    + +

    + + Subcontractor Rate Master +

    + +
    + +
    + +
    + + + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + + +
    +
    + +
    + + +
    + + +
    + + +
    + + + + +
    + + + +
    + + +
    + + +
    + + +
    +
    + +
    +
    + + +
    + +
    + + +
    +
    + +
    + +
    + + Reset + + + +
    +
    +
    +
    + + +
    +
    +
    + Rate List +
    +
    + +
    + + + + + + + + + + + + + + + + + {% for row in rates %} + + + + + + + + + + + + + {% endfor %} + + +
    #SubcontractorCategoryItem CodeItem NameUnitRateStatusAction
    {{ loop.index }}{{ row.subcontractor.subcontractor_name }}{{ row.category }}{{ row.item_code }}{{ row.item_name }}{{ row.unit }}{{ row.rate }} + {% if row.status=="Active" %} + + Active + + {% else %} + + Inactive + + {% endif %} + + + + + + + + +
    +
    +
    +
    + + + +{% endblock %} \ No newline at end of file diff --git a/app/templates/engineering/list.html b/app/templates/engineering/list.html deleted file mode 100644 index e69de29..0000000