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

update code of dash and report of cont_client and devlp abstract of qty

Browse Source
This commit is contained in:
Pankaj J Patil
2026-07-30 14:38:37 +05:30
parent 12b2032430
commit bf1df3a817
42 changed files with 3066 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
app/models/trench_excavation_model.py
View File

@@ -2,6 +2,7 @@ from app import db
from datetime import datetime
from sqlalchemy import event
from app.utils.regex_utils import RegularExpression
from decimal import Decimal
class TrenchExcavation(db.Model):
__tablename__ = "trench_excavation"
@@ -13,65 +14,64 @@ class TrenchExcavation(db.Model):
subcontractor = db.relationship("Subcontractor", backref="trench_records")
# Basic Fields
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.Numeric(10, 4), default=0)
Invert_Level = db.Column(db.Numeric(10, 4), default=0)
MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
Ground_Level = db.Column(db.Numeric(10, 4), default=0)
ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
CC_length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Invert_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
MH_Top_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Ground_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Actual_Trench_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Pipe_Dia_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
# width
Width_0_to_2_5 = db.Column(db.Numeric(10, 4), 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.Numeric(10, 4), default=0)
Width_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
Width_0_to_2_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Width_2_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Width_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Width_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
Upto_IL_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Cutting_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Avg_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
# Excavation categories
Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), 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.Numeric(10, 4), default=0)
Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), 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.Numeric(10, 4), 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.Numeric(10, 4), default=0)
Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
# Totals
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.Numeric(10, 4), default=0)
Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
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.Numeric(10, 4), default=0)
Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
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.Numeric(10, 4), default=0)
Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
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.Numeric(10, 4), 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.Numeric(10, 4), default=0)
Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
Total = db.Column(db.Numeric(12, 4), default=0)
Remarks = db.Column(db.String(500))
RA_Bill_No=db.Column(db.String(500))
created_at = db.Column(db.DateTime, default=datetime.today)
Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
Remarks = db.Column(db.String(500), default="Import File")
created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
def __repr__(self):
@@ -83,12 +83,13 @@ class TrenchExcavation(db.Model):
# AUTO TOTAL USING REGEX
def calculate_trench_total(mapper, connection, target):
total = 0
total = Decimal("0.00")
for column in target.__table__.columns:
if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
total += getattr(target, column.name) or 0
target.Total = total
value = getattr(target, column.name)
if value is not None:
total += Decimal(value)
target.Total = total.quantize(Decimal("0.01"))
event.listen(TrenchExcavation, "before_insert", calculate_trench_total)
event.listen(TrenchExcavation, "before_update", calculate_trench_total)