dataase field updateds and model updateds
This commit is contained in:
@@ -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))
|
||||
|
||||
|
||||
@@ -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))
|
||||
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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))
|
||||
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user