added Docker file and docker compose yml files

added new changes
comaparison code optimization and cal sum/total mh dc and laying
2026-02-21 15:00:05 +05:30 · 2026-01-23 13:09:51 +05:30 · 2026-01-20 16:34:16 +05:30 · 2026-01-20 16:33:45 +05:30
22 changed files with 387 additions and 258 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,19 @@
+.git
+.gitignore
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+env/
+venv/
+*.egg-info/
+dist/
+build/
+.vscode/
+.idea/
+*.log
+.env
+instance/
+.pytest_cache/
+.coverage
--- a/.env
+++ b/.env
@@ -3,8 +3,8 @@
 # -----------------------------
 FLASK_ENV=development
 FLASK_DEBUG=True
-FLASK_HOST='0.0.0.0'
-FLASK_PORT=5001
+FLASK_HOST=0.0.0.0
+FLASK_PORT=5011

 # -----------------------------
 # Security
--- a/24
+++ b/24
@@ -0,0 +1,24 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    gcc \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements and install Python dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY . .
+
+# Create necessary directories
+RUN mkdir -p app/logs app/static/uploads app/static/downloads
+
+# Expose port
+EXPOSE 5001
+
+# Run the application
+CMD ["python", "run.py"]
--- a/app/models/laying_client_model.py
+++ b/app/models/laying_client_model.py
@@ -5,16 +5,19 @@ class LayingClient(db.Model):
    __tablename__ = "laying_client"

    id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor tables
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="laying_records")

    # Basic Fields
    Location = db.Column(db.String(500))
    MH_NO = db.Column(db.String(100))
    CC_length = db.Column(db.Float)
+    # Bedding Qty.
+    Outer_dia_of_MH_m = db.Column(db.Float)
+    Bedding_Length = db.Column(db.Float)
+    Width = db.Column(db.Float)
+    Depth = db.Column(db.Float)
+    Qty = db.Column(db.Float)
 
+    #  PIPE LAYING Qty. 
    Pipe_Dia_mm = db.Column(db.Float)
    ID_of_MH_m = db.Column(db.Float)
    Laying_Length = db.Column(db.Float)
@@ -32,7 +35,6 @@ class LayingClient(db.Model):
    pipe_900_mm = db.Column(db.Float)
    pipe_1200_mm = db.Column(db.Float)
    
-    
    Total = db.Column(db.Float)
    Remarks = db.Column(db.String(500))
    RA_Bill_No=db.Column(db.String(500))
@@ -45,3 +47,12 @@ class LayingClient(db.Model):

    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]
--- a/app/models/laying_model.py
+++ b/app/models/laying_model.py
@@ -10,11 +10,10 @@ class Laying(db.Model):
    # Relationship for easy access (subcontractor.subcontractor_name)
    subcontractor = db.relationship("Subcontractor", backref="laying_records")

-    # Basic Fields
+    # Pipe Laying Fields
    Location = db.Column(db.String(500))
    MH_NO = db.Column(db.String(100))
    CC_length = db.Column(db.Float)
- 
    Pipe_Dia_mm = db.Column(db.Float)
    ID_of_MH_m = db.Column(db.Float)
    Laying_Length = db.Column(db.Float)
@@ -32,7 +31,6 @@ class Laying(db.Model):
    pipe_900_mm = db.Column(db.Float)
    pipe_1200_mm = db.Column(db.Float)
    
-    
    Total = db.Column(db.Float)
    Remarks = db.Column(db.String(500))
    RA_Bill_No=db.Column(db.String(500))
@@ -45,3 +43,12 @@ class Laying(db.Model):

    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]
--- a/app/models/manhole_domestic_chamber_model.py
+++ b/app/models/manhole_domestic_chamber_model.py
@@ -50,3 +50,14 @@ class ManholeDomesticChamber(db.Model):
    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
    
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65"]
+
--- a/app/models/mh_dc_client_model.py
+++ b/app/models/mh_dc_client_model.py
@@ -44,3 +44,14 @@ class ManholeDomesticChamberClient(db.Model):

    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65" ]
--- a/app/models/trench_excavation_model.py
+++ b/app/models/trench_excavation_model.py
@@ -77,3 +77,34 @@ class TrenchExcavation(db.Model):

    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    def excavation_category_sums(self):
+
+        def safe(val):
+            return val or 0
+
+        return {
+            "Soft_Murum_Total": (
+                safe(self.Soft_Murum_0_to_1_5)
+                + safe(self.Soft_Murum_1_5_to_3_0)
+                + safe(self.Soft_Murum_3_0_to_4_5)
+            ),
+
+            "Hard_Murum_Total": (
+                safe(self.Hard_Murum_0_to_1_5)
+                + safe(self.Hard_Murum_1_5_to_3_0)
+            ),
+
+            "Soft_Rock_Total": (
+                safe(self.Soft_Rock_0_to_1_5)
+                + safe(self.Soft_Rock_1_5_to_3_0)
+            ),
+
+            "Hard_Rock_Total": (
+                safe(self.Hard_Rock_0_to_1_5)
+                + safe(self.Hard_Rock_1_5_to_3_0)
+                + safe(self.Hard_Rock_3_0_to_4_5)
+                + safe(self.Hard_Rock_4_5_to_6_0)
+                + safe(self.Hard_Rock_6_0_to_7_5)
+            ),
+        }
--- a/app/routes/dashboard.py
+++ b/app/routes/dashboard.py
@@ -5,16 +5,20 @@ from flask import Blueprint, render_template, session, redirect, url_for
 import matplotlib.pyplot as plt
 import io
 import base64
+from app.utils.plot_utils import plot_to_base64
+from app.services.dashboard_service import DashboardService

 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")

+# dashboard_bp = Blueprint("dashboard", __name__)
+
 # charts 
-def plot_to_base64():
-    img = io.BytesIO()
-    plt.savefig(img, format="png", bbox_inches="tight")
-    plt.close()
-    img.seek(0)
-    return base64.b64encode(img.getvalue()).decode()
+# def plot_to_base64():
+#     img = io.BytesIO()
+#     plt.savefig(img, format="png", bbox_inches="tight")
+#     plt.close()
+#     img.seek(0)
+#     return base64.b64encode(img.getvalue()).decode()

 # bar chart
 def bar_chart():
@@ -24,11 +28,11 @@ def bar_chart():
    plt.figure()
    plt.bar(categories, values)
    plt.title("Work Category Report")
-    plt.xlabel("Category")
-    plt.ylabel("Count")
+    plt.xlabel("test Category")
+    plt.ylabel("test Quantity")


-    return plot_to_base64()
+    return plot_to_base64(plt)

 # Pie chart
 def pie_chart():
@@ -39,7 +43,7 @@ def pie_chart():
    plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)
    plt.title("Project Status")

-    return plot_to_base64()
+    return plot_to_base64(plt)

 # Histogram chart
 def histogram_chart():
@@ -51,7 +55,7 @@ def histogram_chart():
    plt.xlabel("Work Units")
    plt.ylabel("Frequency")

-    return plot_to_base64()
+    return plot_to_base64(plt)

 # Dashboaed page
@dashboard_bp.route("/")
@@ -68,15 +72,16 @@ def dashboard():
    )

 # subcontractor dashboard
-@dashboard_bp.route("/subcontractor_dashboard")
+@dashboard_bp.route("/subcontractor_dashboard", methods=["GET", "POST"])
 def subcontractor_dashboard():
    if not session.get("user_id"):
        return redirect(url_for("auth.login"))

+    tr_dash = DashboardService().bar_chart_of_tr_ex
+    
+    
    return render_template(
        "subcontractor_dashboard.html",
        title="Dashboard",
-        bar_chart=bar_chart(),
-        pie_chart=pie_chart(),
-        histogram=histogram_chart()
+        bar_chart=tr_dash
    )
--- a/app/routes/file_report.py
+++ b/app/routes/file_report.py
@@ -73,6 +73,7 @@ class SubcontractorBill:
            if not df.empty:
                df.drop(columns=drop_cols, errors="ignore", inplace=True)

+
 # --- subcontractor report only  ---
@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
@login_required
@@ -91,7 +92,7 @@ def report_file():
 
        if not subcontractor_id:
            flash("Please select a subcontractor.", "danger")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
 
        subcontractor = Subcontractor.query.get(subcontractor_id)
        bill_gen = SubcontractorBill()
@@ -102,13 +103,13 @@ def report_file():
        else:
            if not ra_bill_no:
                flash("Please enter an RA Bill Number.", "danger")
-                return render_template("report.html", subcontractors=subcontractors)
+                return render_template("subcontractor_report.html", subcontractors=subcontractors)
            bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
            file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
 
        if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
            flash("No data found for this selection.", "warning")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
 
        # If download is clicked, return file immediately
        if action == "download":
@@ -153,7 +154,7 @@ def client_vs_all_subcontractor():
 
        if not RA_Bill_No:
            flash("Please enter RA Bill No.", "danger")
-            return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
 
        clientBill = ClientBill()
        clientBill.Fetch(RA_Bill_No=RA_Bill_No)
@@ -163,7 +164,7 @@ def client_vs_all_subcontractor():
        # --- SAFETY CHECK: Verify data exists before merging ---
        if clientBill.df_tr.empty and clientBill.df_mh.empty:
            flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
-            return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
 
        qty_cols = [...] # (Keep your existing list)
        mh_dc_qty_cols = [...] # (Keep your existing list)
--- a/app/routes/generate_comparison_report.py
+++ b/app/routes/generate_comparison_report.py
@@ -14,10 +14,18 @@ from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.models.laying_client_model import LayingClient

 from app.utils.helpers import login_required
+import re
+

 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")


+# sum field  of pipe laying (pipe_150_mm)
+PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+# sum fields of MH dc (d_0_to_0_75)
+D_RANGE_PATTERN = re.compile( r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+
+
 # NORMALIZER
 def normalize_key(value):
    if value is None:
@@ -81,13 +89,13 @@ def build_comparison(client_rows, contractor_rows, key_field):
        client_total = sum(
            float(v or 0)
            for k, v in c.items()
-            if k.endswith("_total")
+            if k.endswith("_total") or D_RANGE_PATTERN.match(k) or PIPE_MM_PATTERN.match(k)
        )

        sub_total = sum(
            float(v or 0)
            for k, v in s.items()
-            if k.endswith("_total")
+            if k.endswith("_total") or D_RANGE_PATTERN.match(k) or PIPE_MM_PATTERN.match(k)
        )

        diff = client_total - sub_total
@@ -129,10 +137,10 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
    ws = writer.sheets[sheet_name]

    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"})
+    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#B6DAED"})
+    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F3A081"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7D261"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#82DD49"})
    default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})


@@ -147,12 +155,13 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
        title_fmt
    )

+
    for col_num, col_name in enumerate(df.columns):
        if col_name.startswith("Client-"):
            ws.write(3, col_num, col_name, client_fmt)
        elif col_name.startswith("Subcontractor-"):
            ws.write(3, col_num, col_name, sub_fmt)
-        elif col_name.endswith("Total"):
+        elif col_name.endswith("_total") or col_name.endswith("_total") :
            ws.write(3, col_num, col_name, total_fmt)
        elif col_name == "Diff":
            ws.write(3, col_num, col_name, diff_fmt)
@@ -194,12 +203,14 @@ def comparison_report():
            subcontractor_id=subcontractor_id
        ).all()]
        df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
+        # df_dc = build_comparison_mh_dc(dc_client, dc_sub, "MH_NO")

        lay_client = [r.serialize() for r in LayingClient.query.all()]
        lay_sub = [r.serialize() for r in Laying.query.filter_by(
            subcontractor_id=subcontractor_id
        ).all()]
        df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
+        # df_lay = build_comparison_laying(lay_client, lay_sub, "MH_NO")


        # -------- EXCEL --------
@@ -223,3 +234,104 @@ def comparison_report():
    return render_template("generate_comparison_report.html",subcontractors=subcontractors)


+# def build_comparison_mh_dc(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     mh_dc_fields = ManholeDomesticChamberClient.sum_mh_dc_fields()
+
+#     output = []
+
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+
+#         client_total = sum(float(c.get(f, 0) or 0) for f in mh_dc_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in mh_dc_fields)
+
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+
+#         output.append(row)
+
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df
+
+
+# def build_comparison_laying(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     laying_fields = Laying.sum_laying_fields()
+
+#     output = []
+
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+
+#         client_total = sum(float(c.get(f, 0) or 0) for f in laying_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in laying_fields)
+
+#         print("--------------",key,"----------")
+#         print("sum -client_total ",client_total)
+#         print("sum -sub_total ",sub_total)
+#         print("Diff ---- ",client_total - sub_total)
+#         print("------------------------")
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+
+#         output.append(row)
+
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df
--- a/app/services/dashboard_service.py
+++ b/app/services/dashboard_service.py
@@ -0,0 +1,49 @@
+from app.config import Config
+from app import db
+import matplotlib
+matplotlib.use("Agg")
+from app.routes.dashboard import plot_to_base64
+import matplotlib.pyplot as plt
+import io
+import base64
+
+from app.utils.plot_utils import plot_to_base64
+
+# Subcontractor models import
+from app.models.trench_excavation_model import TrenchExcavation
+
+# Client models import
+# from app.models.tr_ex_client_model import TrenchExcavationClient
+
+
+class DashboardService:
+
+
+    # bar chart
+    def bar_chart_of_tr_ex():
+        categories = ["Soft Murum", "Hard Murum", "Soft Rock", "Hard Rock"]
+        values = [120, 80, 150, 60]
+
+        tr = TrenchExcavation()
+
+        record = TrenchExcavation.query.first()
+        print(" RA_Bill_No::",record["RA_Bill_No"])
+
+        totals = tr.excavation_category_sums()
+
+        # print(totals["Soft_Murum_Total"])
+        # print(totals["Hard_Rock_Total"])
+
+
+        plt.figure()
+        plt.bar(categories, values)
+        plt.title("Trench Excavation Work Category Report")
+        plt.xlabel("Excavation category")
+        plt.ylabel("Quantity")
+
+        return plot_to_base64(plt)
+
+
+    def subcontractor_dash():
+            return True
+        
--- a/app/static/downloads/format/client_format.xlsx
+++ b/app/static/downloads/format/client_format.xlsx
--- a/app/static/downloads/format/subcontractor_format.xlsx
+++ b/app/static/downloads/format/subcontractor_format.xlsx
--- a/app/templates/client_report.html
+++ b/app/templates/client_report.html
@@ -4,17 +4,6 @@
 <div class="container-fluid mt-4">
    <h2 class="mb-4">Client File Reports</h2>

-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
    <div class="card p-4 shadow-sm mb-5">
        <form method="POST">
            <label class="form-label fw-bold">RA Bill No</label>
@@ -51,7 +40,8 @@
                    Comparison</button>
            </li>
            <li class="nav-item">
-                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
+                    type="button">Laying
                    & Bedding Comparison</button>
        </ul>

--- a/app/templates/subcontractor/add.html
+++ b/app/templates/subcontractor/add.html
@@ -13,7 +13,7 @@
        </div>

        <div class="mb-3">
-            <label class="form-label">Contact Person</label>
+            <label class="form-label">Contact Person Name</label>
            <input type="text" class="form-control" name="contact_person">
        </div>

--- a/app/utils/plot_utils.py
+++ b/app/utils/plot_utils.py
@@ -0,0 +1,10 @@
+import base64
+from io import BytesIO
+import matplotlib
+matplotlib.use("Agg")
+
+def plot_to_base64(plt):
+    img = BytesIO()
+    plt.savefig(img, format="png", bbox_inches="tight")
+    img.seek(0)
+    return base64.b64encode(img.read()).decode("utf-8")
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,46 @@
+version: '3.8'
+
+services:
+  db:
+    image: mysql:8.0
+    container_name: comparison_db
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: comparisondb
+    ports:
+      - "3307:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+
+  app:
+    build: .
+    container_name: comparison_app
+    restart: always
+    environment:
+      FLASK_ENV: development
+      FLASK_DEBUG: "True"
+      FLASK_HOST: "0.0.0.0"
+      FLASK_PORT: "5001"
+
+      DB_DIALECT: mysql
+      DB_DRIVER: pymysql
+      DB_HOST: db
+      DB_PORT: 3306
+      DB_NAME: comparisondb
+      DB_USER: root
+      DB_PASSWORD: root
+
+    ports:
+      - "5001:5001"
+
+    depends_on:
+      - db
+
+    volumes:
+      - ./app/logs:/app/app/logs
+      - ./app/static/uploads:/app/app/static/uploads
+      - ./app/static/downloads:/app/app/static/downloads
+
+volumes:
+  mysql_data:
--- a/logs/app.log
+++ b/logs/app.log
@@ -1,200 +0,0 @@
-2025-12-09 13:11:05,606 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5000
-2025-12-09 13:11:05,607 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:11:05,608 | INFO |  * Restarting with stat
-2025-12-09 13:11:06,239 | WARNING |  * Debugger is active!
-2025-12-09 13:11:06,240 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:11:48,880 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5000
-2025-12-09 13:11:48,881 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:11:48,882 | INFO |  * Restarting with stat
-2025-12-09 13:11:49,519 | WARNING |  * Debugger is active!
-2025-12-09 13:11:49,521 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:05,727 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\user_service.py', reloading
-2025-12-09 13:12:05,826 | INFO |  * Restarting with stat
-2025-12-09 13:12:06,499 | WARNING |  * Debugger is active!
-2025-12-09 13:12:06,501 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:09,545 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
-2025-12-09 13:12:09,654 | INFO |  * Restarting with stat
-2025-12-09 13:12:10,286 | WARNING |  * Debugger is active!
-2025-12-09 13:12:10,288 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:12,311 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\auth.py', reloading
-2025-12-09 13:12:12,407 | INFO |  * Restarting with stat
-2025-12-09 13:12:13,071 | WARNING |  * Debugger is active!
-2025-12-09 13:12:13,072 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:16,128 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
-2025-12-09 13:12:16,257 | INFO |  * Restarting with stat
-2025-12-09 13:12:16,898 | WARNING |  * Debugger is active!
-2025-12-09 13:12:16,900 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:20,944 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\user.py', reloading
-2025-12-09 13:12:21,042 | INFO |  * Restarting with stat
-2025-12-09 13:12:21,719 | WARNING |  * Debugger is active!
-2025-12-09 13:12:21,721 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:23,762 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\file_import.py', reloading
-2025-12-09 13:12:23,870 | INFO |  * Restarting with stat
-2025-12-09 13:12:24,505 | WARNING |  * Debugger is active!
-2025-12-09 13:12:24,507 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:27,561 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\__init__.py', reloading
-2025-12-09 13:12:27,670 | INFO |  * Restarting with stat
-2025-12-09 13:12:28,294 | WARNING |  * Debugger is active!
-2025-12-09 13:12:28,296 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:12:31,336 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\db_service.py', reloading
-2025-12-09 13:12:31,448 | INFO |  * Restarting with stat
-2025-12-09 13:12:32,097 | WARNING |  * Debugger is active!
-2025-12-09 13:12:32,099 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:13:05,662 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
-2025-12-09 13:13:05,773 | INFO |  * Restarting with stat
-2025-12-09 13:13:06,466 | WARNING |  * Debugger is active!
-2025-12-09 13:13:06,469 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:13:10,944 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5000
-2025-12-09 13:13:10,944 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:13:10,945 | INFO |  * Restarting with stat
-2025-12-09 13:13:11,623 | WARNING |  * Debugger is active!
-2025-12-09 13:13:11,625 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:14:11,295 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:14:11,393 | INFO |  * Restarting with stat
-2025-12-09 13:14:12,004 | WARNING |  * Debugger is active!
-2025-12-09 13:14:12,006 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:14:32,108 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:14:32,109 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:14:32,110 | INFO |  * Restarting with stat
-2025-12-09 13:14:32,699 | WARNING |  * Debugger is active!
-2025-12-09 13:14:32,701 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:15:58,632 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:15:58,733 | INFO |  * Restarting with stat
-2025-12-09 13:15:59,415 | WARNING |  * Debugger is active!
-2025-12-09 13:15:59,416 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:16:03,475 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:16:03,583 | INFO |  * Restarting with stat
-2025-12-09 13:16:04,204 | WARNING |  * Debugger is active!
-2025-12-09 13:16:04,206 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:16:33,504 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:16:33,605 | INFO |  * Restarting with stat
-2025-12-09 13:16:34,213 | WARNING |  * Debugger is active!
-2025-12-09 13:16:34,215 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:16:41,815 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5000
-2025-12-09 13:16:41,816 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:18:12,302 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5000
-2025-12-09 13:18:12,302 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:22:07,114 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:22:07,114 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:22:07,116 | INFO |  * Restarting with stat
-2025-12-09 13:22:07,935 | WARNING |  * Debugger is active!
-2025-12-09 13:22:07,937 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:23:21,204 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:23:21,305 | INFO |  * Restarting with stat
-2025-12-09 13:24:06,973 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:24:06,973 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:24:06,974 | INFO |  * Restarting with stat
-2025-12-09 13:24:07,689 | WARNING |  * Debugger is active!
-2025-12-09 13:24:07,691 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:24:36,315 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\app.py', reloading
-2025-12-09 13:24:36,418 | INFO |  * Restarting with stat
-2025-12-09 13:24:37,074 | WARNING |  * Debugger is active!
-2025-12-09 13:24:37,076 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:26:54,442 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:26:54,543 | INFO |  * Restarting with stat
-2025-12-09 13:26:59,170 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:26:59,170 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:26:59,171 | INFO |  * Restarting with stat
-2025-12-09 13:26:59,827 | WARNING |  * Debugger is active!
-2025-12-09 13:26:59,829 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:28:47,631 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:28:47,747 | INFO |  * Restarting with stat
-2025-12-09 13:28:48,478 | WARNING |  * Debugger is active!
-2025-12-09 13:28:48,480 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:28:51,150 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:28:51,151 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:28:51,153 | INFO |  * Restarting with stat
-2025-12-09 13:28:51,788 | WARNING |  * Debugger is active!
-2025-12-09 13:28:51,790 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:28:54,904 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:28:55,010 | INFO |  * Restarting with stat
-2025-12-09 13:28:55,608 | WARNING |  * Debugger is active!
-2025-12-09 13:28:55,610 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:28:56,644 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:28:56,752 | INFO |  * Restarting with stat
-2025-12-09 13:29:04,454 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:29:04,454 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:29:04,455 | INFO |  * Restarting with stat
-2025-12-09 13:29:05,096 | WARNING |  * Debugger is active!
-2025-12-09 13:29:05,098 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:30:01,657 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:30:01,657 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:30:01,658 | INFO |  * Restarting with stat
-2025-12-09 13:30:02,278 | WARNING |  * Debugger is active!
-2025-12-09 13:30:02,280 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:30:27,872 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:30:27,872 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:30:27,873 | INFO |  * Restarting with stat
-2025-12-09 13:30:28,474 | WARNING |  * Debugger is active!
-2025-12-09 13:30:28,476 | INFO |  * Debugger PIN: 105-645-384
-2025-12-09 13:33:22,709 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:33:22,709 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:33:22,710 | INFO |  * Restarting with stat
-2025-12-09 13:33:23,778 | WARNING |  * Debugger is active!
-2025-12-09 13:33:23,781 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:33:29,939 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\db_service.py', reloading
-2025-12-09 13:33:30,080 | INFO |  * Restarting with stat
-2025-12-09 13:33:44,462 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:33:44,462 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:33:44,464 | INFO |  * Restarting with stat
-2025-12-09 13:33:45,216 | WARNING |  * Debugger is active!
-2025-12-09 13:33:45,218 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:35:23,298 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:35:23,299 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:35:23,301 | INFO |  * Restarting with stat
-2025-12-09 13:35:24,098 | WARNING |  * Debugger is active!
-2025-12-09 13:35:24,100 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:38:25,991 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:38:26,126 | INFO |  * Restarting with stat
-2025-12-09 13:38:27,120 | WARNING |  * Debugger is active!
-2025-12-09 13:38:27,122 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:38:37,386 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
-2025-12-09 13:38:37,513 | INFO |  * Restarting with stat
-2025-12-09 13:38:38,297 | WARNING |  * Debugger is active!
-2025-12-09 13:38:38,300 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:38:45,485 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
-2025-12-09 13:38:45,605 | INFO |  * Restarting with stat
-2025-12-09 13:38:46,348 | WARNING |  * Debugger is active!
-2025-12-09 13:38:46,350 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:38:55,109 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:38:55,109 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:38:55,110 | INFO |  * Restarting with stat
-2025-12-09 13:38:55,959 | WARNING |  * Debugger is active!
-2025-12-09 13:38:55,961 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:39:27,813 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:39:27,937 | INFO |  * Restarting with stat
-2025-12-09 13:39:28,684 | WARNING |  * Debugger is active!
-2025-12-09 13:39:28,687 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:40:00,602 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
-2025-12-09 13:40:00,728 | INFO |  * Restarting with stat
-2025-12-09 13:40:01,428 | WARNING |  * Debugger is active!
-2025-12-09 13:40:01,430 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 13:40:21,531 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 13:40:21,531 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 13:40:21,533 | INFO |  * Restarting with stat
-2025-12-09 13:40:22,307 | WARNING |  * Debugger is active!
-2025-12-09 13:40:22,309 | INFO |  * Debugger PIN: 697-115-033
-2025-12-09 14:03:58,363 | INFO | [31m[1mWARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.[0m
- * Running on http://127.0.0.1:5001
-2025-12-09 14:03:58,363 | INFO | [33mPress CTRL+C to quit[0m
-2025-12-09 14:03:58,364 | INFO |  * Restarting with stat
-2025-12-09 14:03:59,038 | WARNING |  * Debugger is active!
-2025-12-09 14:03:59,041 | INFO |  * Debugger PIN: 697-115-033
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,5 @@ python-dotenv
 cryptography
 xlsxwriter
 matplotlib 
+flask_sqlalchemy
+flask_migrate
Author	SHA1	Message	Date
pjpatil12	163c7814ed	added Docker file and docker compose yml files	2026-02-21 15:00:05 +05:30
pjpatil12	5b557efd80	added new changes	2026-01-23 13:09:51 +05:30
pjpatil12	71ce8ca819	comaparison code optimization and cal sum/total mh dc and laying	2026-01-20 16:34:16 +05:30
pjpatil12	68a694d2c7	comaparison code optimization and cal sum/total mh dc and laying	2026-01-20 16:33:45 +05:30