client models and report commit

2025-12-13 18:50:27 +05:30
parent b11a974869
commit 89328c9066
21 changed files with 645 additions and 17 deletions
--- a/app/models/pycache/manhole_domestic_chamber_model.cpython-313.pyc
+++ b/app/models/pycache/manhole_domestic_chamber_model.cpython-313.pyc
--- a/app/models/pycache/mh_ex_client_model.cpython-313.pyc
+++ b/app/models/pycache/mh_ex_client_model.cpython-313.pyc
--- a/app/models/pycache/tr_ex_client_model.cpython-313.pyc
+++ b/app/models/pycache/tr_ex_client_model.cpython-313.pyc
--- a/app/models/pycache/trench_excavation_model.cpython-313.pyc
+++ b/app/models/pycache/trench_excavation_model.cpython-313.pyc
--- a/app/models/mh_dc_client_model.py
+++ b/app/models/mh_dc_client_model.py
@@ -0,0 +1,45 @@
+from app import db
+from datetime import datetime
+
+class ManholeDomesticChamberClient(db.Model):
+    __tablename__ = "mh_dc_client"
+
+    id = db.Column(db.Integer, primary_key=True)
+    #  Foreign Key to Subcontractor table
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    # Relationship for easy access (subcontractor.subcontractor_name)
+    subcontractor = db.relationship("Subcontractor", backref="mh_dc_records")
+
+    # Basic Fields
+    Location = db.Column(db.String(255))
+    Node_No = db.Column(db.String(100))
+    Depth_of_MH = db.Column(db.Float)
+ 
+    # Excavation categories 
+    d_0_to_0_75 = db.Column(db.Float)
+    d_1_06_to_1_65 = db.Column(db.Float)
+    d_1_06_to_1_65 = db.Column(db.Float)
+    d_1_66_to_2_15 = db.Column(db.Float)
+    d_2_16_to_2_65 = db.Column(db.Float)
+    d_2_66_to_3_15 = db.Column(db.Float)
+    d_3_16_to_3_65= db.Column(db.Float)
+    d_3_66_to_4_15 = db.Column(db.Float)
+    d_4_16_to_4_65 = db.Column(db.Float)
+    d_4_66_to_5_15 = db.Column(db.Float)
+    d_5_16_to_5_65 = db.Column(db.Float)
+
+    d_5_66_to_6_15 = db.Column(db.Float)
+    d_6_16_to_6_65 = db.Column(db.Float)
+    d_6_66_to_7_15 = db.Column(db.Float)
+    d_7_16_to_7_65 = db.Column(db.Float)
+    d_7_66_to_8_15 = db.Column(db.Float)
+    d_8_16_to_8_65 = db.Column(db.Float)
+    d_8_66_to_9_15 = db.Column(db.Float)
+    d_9_16_to_9_65 = db.Column(db.Float)
+
+    Domestic_Chambers = db.Column(db.Float)
+
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+
+    def __repr__(self):
+        return f"<HanholeDomesticChamberConstruction {self.Location}>"
--- a/app/models/mh_ex_client_model.py
+++ b/app/models/mh_ex_client_model.py
@@ -0,0 +1,66 @@
+from app import db
+from datetime import datetime
+
+class ManholeExcavationClient(db.Model):
+    __tablename__ = "mh_ex_client"
+
+    id = db.Column(db.Integer, primary_key=True)
+    #  Foreign Key to Subcontractor table
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    # Relationship for easy access (subcontractor.subcontractor_name)
+    subcontractor = db.relationship("Subcontractor", backref="mh_ex_records")
+
+    # Basic Fields
+    Location = db.Column(db.String(255))
+    MH_NO = db.Column(db.String(100))
+    GL_m = db.Column(db.Float)
+
+
+   
+    Upto_IL_Depth = db.Column(db.Float)
+    Cutting_Depth = db.Column(db.Float)
+    ID_of_MH_m = db.Column(db.Float)
+    Ex_Dia_of_Manhole = db.Column(db.Float)
+    Area_of_Manhole = db.Column(db.Float)
+   
+    # Excavation categories
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
+
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
+
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+
+    # Totals
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
+    Hard_Murum_1_5_and_above_total = db.Column(db.Float)
+
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
+    Soft_Rock_1_5_and_above_total = db.Column(db.Float)
+
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
+    Hard_Rock_1_5_and_above_total = db.Column(db.Float)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+
+    Remarks = db.Column(db.String(500))
+    Total = db.Column(db.Float)
+
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+
+    def __repr__(self):
+        return f"<HanholeExcavation {self.Location}>"
--- a/app/models/tr_ex_client_model.py
+++ b/app/models/tr_ex_client_model.py
@@ -0,0 +1,84 @@
+from app import db
+from datetime import datetime
+
+class TrenchExcavationClient(db.Model):
+    __tablename__ = "tr_ex_client"
+
+    id = db.Column(db.Integer, primary_key=True)
+    #  Foreign Key to Subcontractor table
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    # Relationship for easy access (subcontractor.subcontractor_name)
+    subcontractor = db.relationship("Subcontractor", backref="tr_ex_records")
+
+    # Basic Fields
+    Location = db.Column(db.String(255))
+    MH_NO = db.Column(db.String(100))
+    CC_length = db.Column(db.Float)
+    Actual_Trench_Length = db.Column(db.Float)
+    Ground_Level = db.Column(db.Float)
+    Invert_Level = db.Column(db.Float)
+    Excavated_level = db.Column(db.Float)
+    Cutting_Depth = db.Column(db.Float)
+    Avg_Depth = db.Column(db.Float)
+    Pipe_Dia_mm = db.Column(db.Float)
+ 
+    # width
+    Width_0_to_1_5 = db.Column(db.Float)
+    Width_1_5_to_3_0 = db.Column(db.Float)
+    Width_3_0_to_4_5 = db.Column(db.Float)
+    Width_4_5_to_6_0 = db.Column(db.Float)
+
+
+    # Excavation categories
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
+
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Float)
+
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
+    Soft_Rock_3_0_to_4_5 = db.Column(db.Float)
+
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+
+    # Totals
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float)
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
+
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float)
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float)
+
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float)
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float)
+
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+
+    Remarks = db.Column(db.String(500))
+    Total = db.Column(db.Float)
+
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+
+    def __repr__(self):
+        return f"<TrenchExcavation {self.Location}>"
--- a/app/models/trench_excavation_model.py
+++ b/app/models/trench_excavation_model.py
@@ -21,6 +21,7 @@ class TrenchExcavation(db.Model):
    Actual_Trench_Length = db.Column(db.Float)
    Pipe_Dia_mm = db.Column(db.Float)

+    # width
    Width_0_to_2_5 = db.Column(db.Float)
    Width_2_5_to_3_0 = db.Column(db.Float)
    Width_3_0_to_4_5 = db.Column(db.Float)