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

comaparison code optimization and cal sum/total mh dc and laying

Browse Source
This commit is contained in:
pjpatil12
2026-01-20 16:33:45 +05:30
parent 90c18383da
commit 68a694d2c7
15 changed files with 286 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/laying_client_model.py
View File

@@ -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"
]

13
app/models/laying_model.py
View File

@@ -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"
]

11
app/models/manhole_domestic_chamber_model.py
View File

@@ -49,4 +49,15 @@ 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"]

11
app/models/mh_dc_client_model.py
View File

@@ -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" ]

31
app/models/trench_excavation_model.py
View File

@@ -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)
),
}