dabase column field type changes
This commit is contained in:
@@ -12,69 +12,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, 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)
|
||||
CC_length = db.Column(db.Numeric(10, 4), default=0)
|
||||
Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
|
||||
Ground_Level = db.Column(db.Numeric(10, 4), default=0)
|
||||
Invert_Level = db.Column(db.Numeric(10, 4), default=0)
|
||||
Excavated_level = 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)
|
||||
Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
# width
|
||||
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)
|
||||
Width_0_to_1_5_m = db.Column(db.Numeric(10, 4), default=0)
|
||||
Width_1_5_to_3_0_m = db.Column(db.Numeric(10, 4), default=0)
|
||||
Width_3_0_to_4_5_m = db.Column(db.Numeric(10, 4), default=0)
|
||||
Width_4_5_to_6_0_m = db.Column(db.Numeric(10, 4), default=0)
|
||||
Width_6_0_to_7_5_m = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
# Excavation categories
|
||||
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)
|
||||
Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
|
||||
Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
|
||||
Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
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)
|
||||
|
||||
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)
|
||||
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_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
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_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
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)
|
||||
|
||||
# Totals
|
||||
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)
|
||||
Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
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)
|
||||
|
||||
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)
|
||||
Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
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)
|
||||
|
||||
Total = db.Column(db.Float, default=0)
|
||||
Total = db.Column(db.Numeric(12, 4), default=0)
|
||||
Remarks = db.Column(db.String(500))
|
||||
|
||||
created_at = db.Column(db.DateTime, default=datetime.today)
|
||||
@@ -92,7 +92,7 @@ def calculate_trench_client_total(mapper, connection, target):
|
||||
for column in target.__table__.columns:
|
||||
if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
|
||||
total += getattr(target, column.name) or 0
|
||||
target.Total = total
|
||||
target.Total = round(total)
|
||||
|
||||
event.listen(TrenchExcavationClient, "before_insert", calculate_trench_client_total)
|
||||
event.listen(TrenchExcavationClient, "before_update", calculate_trench_client_total)
|
||||
Reference in New Issue
Block a user