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

Merge pull request 'dataase field updateds and model updateds' (#12) from pankaj-dev into main

Browse Source 
Reviewed-on: #12
This commit was merged in pull request #12.
This commit is contained in:
Pankaj J Patil
2026-03-11 08:04:07 +00:00
parent bb56f00a6c c5b3e7bd60
commit 310ab40bf9
17 changed files with 391 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/models/laying_client_model.py
View File

@@ -13,33 +13,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)
CC_length = db.Column(db.Float, default=0)
# 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)
Outer_dia_of_MH_m = db.Column(db.Float, default=0)
Bedding_Length = db.Column(db.Float, default=0)
Width = db.Column(db.Float, default=0)
Depth = db.Column(db.Float, default=0)
Qty = db.Column(db.Float, default=0)
# PIPE LAYING Qty.
Pipe_Dia_mm = db.Column(db.Float)
ID_of_MH_m = db.Column(db.Float)
Laying_Length = db.Column(db.Float)
Pipe_Dia_mm = db.Column(db.Float, default=0)
ID_of_MH_m = db.Column(db.Float, default=0)
Laying_Length = db.Column(db.Float, default=0)
pipe_150_mm = db.Column(db.Float)
pipe_200_mm = db.Column(db.Float)
pipe_250_mm = db.Column(db.Float)
pipe_300_mm = db.Column(db.Float)
pipe_350_mm = db.Column(db.Float)
pipe_400_mm = db.Column(db.Float)
pipe_450_mm = db.Column(db.Float)
pipe_500_mm = db.Column(db.Float)
pipe_600_mm = db.Column(db.Float)
pipe_700_mm = db.Column(db.Float)
pipe_900_mm = db.Column(db.Float)
pipe_1200_mm = db.Column(db.Float)
pipe_150_mm = db.Column(db.Float, default=0)
pipe_200_mm = db.Column(db.Float, default=0)
pipe_250_mm = db.Column(db.Float, default=0)
pipe_300_mm = db.Column(db.Float, default=0)
pipe_350_mm = db.Column(db.Float, default=0)
pipe_400_mm = db.Column(db.Float, default=0)
pipe_450_mm = db.Column(db.Float, default=0)
pipe_500_mm = db.Column(db.Float, default=0)
pipe_600_mm = db.Column(db.Float, default=0)
pipe_700_mm = db.Column(db.Float, default=0)
pipe_900_mm = db.Column(db.Float, default=0)
pipe_1200_mm = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
RA_Bill_No=db.Column(db.String(500))

34
app/models/laying_model.py
View File

@@ -17,25 +17,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)
Pipe_Dia_mm = db.Column(db.Float)
ID_of_MH_m = db.Column(db.Float)
Laying_Length = db.Column(db.Float)
CC_length = db.Column(db.Float, default=0)
Pipe_Dia_mm = db.Column(db.Float, default=0)
ID_of_MH_m = db.Column(db.Float, default=0)
Laying_Length = db.Column(db.Float, default=0)
pipe_150_mm = db.Column(db.Float)
pipe_200_mm = db.Column(db.Float)
pipe_250_mm = db.Column(db.Float)
pipe_300_mm = db.Column(db.Float)
pipe_350_mm = db.Column(db.Float)
pipe_400_mm = db.Column(db.Float)
pipe_450_mm = db.Column(db.Float)
pipe_500_mm = db.Column(db.Float)
pipe_600_mm = db.Column(db.Float)
pipe_700_mm = db.Column(db.Float)
pipe_900_mm = db.Column(db.Float)
pipe_1200_mm = db.Column(db.Float)
pipe_150_mm = db.Column(db.Float, default=0)
pipe_200_mm = db.Column(db.Float, default=0)
pipe_250_mm = db.Column(db.Float, default=0)
pipe_300_mm = db.Column(db.Float, default=0)
pipe_350_mm = db.Column(db.Float, default=0)
pipe_400_mm = db.Column(db.Float, default=0)
pipe_450_mm = db.Column(db.Float, default=0)
pipe_500_mm = db.Column(db.Float, default=0)
pipe_600_mm = db.Column(db.Float, default=0)
pipe_700_mm = db.Column(db.Float, default=0)
pipe_900_mm = db.Column(db.Float, default=0)
pipe_1200_mm = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
RA_Bill_No=db.Column(db.String(500))

48
app/models/manhole_domestic_chamber_model.py
View File

@@ -18,35 +18,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)
Depth_of_MH = db.Column(db.Float, default=0)
# Excavation categories
d_0_to_0_75 = db.Column(db.Float)
d_0_76_to_1_05 = 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)
d_0_to_0_75 = db.Column(db.Float, default=0)
d_0_76_to_1_05 = db.Column(db.Float, default=0)
d_1_06_to_1_65 = db.Column(db.Float, default=0)
d_1_66_to_2_15 = db.Column(db.Float, default=0)
d_2_16_to_2_65 = db.Column(db.Float, default=0)
d_2_66_to_3_15 = db.Column(db.Float, default=0)
d_3_16_to_3_65= db.Column(db.Float, default=0)
d_3_66_to_4_15 = db.Column(db.Float, default=0)
d_4_16_to_4_65 = db.Column(db.Float, default=0)
d_4_66_to_5_15 = db.Column(db.Float, default=0)
d_5_16_to_5_65 = db.Column(db.Float, default=0)
d_5_66_to_6_15 = db.Column(db.Float, default=0)
d_6_16_to_6_65 = db.Column(db.Float, default=0)
d_6_66_to_7_15 = db.Column(db.Float, default=0)
d_7_16_to_7_65 = db.Column(db.Float, default=0)
d_7_66_to_8_15 = db.Column(db.Float, default=0)
d_8_16_to_8_65 = db.Column(db.Float, default=0)
d_8_66_to_9_15 = db.Column(db.Float, default=0)
d_9_16_to_9_65 = db.Column(db.Float, default=0)
Domestic_Chambers = db.Column(db.Float)
DWC_Pipe_Length = db.Column(db.Float)
UPVC_Pipe_Length = db.Column(db.Float)
Domestic_Chambers = db.Column(db.Float, default=0)
DWC_Pipe_Length = db.Column(db.Float, default=0)
UPVC_Pipe_Length = db.Column(db.Float, default=0)
RA_Bill_No=db.Column(db.String(500))
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
created_at = db.Column(db.DateTime, default=datetime.today)
def __repr__(self):

60
app/models/manhole_excavation_model.py
View File

@@ -15,47 +15,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)
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)
Upto_IL_Depth = db.Column(db.Float, default=0)
Cutting_Depth = db.Column(db.Float, default=0)
ID_of_MH_m = db.Column(db.Float, default=0)
Ex_Dia_of_Manhole = db.Column(db.Float, default=0)
Area_of_Manhole = db.Column(db.Float, default=0)
# 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)
Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Murum_0_to_1_5 = db.Column(db.Float)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Rock_0_to_1_5 = db.Column(db.Float)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
# 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)
Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Murum_0_to_1_5_total = db.Column(db.Float)
Hard_Murum_1_5_and_above_total = db.Column(db.Float)
Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
Soft_Rock_0_to_1_5_total = db.Column(db.Float)
Soft_Rock_1_5_and_above_total = db.Column(db.Float)
Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
RA_Bill_No=db.Column(db.String(500))

32
app/models/mh_dc_client_model.py
View File

@@ -19,27 +19,27 @@ 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)
MH_IL_LEVEL = db.Column(db.Float)
Depth_of_MH = db.Column(db.Float)
MH_TOP_LEVEL = db.Column(db.Float, default=0)
MH_IL_LEVEL = db.Column(db.Float, default=0)
Depth_of_MH = db.Column(db.Float, default=0)
# Excavation categories
d_0_to_1_5 = db.Column(db.Float)
d_1_5_to_2_0 = db.Column(db.Float)
d_2_0_to_2_5 = db.Column(db.Float)
d_2_5_to_3_0 = db.Column(db.Float)
d_3_0_to_3_5 = db.Column(db.Float)
d_3_5_to_4_0 = db.Column(db.Float)
d_4_0_to_4_5= db.Column(db.Float)
d_4_5_to_5_0 = db.Column(db.Float)
d_5_0_to_5_5 = db.Column(db.Float)
d_5_5_to_6_0 = db.Column(db.Float)
d_6_0_to_6_5 = db.Column(db.Float)
d_0_to_1_5 = db.Column(db.Float, default=0)
d_1_5_to_2_0 = db.Column(db.Float, default=0)
d_2_0_to_2_5 = db.Column(db.Float, default=0)
d_2_5_to_3_0 = db.Column(db.Float, default=0)
d_3_0_to_3_5 = db.Column(db.Float, default=0)
d_3_5_to_4_0 = db.Column(db.Float, default=0)
d_4_0_to_4_5= db.Column(db.Float, default=0)
d_4_5_to_5_0 = db.Column(db.Float, default=0)
d_5_0_to_5_5 = db.Column(db.Float, default=0)
d_5_5_to_6_0 = db.Column(db.Float, default=0)
d_6_0_to_6_5 = db.Column(db.Float, default=0)
Domestic_Chambers = db.Column(db.Float)
Domestic_Chambers = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
created_at = db.Column(db.DateTime, default=datetime.today)
def __repr__(self):

88
app/models/mh_ex_client_model.py
View File

@@ -15,65 +15,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)
MH_Invert_Level = db.Column(db.Float)
MH_Top_Level = db.Column(db.Float)
Ex_Level = db.Column(db.Float)
Cutting_Depth = db.Column(db.Float)
MH_Depth = db.Column(db.Float)
ID_of_MH_m = db.Column(db.Float)
Ground_Level = db.Column(db.Float, default=0)
MH_Invert_Level = db.Column(db.Float, default=0)
MH_Top_Level = db.Column(db.Float, default=0)
Ex_Level = db.Column(db.Float, default=0)
Cutting_Depth = db.Column(db.Float, default=0)
MH_Depth = db.Column(db.Float, default=0)
ID_of_MH_m = db.Column(db.Float, default=0)
Dia_of_MH_Cutting = db.Column(db.Float)
Area_of_Manhole = db.Column(db.Float)
Dia_of_MH_Cutting = db.Column(db.Float, default=0)
Area_of_Manhole = db.Column(db.Float, default=0)
# 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)
Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
Soft_Rock_0_to_1_5 = db.Column(db.Float)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
# 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)
Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
created_at = db.Column(db.DateTime, default=datetime.today)

96
app/models/tr_ex_client_model.py
View File

@@ -11,69 +11,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)
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)
CC_length = db.Column(db.Float, default=0)
Actual_Trench_Length = db.Column(db.Float, default=0)
Ground_Level = db.Column(db.Float, default=0)
Invert_Level = db.Column(db.Float, default=0)
Excavated_level = db.Column(db.Float, default=0)
Cutting_Depth = db.Column(db.Float, default=0)
Avg_Depth = db.Column(db.Float, default=0)
Pipe_Dia_mm = db.Column(db.Float, default=0)
# width
Width_0_to_1_5_m = db.Column(db.Float)
Width_1_5_to_3_0_m = db.Column(db.Float)
Width_3_0_to_4_5_m = db.Column(db.Float)
Width_4_5_to_6_0_m = db.Column(db.Float)
Width_6_0_to_7_5_m = db.Column(db.Float)
Width_0_to_1_5_m = db.Column(db.Float, default=0)
Width_1_5_to_3_0_m = db.Column(db.Float, default=0)
Width_3_0_to_4_5_m = db.Column(db.Float, default=0)
Width_4_5_to_6_0_m = db.Column(db.Float, default=0)
Width_6_0_to_7_5_m = db.Column(db.Float, default=0)
# 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)
Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
# 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)
Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
created_at = db.Column(db.DateTime, default=datetime.today)

78
app/models/trench_excavation_model.py
View File

@@ -14,59 +14,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)
Invert_Level = db.Column(db.Float)
MH_Top_Level = db.Column(db.Float)
Ground_Level = db.Column(db.Float)
ID_of_MH_m = db.Column(db.Float)
Actual_Trench_Length = db.Column(db.Float)
Pipe_Dia_mm = db.Column(db.Float)
CC_length = db.Column(db.Float, default=0)
Invert_Level = db.Column(db.Float, default=0)
MH_Top_Level = db.Column(db.Float, default=0)
Ground_Level = db.Column(db.Float, default=0)
ID_of_MH_m = db.Column(db.Float, default=0)
Actual_Trench_Length = db.Column(db.Float, default=0)
Pipe_Dia_mm = db.Column(db.Float, default=0)
# 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)
Width_4_5_to_6_0 = db.Column(db.Float)
Width_0_to_2_5 = db.Column(db.Float, default=0)
Width_2_5_to_3_0 = db.Column(db.Float, default=0)
Width_3_0_to_4_5 = db.Column(db.Float, default=0)
Width_4_5_to_6_0 = db.Column(db.Float, default=0)
Upto_IL_Depth = db.Column(db.Float)
Cutting_Depth = db.Column(db.Float)
Avg_Depth = db.Column(db.Float)
Upto_IL_Depth = db.Column(db.Float, default=0)
Cutting_Depth = db.Column(db.Float, default=0)
Avg_Depth = db.Column(db.Float, default=0)
# 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)
Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Murum_0_to_1_5 = db.Column(db.Float)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
Soft_Rock_0_to_1_5 = db.Column(db.Float)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
# 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)
Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Murum_0_to_1_5_total = db.Column(db.Float)
Hard_Murum_1_5_and_above_total = db.Column(db.Float)
Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
Soft_Rock_0_to_1_5_total = db.Column(db.Float)
Soft_Rock_1_5_and_above_total = db.Column(db.Float)
Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
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)
Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
Total = db.Column(db.Float)
Total = db.Column(db.Float, default=0)
Remarks = db.Column(db.String(500))
RA_Bill_No=db.Column(db.String(500))

2
app/models/user_model.py
View File

@@ -5,7 +5,7 @@ class User(db.Model):
__tablename__ = "users"
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(120), nullable=False)
name = db.Column(db.String(200), nullable=False)
email = db.Column(db.String(120), unique=True, nullable=False)
password_hash = db.Column(db.String(255), nullable=False)

140
app/routes/dashboard.py
View File

@@ -13,6 +13,8 @@ from app.models.trench_excavation_model import TrenchExcavation
from app.models.manhole_excavation_model import ManholeExcavation
from app.models.laying_model import Laying
from app.models.subcontractor_model import Subcontractor
dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
@@ -23,97 +25,6 @@ def dashboard():
return render_template("dashboard.html", title="Business Intelligence Dashboard")
# import matplotlib
# matplotlib.use("Agg")
# 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()
# # bar chart
# def bar_chart():
# categories = ["Trench", "Manhole", "Pipe Laying", "Restoration"]
# values = [120, 80, 150, 60]
# plt.figure()
# plt.bar(categories, values)
# plt.title("Work Category Report")
# plt.xlabel("test Category")
# plt.ylabel("test Quantity")
# return plot_to_base64(plt)
# # Pie chart
# def pie_chart():
# labels = ["Completed", "In Progress", "Pending"]
# sizes = [55, 20, 25]
# plt.figure()
# plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)
# plt.title("Project Status")
# return plot_to_base64(plt)
# # Histogram chart
# def histogram_chart():
# daily_work = [5, 10, 15, 20, 20, 25, 30, 35, 40, 45, 50]
# plt.figure()
# plt.hist(daily_work, bins=5)
# plt.title("Daily Work Distribution")
# plt.xlabel("Work Units")
# plt.ylabel("Frequency")
# return plot_to_base64(plt)
# # Dashboaed page
# @dashboard_bp.route("/")
# def dashboard():
# if not session.get("user_id"):
# return redirect(url_for("auth.login"))
# return render_template(
# "dashboard.html",
# title="Dashboard",
# bar_chart=bar_chart(),
# pie_chart=pie_chart(),
# histogram=histogram_chart()
# )
# # 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=tr_dash
# )
@dashboard_bp.route("/api/live-stats")
def live_stats():
try:
@@ -152,16 +63,49 @@ def live_stats():
# subcontractor dashboard
@dashboard_bp.route("/subcontractor_dashboard", methods=["GET", "POST"])
@dashboard_bp.route("/subcontractor_dashboard")
def subcontractor_dashboard():
if not session.get("user_id"):
return redirect(url_for("auth.login"))
tr_dash = DashboardService().bar_chart_of_tr_ex
subcontractors = Subcontractor.query.all()
return render_template(
"subcontractor_dashboard.html",
title="Dashboard",
bar_chart=tr_dash
)
subcontractors=subcontractors
)
# 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")
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()
labels = []
values = []
for r in results:
labels.append(r[0])
values.append(float(r[1] or 0))
return jsonify({
"labels": labels,
"values": values
})

5
app/routes/subcontractor_routes.py
View File

@@ -40,7 +40,8 @@ def save_subcontractor():
address=request.form.get("address"),
mobile_no=request.form.get("mobile_no"),
email_id=request.form.get("email_id"),
gst_no=request.form.get("gst_no")
gst_no=request.form.get("gst_no"),
pan_no=request.form.get("pan_no")
)
db.session.add(subcontractor)
@@ -120,6 +121,8 @@ def update_subcontractor(id):
subcontractor.mobile_no = request.form.get("mobile_no")
subcontractor.email_id = request.form.get("email_id")
subcontractor.gst_no = request.form.get("gst_no")
subcontractor.gst_no = request.form.get("pan_no")
subcontractor.status = request.form.get("status")
db.session.commit()

5
app/templates/subcontractor/add.html
View File

@@ -36,6 +36,11 @@
<input type="text" class="form-control" name="gst_no">
</div>
<div class="mb-3">
<label class="form-label">PAN No:</label>
<input type="text" class="form-control" name="pan_no">
</div>
<button class="btn btn-success">Save</button>
<a href="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>

17
app/templates/subcontractor/edit.html
View File

@@ -37,6 +37,23 @@
<input type="text" class="form-control" name="gst_no" value="{{ subcontractor.gst_no }}">
</div>
<div class="mb-3">
<label class="form-label">PAN No:</label>
<input type="text" class="form-control" name="pan_no" value="{{ subcontractor.pan_no }}">
</div>
<div class="mb-3">
<label class="form-label">Status:</label>
<select name="status" class="form-control">
<option value="Active" {% if subcontractor.status=="Active" %}selected{% endif %}>
Active
</option>
<option value="Inactive" {% if subcontractor.status=="Inactive" %}selected{% endif %}>
Inactive
</option>
</select>
</div>
<button class="btn btn-success">Update</button>
<a href="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>

12
app/templates/subcontractor/list.html
View File

@@ -19,9 +19,9 @@
<table class="table table-bordered table-hover align-middle">
<thead class="table-dark">
<tr>
<th>ID</th>
<th>Name</th>
<th>Contact</th>
<th>Sr. No</th>
<th>Subcontractor Name</th>
<th>GST No</th>
<th>Mobile</th>
<th>Email</th>
<th>Status</th>
@@ -33,7 +33,7 @@
<tr>
<td>{{ s.id }}</td>
<td>{{ s.subcontractor_name }}</td>
<td>{{ s.contact_person }}</td>
<td>{{ s.gst_no }}</td>
<td>{{ s.mobile_no }}</td>
<td>{{ s.email_id }}</td>
<td>
@@ -65,9 +65,9 @@
{% for s in subcontractors %}
<div class="card mb-3 shadow-sm">
<div class="card-body p-3">
<h6 class="fw-bold mb-2">{{ s.subcontractor_name }}</h6>
<h5 class="fw-bold mb-2">{{ s.subcontractor_name }}</h5>
<p class="mb-1"><strong>Contact Person Name:</strong> {{ s.contact_person }}</p>
<p class="mb-1"><strong>GST No:</strong> {{ s.gst_no }}</p>
<p class="mb-1"><strong>Mobile:</strong> {{ s.mobile_no }}</p>
<p class="mb-1"><strong>Email:</strong> {{ s.email_id }}</p>

165
app/templates/subcontractor_dashboard.html
View File

@@ -1,55 +1,47 @@
{% extends "base.html" %}
{% block content %}
<div class="container-fluid px-2 px-md-4">
<div class="container-fluid mt-3">
<h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
<h4 class="mb-4">Subcontractor Dashboard</h4>
<div class="row g-3 mb-4">
<div class="col-12 col-md-4">
<div class="card text-white bg-primary shadow h-100">
<div class="card-body text-center text-md-start">
<h6>Trenching Units</h6>
<h3 class="fw-bold" id="card-trench">0</h3>
</div>
</div>
<div class="row mb-3">
<div class="col-md-4">
<select id="subcontractor" class="form-control">
<option value="">Select Subcontractor</option>
{% for s in subcontractors %}
<option value="{{s.id}}">{{s.subcontractor_name}}</option>
{% endfor %}
</select>
</div>
<div class="col-12 col-md-4">
<div class="card text-white bg-success shadow h-100">
<div class="card-body text-center text-md-start">
<h6>Manhole Units</h6>
<h3 class="fw-bold" id="card-manhole">0</h3>
</div>
</div>
<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="Hard Murum">Hard Murum</option>
<option value="Soft Rock">Soft Rock</option>
<option value="Hard Rock">Hard Rock</option>
</select>
</div>
<div class="col-12 col-md-4">
<div class="card text-dark bg-warning shadow h-100">
<div class="card-body text-center text-md-start">
<h6>Laying Units</h6>
<h3 class="fw-bold" id="card-laying">0</h3>
</div>
</div>
<div class="col-md-4">
<select id="ra_bill" class="form-control">
<option value="">RA Bill</option>
</select>
</div>
</div>
<div class="row g-3">
<div class="col-12 col-md-6">
<div class="card shadow-sm h-100">
<div class="card-header bg-dark text-white">Live Category Bar Chart</div>
<div class="card-body">
<canvas id="liveBarChart" style="max-height:300px;"></canvas>
</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="card shadow-sm h-100">
<div class="card-header bg-dark text-white">Location Distribution Pie Chart</div>
<div class="card-body">
<canvas id="livePieChart" style="max-height:300px;"></canvas>
</div>
</div>
<div class="card shadow">
<div class="card-body">
<canvas id="comparisonChart" height="120"></canvas>
</div>
</div>
@@ -59,64 +51,55 @@
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script>
// 2. Initialize the Bar Chart
const barCtx = document.getElementById('liveBarChart').getContext('2d');
let liveBarChart = new Chart(barCtx, {
type: 'bar',
data: {
labels: ['Trenching', 'Manholes', 'Laying'],
datasets: [{
label: 'Units Completed',
data: [0, 0, 0],
backgroundColor: ['#0d6efd', '#198754', '#ffc107']
}]
},
options: { responsive: true, maintainAspectRatio: false }
});
// 3. Initialize the Pie Chart
const pieCtx = document.getElementById('livePieChart').getContext('2d');
let livePieChart = new Chart(pieCtx, {
type: 'pie',
data: {
labels: [], // Will be filled from SQL
datasets: [{
data: [],
backgroundColor: ['#0d6efd', '#198754', '#ffc107', '#6f42c1', '#fd7e14']
}]
},
options: { responsive: true, maintainAspectRatio: false }
});
let chart;
// 4. Function to Fetch Live Data from your Python API
function fetchLiveData() {
fetch('/dashboard/api/live-stats') // This matches the route we created in the "Kitchen"
.then(response => response.json())
function loadChart() {
let subcontractor = document.getElementById("subcontractor").value
let category = document.getElementById("category").value
let ra_bill = document.getElementById("ra_bill").value
fetch(`/dashboard/api/subcontractor-chart?subcontractor=${subcontractor}&category=${category}&ra_bill=${ra_bill}`)
.then(res => res.json())
.then(data => {
// Update the Summary Cards
document.getElementById('card-trench').innerText = data.summary.trench;
document.getElementById('card-manhole').innerText = data.summary.manhole;
document.getElementById('card-laying').innerText = data.summary.laying;
// Update Bar Chart
liveBarChart.data.datasets[0].data = [
data.summary.trench,
data.summary.manhole,
data.summary.laying
];
liveBarChart.update();
if (chart) {
chart.destroy()
}
const ctx = document.getElementById("comparisonChart")
chart = new Chart(ctx, {
type: "bar",
data: {
labels: data.labels,
datasets: [{
label: "Subcontractor Quantity",
data: data.values,
backgroundColor: "#0d6efd"
}]
},
options: {
responsive: true,
plugins: {
legend: { display: true }
}
}
})
// Update Pie Chart (Location stats)
livePieChart.data.labels = Object.keys(data.locations);
livePieChart.data.datasets[0].data = Object.values(data.locations);
livePieChart.update();
})
.catch(err => console.error("Error fetching live data:", err));
}
// 5. Check for updates every 10 seconds (Real-time effect)
setInterval(fetchLiveData, 10000);
fetchLiveData(); // Load immediately on page open
document.getElementById("subcontractor").addEventListener("change", loadChart)
document.getElementById("category").addEventListener("change", loadChart)
document.getElementById("ra_bill").addEventListener("change", loadChart)
loadChart()
</script>
{% endblock %}