dabase column field type changes

app/config.py

@@ -1,6 +1,4 @@
 import os
-# project base url
-BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 
 class Config:
     # secret key
@@ -23,7 +21,4 @@ class Config:
     )
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    # uploads folder path
+   
-    UPLOAD_FOLDER = os.path.join(BASE_DIR, "static", "uploads")
-    # file extension
-    ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}

app/models/laying_client_model.py

@@ -11,33 +11,33 @@ class LayingClient(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
     # Bedding Qty.
-    Outer_dia_of_MH_m = db.Column(db.Float, default=0)
+    Outer_dia_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
-    Bedding_Length = db.Column(db.Float, default=0)
+    Bedding_Length = db.Column(db.Numeric(10, 4), default=0)
-    Width = db.Column(db.Float, default=0)
+    Width = db.Column(db.Numeric(10, 4), default=0)
-    Depth = db.Column(db.Float, default=0)
+    Depth = db.Column(db.Numeric(10, 4), default=0)
-    Qty = db.Column(db.Float, default=0)
+    Qty = db.Column(db.Numeric(10, 4), default=0)
  
     #  PIPE LAYING Qty. 
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
-    Laying_Length = db.Column(db.Float, default=0)
+    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
 
-    pipe_150_mm = db.Column(db.Float, default=0)
+    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_200_mm = db.Column(db.Float, default=0)
+    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_250_mm = db.Column(db.Float, default=0)
+    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_300_mm = db.Column(db.Float, default=0)
+    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_350_mm = db.Column(db.Float, default=0)
+    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_400_mm = db.Column(db.Float, default=0)
+    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_450_mm = db.Column(db.Float, default=0)
+    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_500_mm = db.Column(db.Float, default=0)
+    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_600_mm = db.Column(db.Float, default=0)
+    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_700_mm = db.Column(db.Float, default=0)
+    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_900_mm = db.Column(db.Float, default=0)
+    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_1200_mm = db.Column(db.Float, default=0)
+    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
     
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -57,7 +57,7 @@ def calculate_laying_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.PIPE_MM_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 event.listen(LayingClient, "before_insert", calculate_laying_total)
 event.listen(LayingClient, "before_update", calculate_laying_total)

app/models/laying_model.py

@@ -15,25 +15,25 @@ class Laying(db.Model):
     # Pipe Laying Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
-    Laying_Length = db.Column(db.Float, default=0)
+    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
 
-    pipe_150_mm = db.Column(db.Float, default=0)
+    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_200_mm = db.Column(db.Float, default=0)
+    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_250_mm = db.Column(db.Float, default=0)
+    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_300_mm = db.Column(db.Float, default=0)
+    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_350_mm = db.Column(db.Float, default=0)
+    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_400_mm = db.Column(db.Float, default=0)
+    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_450_mm = db.Column(db.Float, default=0)
+    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_500_mm = db.Column(db.Float, default=0)
+    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_600_mm = db.Column(db.Float, default=0)
+    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_700_mm = db.Column(db.Float, default=0)
+    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_900_mm = db.Column(db.Float, default=0)
+    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
-    pipe_1200_mm = db.Column(db.Float, default=0)
+    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
     
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -53,7 +53,7 @@ def calculate_laying_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.PIPE_MM_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 event.listen(Laying, "before_insert", calculate_laying_total)
 event.listen(Laying, "before_update", calculate_laying_total)

app/models/manhole_domestic_chamber_model.py

@@ -15,35 +15,35 @@ class ManholeDomesticChamber(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Depth_of_MH = db.Column(db.Float, default=0)
+    Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
  
     # Excavation categories 
-    d_0_to_0_75 = db.Column(db.Float, default=0)
+    d_0_to_0_75 = db.Column(db.Numeric(10, 4), default=0)
-    d_0_76_to_1_05 = db.Column(db.Float, default=0)
+    d_0_76_to_1_05 = db.Column(db.Numeric(10, 4), default=0)
-    d_1_06_to_1_65 = db.Column(db.Float, default=0)
+    d_1_06_to_1_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_1_66_to_2_15 = db.Column(db.Float, default=0)
+    d_1_66_to_2_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_2_16_to_2_65 = db.Column(db.Float, default=0)
+    d_2_16_to_2_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_2_66_to_3_15 = db.Column(db.Float, default=0)
+    d_2_66_to_3_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_3_16_to_3_65= db.Column(db.Float, default=0)
+    d_3_16_to_3_65= db.Column(db.Numeric(10, 4), default=0)
-    d_3_66_to_4_15 = db.Column(db.Float, default=0)
+    d_3_66_to_4_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_4_16_to_4_65 = db.Column(db.Float, default=0)
+    d_4_16_to_4_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_4_66_to_5_15 = db.Column(db.Float, default=0)
+    d_4_66_to_5_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_16_to_5_65 = db.Column(db.Float, default=0)
+    d_5_16_to_5_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_66_to_6_15 = db.Column(db.Float, default=0)
+    d_5_66_to_6_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_16_to_6_65 = db.Column(db.Float, default=0)
+    d_6_16_to_6_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_66_to_7_15 = db.Column(db.Float, default=0)
+    d_6_66_to_7_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_7_16_to_7_65 = db.Column(db.Float, default=0)
+    d_7_16_to_7_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_7_66_to_8_15 = db.Column(db.Float, default=0)
+    d_7_66_to_8_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_8_16_to_8_65 = db.Column(db.Float, default=0)
+    d_8_16_to_8_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_8_66_to_9_15 = db.Column(db.Float, default=0)
+    d_8_66_to_9_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_9_16_to_9_65 = db.Column(db.Float, default=0)
+    d_9_16_to_9_65 = db.Column(db.Numeric(10, 4), default=0)
 
-    Domestic_Chambers = db.Column(db.Float, default=0)
+    Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
-    DWC_Pipe_Length = db.Column(db.Float, default=0)
+    DWC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
-    UPVC_Pipe_Length = db.Column(db.Float, default=0)
+    UPVC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
     RA_Bill_No=db.Column(db.String(500))
 
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -59,7 +59,7 @@ def calculate_mh_dc_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.D_RANGE_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 event.listen(ManholeDomesticChamber, "before_insert", calculate_mh_dc_total)
 event.listen(ManholeDomesticChamber, "before_update", calculate_mh_dc_total)

app/models/manhole_excavation_model.py

@@ -16,47 +16,47 @@ class ManholeExcavation(db.Model):
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
    
-    Upto_IL_Depth = db.Column(db.Float, default=0)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
-    Ex_Dia_of_Manhole = db.Column(db.Float, default=0)
+    Ex_Dia_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
-    Area_of_Manhole = db.Column(db.Float, default=0)
+    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
    
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
 
@@ -74,7 +74,7 @@ def calculate_Manhole_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 
 event.listen(ManholeExcavation, "before_insert", calculate_Manhole_total)

app/models/mh_dc_client_model.py

@@ -12,26 +12,26 @@ class ManholeDomesticChamberClient(db.Model):
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    MH_TOP_LEVEL = db.Column(db.Float, default=0)
+    MH_TOP_LEVEL = db.Column(db.Numeric(10, 4), default=0)
-    MH_IL_LEVEL = db.Column(db.Float, default=0)
+    MH_IL_LEVEL = db.Column(db.Numeric(10, 4), default=0)
-    Depth_of_MH = db.Column(db.Float, default=0)
+    Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
    
     # Excavation categories 
-    d_0_to_1_5 = db.Column(db.Float, default=0)
+    d_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_1_5_to_2_0 = db.Column(db.Float, default=0)
+    d_1_5_to_2_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_2_0_to_2_5 = db.Column(db.Float, default=0)
+    d_2_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_2_5_to_3_0 = db.Column(db.Float, default=0)
+    d_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_3_0_to_3_5 = db.Column(db.Float, default=0)
+    d_3_0_to_3_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_3_5_to_4_0 = db.Column(db.Float, default=0)
+    d_3_5_to_4_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_4_0_to_4_5= db.Column(db.Float, default=0)
+    d_4_0_to_4_5= db.Column(db.Numeric(10, 4), default=0)
-    d_4_5_to_5_0 = db.Column(db.Float, default=0)
+    d_4_5_to_5_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_0_to_5_5 = db.Column(db.Float, default=0)
+    d_5_0_to_5_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_5_to_6_0 = db.Column(db.Float, default=0)
+    d_5_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_0_to_6_5 = db.Column(db.Float, default=0)
+    d_6_0_to_6_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Domestic_Chambers = db.Column(db.Float, default=0)
+    Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -48,7 +48,7 @@ def calculate_mh_dc_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.D_RANGE_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 
 event.listen(ManholeDomesticChamberClient, "before_insert", calculate_mh_dc_total)

app/models/mh_ex_client_model.py

@@ -12,65 +12,65 @@ class ManholeExcavationClient(db.Model):
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Ground_Level = db.Column(db.Float, default=0)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
-    MH_Invert_Level = db.Column(db.Float, default=0)
+    MH_Invert_Level = db.Column(db.Numeric(10, 4), default=0)
-    MH_Top_Level = db.Column(db.Float, default=0)
+    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
-    Ex_Level = db.Column(db.Float, default=0)
+    Ex_Level = db.Column(db.Numeric(10, 4), default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
-    MH_Depth = db.Column(db.Float, default=0)
+    MH_Depth = db.Column(db.Numeric(10, 4), default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
 
-    Dia_of_MH_Cutting = db.Column(db.Float, default=0)
+    Dia_of_MH_Cutting = db.Column(db.Numeric(10, 4), default=0)
-    Area_of_Manhole = db.Column(db.Float, default=0)
+    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
    
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
     Remarks = db.Column(db.String(500))
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
 
     created_at = db.Column(db.DateTime, default=datetime.today)
 
@@ -87,7 +87,7 @@ def calculate_Manhole_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 
 event.listen(ManholeExcavationClient, "before_insert", calculate_Manhole_total)

app/models/tr_ex_client_model.py

@@ -12,69 +12,69 @@ class TrenchExcavationClient(db.Model):
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
-    Actual_Trench_Length = db.Column(db.Float, default=0)
+    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
-    Ground_Level = db.Column(db.Float, default=0)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
-    Invert_Level = db.Column(db.Float, default=0)
+    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
-    Excavated_level = db.Column(db.Float, default=0)
+    Excavated_level = db.Column(db.Numeric(10, 4), default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
-    Avg_Depth = db.Column(db.Float, default=0)
+    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
  
     # width
-    Width_0_to_1_5_m = db.Column(db.Float, default=0)
+    Width_0_to_1_5_m = db.Column(db.Numeric(10, 4), default=0)
-    Width_1_5_to_3_0_m = db.Column(db.Float, default=0)
+    Width_1_5_to_3_0_m = db.Column(db.Numeric(10, 4), default=0)
-    Width_3_0_to_4_5_m = db.Column(db.Float, default=0)
+    Width_3_0_to_4_5_m = db.Column(db.Numeric(10, 4), default=0)
-    Width_4_5_to_6_0_m = db.Column(db.Float, default=0)
+    Width_4_5_to_6_0_m = db.Column(db.Numeric(10, 4), default=0)
-    Width_6_0_to_7_5_m = db.Column(db.Float, default=0)
+    Width_6_0_to_7_5_m = db.Column(db.Numeric(10, 4), default=0)
 
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
 
     created_at = db.Column(db.DateTime, default=datetime.today)
@@ -92,7 +92,7 @@ def calculate_trench_client_total(mapper, connection, target):
     for column in target.__table__.columns:
         if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
             total += getattr(target, column.name) or 0
-    target.Total = total
+    target.Total = round(total)
 
 event.listen(TrenchExcavationClient, "before_insert", calculate_trench_client_total)
 event.listen(TrenchExcavationClient, "before_update", calculate_trench_client_total)

app/models/trench_excavation_model.py

@@ -15,59 +15,59 @@ class TrenchExcavation(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
-    Invert_Level = db.Column(db.Float, default=0)
+    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
-    MH_Top_Level = db.Column(db.Float, default=0)
+    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
-    Ground_Level = db.Column(db.Float, default=0)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
-    Actual_Trench_Length = db.Column(db.Float, default=0)
+    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
 
     # width
-    Width_0_to_2_5 = db.Column(db.Float, default=0)
+    Width_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
-    Width_2_5_to_3_0 = db.Column(db.Float, default=0)
+    Width_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Width_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Width_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
-    Width_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Width_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Upto_IL_Depth = db.Column(db.Float, default=0)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
-    Avg_Depth = db.Column(db.Float, default=0)
+    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
 
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
+    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
+    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float, default=0)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     

app/routes/dashboard.py

@@ -76,39 +76,169 @@ def subcontractor_dashboard():
         subcontractors=subcontractors
     )
 
-
+# ✅ API: Get Unique RA Bills
-# API FOR CHART DATA
+@dashboard_bp.route("/api/get-ra-bills")
-@dashboard_bp.route("/api/subcontractor-chart")
+def get_ra_bills():
-def subcontractor_chart():
 
     subcontractor_id = request.args.get("subcontractor")
     category = request.args.get("category")
+
+    if not subcontractor_id or not category:
+        return {"ra_bills": []}
+
+    match category:
+
+        case "trench_excavation":
+            results = db.session.query(
+                TrenchExcavation.RA_Bill_No
+            ).filter(
+                TrenchExcavation.subcontractor_id == subcontractor_id
+            ).distinct().order_by(TrenchExcavation.RA_Bill_No).all()
+
+        # (Add others same pattern later)
+        case _:
+            results = []
+
+    ra_bills = [r[0] for r in results if r[0]]
+
+    return {"ra_bills": ra_bills}
+
+
+# API FOR CHART DATA
+# @dashboard_bp.route("/api/subcontractor-chart")
+# def subcontractor_chart():
+
+#     subcontractor_id = request.args.get("subcontractor")
+#     category = request.args.get("category")
+#     ra_bill = request.args.get("ra_bill")
+
+#     labels = []
+#     values = []
+
+#     match category:
+
+#         # ✅ Trench
+#         case "trench_excavation":
+#             query = db.session.query(
+#                 TrenchExcavation.excavation_category,
+#                 func.sum(TrenchExcavation.Total)
+#             )
+
+#             if subcontractor_id:
+#                 query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
+
+#             if ra_bill:
+#                 query = query.filter(TrenchExcavation.RA_Bill_No == ra_bill)
+
+#             results = query.group_by(TrenchExcavation.excavation_category).all()
+
+#         # ✅ Manhole
+#         case "manhole_excavation":
+#             query = db.session.query(
+#                 ManholeExcavation.excavation_category,
+#                 func.sum(ManholeExcavation.Total)
+#             )
+
+#             if subcontractor_id:
+#                 query = query.filter(ManholeExcavation.subcontractor_id == subcontractor_id)
+
+#             if ra_bill:
+#                 query = query.filter(ManholeExcavation.RA_Bill_No == ra_bill)
+
+#             results = query.group_by(ManholeExcavation.excavation_category).all()
+
+#         case _:
+#             results = []
+
+#     for r in results:
+#         labels.append(r[0])
+#         values.append(float(r[1] or 0))
+
+#     return jsonify({
+#         "labels": labels,
+#         "values": values
+#     })
+
+
+@dashboard_bp.route("/api/trench-analysis")
+def trench_analysis():
+
+    subcontractor_id = request.args.get("subcontractor")
     ra_bill = request.args.get("ra_bill")
 
-    query = db.session.query(
+    query = TrenchExcavation.query
-        TrenchExcavation.excavation_category,
-        func.sum(TrenchExcavation.Total)
-    )
 
     if subcontractor_id:
         query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
 
-    if category:
-        query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
-
     if ra_bill:
         query = query.filter(TrenchExcavation.RA_Bill_No == ra_bill)
 
-    results = query.group_by(TrenchExcavation.excavation_category).all()
+    data = query.all()
 
-    labels = []
+    result = {
-    values = []
+        "Soft Murum": {"depth": 0, "qty": 0},
+        "Hard Murum": {"depth": 0, "qty": 0},
+        "Soft Rock": {"depth": 0, "qty": 0},
+        "Hard Rock": {"depth": 0, "qty": 0},
+    }
 
-    for r in results:
+    for r in data:
-        labels.append(r[0])
+
-        values.append(float(r[1] or 0))
+        # Soft Murum
+        result["Soft Murum"]["depth"] += (
+            (r.Soft_Murum_0_to_1_5 or 0) +
+            (r.Soft_Murum_1_5_to_3_0 or 0) +
+            (r.Soft_Murum_3_0_to_4_5 or 0)
+        )
+        result["Soft Murum"]["qty"] += (
+            (r.Soft_Murum_0_to_1_5_total or 0) +
+            (r.Soft_Murum_1_5_to_3_0_total or 0) +
+            (r.Soft_Murum_3_0_to_4_5_total or 0)
+        )
+
+        # Hard Murum
+        result["Hard Murum"]["depth"] += (
+            (r.Hard_Murum_0_to_1_5 or 0) +
+            (r.Hard_Murum_1_5_to_3_0 or 0)
+        )
+        result["Hard Murum"]["qty"] += (
+            (r.Hard_Murum_0_to_1_5_total or 0) +
+            (r.Hard_Murum_1_5_and_above_total or 0)
+        )
+
+        # Soft Rock
+        result["Soft Rock"]["depth"] += (
+            (r.Soft_Rock_0_to_1_5 or 0) +
+            (r.Soft_Rock_1_5_to_3_0 or 0)
+        )
+        result["Soft Rock"]["qty"] += (
+            (r.Soft_Rock_0_to_1_5_total or 0) +
+            (r.Soft_Rock_1_5_and_above_total or 0)
+        )
+
+        # Hard Rock
+        result["Hard Rock"]["depth"] += (
+            (r.Hard_Rock_0_to_1_5 or 0) +
+            (r.Hard_Rock_1_5_to_3_0 or 0) +
+            (r.Hard_Rock_3_0_to_4_5 or 0) +
+            (r.Hard_Rock_4_5_to_6_0 or 0) +
+            (r.Hard_Rock_6_0_to_7_5 or 0)
+        )
+        result["Hard Rock"]["qty"] += (
+            (r.Hard_Rock_0_to_1_5_total or 0) +
+            (r.Hard_Rock_1_5_to_3_0_total or 0) +
+            (r.Hard_Rock_3_0_to_4_5_total or 0) +
+            (r.Hard_Rock_4_5_to_6_0_total or 0) +
+            (r.Hard_Rock_6_0_to_7_5_total or 0)
+        )
+
+    labels = list(result.keys())
+    depth = [result[k]["depth"] for k in labels]
+    qty = [result[k]["qty"] for k in labels]
 
     return jsonify({
         "labels": labels,
-        "values": values
+        "depth": depth,
+        "qty": qty
     })

app/routes/file_report.py

@@ -145,73 +145,61 @@ def report_file():
 # --- CLIENT REPORT (PREVIEW + DOWNLOAD) ---
 @file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
-def client_vs_all_subcontractor():
+def client_report():
-    tables = {"tr": None, "mh": None, "dc": None}
+
+    tables = {"tr": None, "mh": None, "dc": None, "laying": None}
     ra_val = ""
 
     if request.method == "POST":
 
         # ⚠ MUST match HTML name
         RA_Bill_No = request.form.get("RA_Bill_No")
+        action = request.form.get("action")
         ra_val = RA_Bill_No
 
         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)
- 
-        clientBill = ClientBill()
-        clientBill.Fetch(RA_Bill_No=RA_Bill_No)
-        contractorBill = SubcontractorBill()
-        contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
- 
-        # --- 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)
- 
-        qty_cols = [...] # (Keep your existing list)
-        mh_dc_qty_cols = [...] # (Keep your existing list)
-        mh_lay_qty_cols =[...]
-
-        def aggregate_df(df, group_cols, sum_cols):
-            if df.empty:
-                # Create an empty DF with the correct columns to avoid Merge/Key Errors
-                return pd.DataFrame(columns=group_cols + sum_cols)
-            existing_cols = [c for c in sum_cols if c in df.columns]
-            # Ensure group_cols exist in the DF
-            for col in group_cols:
-                if col not in df.columns:
-                    df[col] = "N/A" # Fill missing join keys
-            return df.groupby(group_cols, as_index=False)[existing_cols].sum()
- 
-        # Aggregate data
-        df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["Location", "MH_NO"], qty_cols)
-        df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
-        df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_dc_qty_cols)
-        df_sub_lay_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_lay_qty_cols)
- 
-        # --- FINAL MERGE LOGIC ---
-        # We check if "Location" exists in the client data. If not, we add it to prevent the KeyError.
-        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying ]:
-            if not df_client.empty and "Location" not in df_client.columns:
-                df_client["Location"] = "Unknown"
- 
-        try:
-            df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-            df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-            df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-        except KeyError as e:
-            flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
             return render_template("client_report.html", tables=tables, ra_val=ra_val)
- 
+
-       
+        # -------- FETCH CLIENT DATA --------
-        # Convert to HTML for preview
+        bill_gen = ClientBill()
-        tables["tr"] = df_tr_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        bill_gen.Fetch(RA_Bill_No)
-        tables["mh"] = df_mh_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+
-        tables["dc"] = df_dc_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        # If no data
-        tables["laying"] = df_lay_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        if (
- 
+            bill_gen.df_tr.empty and
-   
+            bill_gen.df_mh.empty and
-    return render_template("client_report.html", tables=tables, ra_val=ra_val)   
+            bill_gen.df_dc.empty and
- 
+            bill_gen.df_laying.empty
+        ):
+            flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+
+        # -------- DOWNLOAD --------
+        if action == "download":
+
+            output = io.BytesIO()
+
+            with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+                bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Trench")
+                bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH")
+                bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
+                bill_gen.df_laying.to_excel(writer, index=False, sheet_name="Laying")
+
+            output.seek(0)
+
+            return send_file(
+                output,
+                download_name=f"Client_RA_{RA_Bill_No}_Report.xlsx",
+                as_attachment=True
+            )
+
+        # -------- PREVIEW --------
+        table_class = "table table-bordered table-striped table-hover table-sm"
+
+        tables["tr"] = bill_gen.df_tr.to_html(classes=table_class, index=False)
+        tables["mh"] = bill_gen.df_mh.to_html(classes=table_class, index=False)
+        tables["dc"] = bill_gen.df_dc.to_html(classes=table_class, index=False)
+        tables["laying"] = bill_gen.df_laying.to_html(classes=table_class, index=False)
+
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)

app/services/file_service.py

@@ -1,10 +1,10 @@
+from app import db
 import os
 import pandas as pd
 from werkzeug.utils import secure_filename
 from app.utils.file_utils import ensure_upload_folder
-
+from app.utils.file_utils import get_uploads_folder
-from app.config import Config
+from app.utils.file_utils import ALLOWED_EXTENSIONS
-from app import db
 
 # Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
@@ -24,7 +24,7 @@ class FileService:
 
     # ---------------- COMMON HELPERS ----------------
     def allowed_file(self, filename):
-        return ("." in filename and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS)
+        return ("." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_EXTENSIONS)
 
     def normalize(self, val):
         if val is None or pd.isna(val):
@@ -52,8 +52,9 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
+        path = get_uploads_folder()
 
-        folder = os.path.join(Config.UPLOAD_FOLDER, f"sub_{subcontractor_id}")
+        folder = os.path.join(path, f"sub_{subcontractor_id}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)
@@ -310,7 +311,6 @@ class FileService:
         db.session.commit()
 
 
-
     # ---------------- CLIENT FILE UPLOAD ----------------
     def handle_client_file_upload(self, file, RA_Bill_No):
 
@@ -324,8 +324,9 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
+        path = get_uploads_folder()
 
-        folder = os.path.join(Config.UPLOAD_FOLDER, f"Client_Bill_{RA_Bill_No}")
+        folder = os.path.join(path, f"Client_Bill_{RA_Bill_No}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)

app/templates/client_report.html

@@ -29,25 +29,20 @@
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
                 <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
-                    type="button">Tr.Ex </button>
+                    type="button">Tr.Ex Comparison</button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
-                    </button>
+                    Comparison</button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
-                    </button>
+                    Comparison</button>
             </li>
             <li class="nav-item">
-<<<<<<< HEAD
                 <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
                     type="button">Laying
                     & Bedding Comparison</button>
-=======
-                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
-                    & Bedding </button>
->>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">

app/templates/subcontractor_dashboard.html

@@ -1,33 +1,31 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="container-fluid mt-3">
+<div class="container mt-3">
 
-    <h4 class="mb-4">Subcontractor Dashboard</h4>
+    <h4>RA Bill Dashboard</h4>
 
     <div class="row mb-3">
 
+        <!-- Contractor -->
         <div class="col-md-4">
             <select id="subcontractor" class="form-control">
-                <option value="">Select Subcontractor</option>
+                <option value="">Select Contractor</option>
-
                 {% for s in subcontractors %}
                 <option value="{{s.id}}">{{s.subcontractor_name}}</option>
                 {% endfor %}
-
             </select>
         </div>
 
+        <!-- Category -->
         <div class="col-md-4">
             <select id="category" class="form-control">
                 <option value="">Select Category</option>
-                <option value="Soft Murum">Soft Murum</option>
+                <option value="trench_excavation">Trench Excavation</option>
-                <option value="Hard Murum">Hard Murum</option>
-                <option value="Soft Rock">Soft Rock</option>
-                <option value="Hard Rock">Hard Rock</option>
             </select>
         </div>
 
+        <!-- RA Bill -->
         <div class="col-md-4">
             <select id="ra_bill" class="form-control">
                 <option value="">RA Bill</option>
@@ -36,69 +34,84 @@
 
     </div>
 
-
+    <div class="card">
-    <div class="card shadow">
         <div class="card-body">
-
+            <canvas id="comparisonChart"></canvas>
-            <canvas id="comparisonChart" height="120"></canvas>
-
         </div>
     </div>
 
 </div>
 
-
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
 <script>
 
     let chart;
 
-    function loadChart() {
+    // ✅ Load RA Bills
+    function loadRABills() {
 
         let subcontractor = document.getElementById("subcontractor").value
         let category = document.getElementById("category").value
-        let ra_bill = document.getElementById("ra_bill").value
 
+        if (!subcontractor || !category) return
 
-        fetch(`/dashboard/api/subcontractor-chart?subcontractor=${subcontractor}&category=${category}&ra_bill=${ra_bill}`)
+        fetch(`/dashboard/api/get-ra-bills?subcontractor=${subcontractor}&category=${category}`)
-
             .then(res => res.json())
             .then(data => {
 
-                if (chart) {
+                let ra = document.getElementById("ra_bill")
-                    chart.destroy()
+                ra.innerHTML = '<option value="">RA Bill</option>'
-                }
 
-                const ctx = document.getElementById("comparisonChart")
+                data.ra_bills.forEach(bill => {
+                    ra.innerHTML += `<option value="${bill}">${bill}</option>`
+                })
+            })
+    }
 
-                chart = new Chart(ctx, {
+    // ✅ Load Chart
+    function loadChart() {
+
+        let subcontractor = document.getElementById("subcontractor").value
+        let ra_bill = document.getElementById("ra_bill").value
+
+        fetch(`/dashboard/api/trench-analysis?subcontractor=${subcontractor}&ra_bill=${ra_bill}`)
+            .then(res => res.json())
+            .then(data => {
+
+                if (chart) chart.destroy()
+
+                chart = new Chart(document.getElementById("comparisonChart"), {
                     type: "bar",
                     data: {
                         labels: data.labels,
-                        datasets: [{
+                        datasets: [
-                            label: "Subcontractor Quantity",
+                            {
-                            data: data.values,
+                                label: "Depth",
-                            backgroundColor: "#0d6efd"
+                                data: data.depth,
-                        }]
+                                backgroundColor: "green"
-                    },
+                            },
-                    options: {
+                            {
-                        responsive: true,
+                                label: "Excavation Qty (cum)",
-                        plugins: {
+                                data: data.qty,
-                            legend: { display: true }
+                                backgroundColor: "blue"
-                        }
+                            }
+                        ]
                     }
                 })
-
             })
-
     }
 
-    document.getElementById("subcontractor").addEventListener("change", loadChart)
+    // Events
-    document.getElementById("category").addEventListener("change", loadChart)
+    document.getElementById("subcontractor").addEventListener("change", () => {
-    document.getElementById("ra_bill").addEventListener("change", loadChart)
+        loadRABills()
+    })
 
-    loadChart()
+    document.getElementById("category").addEventListener("change", () => {
+        loadRABills()
+    })
+
+    document.getElementById("ra_bill").addEventListener("change", loadChart)
 
 </script>
 

app/utils/file_utils.py

@@ -1,6 +1,9 @@
 import os
 from flask import current_app
-from app.config import Config
+
+
+# file extension
+ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}
 
 
 def get_download_format_folder():
@@ -11,6 +14,13 @@ def get_download_format_folder():
         "format"
     )
 
+def get_uploads_folder():
+    return os.path.join(
+        current_app.root_path,
+        "static",
+        "uploads"
+    )
+
 def ensure_upload_folder():
-    if not os.path.exists(Config.UPLOAD_FOLDER):
+    if not os.path.exists(get_uploads_folder()):
-        os.makedirs(Config.UPLOAD_FOLDER)
+        os.makedirs(get_uploads_folder())