dabase column field type changes
This commit is contained in:
@@ -15,35 +15,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, default=0)
|
||||
Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
# Excavation categories
|
||||
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)
|
||||
d_0_to_0_75 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_0_76_to_1_05 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_1_06_to_1_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_1_66_to_2_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_2_16_to_2_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_2_66_to_3_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_3_16_to_3_65= db.Column(db.Numeric(10, 4), default=0)
|
||||
d_3_66_to_4_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_4_16_to_4_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_4_66_to_5_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_5_16_to_5_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_5_66_to_6_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_6_16_to_6_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_6_66_to_7_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_7_16_to_7_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_7_66_to_8_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_8_16_to_8_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_8_66_to_9_15 = db.Column(db.Numeric(10, 4), default=0)
|
||||
d_9_16_to_9_65 = db.Column(db.Numeric(10, 4), default=0)
|
||||
|
||||
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)
|
||||
Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
|
||||
DWC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
|
||||
UPVC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
|
||||
RA_Bill_No=db.Column(db.String(500))
|
||||
|
||||
Total = db.Column(db.Float, default=0)
|
||||
Total = db.Column(db.Numeric(12, 4), default=0)
|
||||
created_at = db.Column(db.DateTime, default=datetime.today)
|
||||
|
||||
def __repr__(self):
|
||||
@@ -59,7 +59,7 @@ def calculate_mh_dc_total(mapper, connection, target):
|
||||
for column in target.__table__.columns:
|
||||
if RegularExpression.D_RANGE_PATTERN.match(column.name):
|
||||
total += getattr(target, column.name) or 0
|
||||
target.Total = total
|
||||
target.Total = round(total)
|
||||
|
||||
event.listen(ManholeDomesticChamber, "before_insert", calculate_mh_dc_total)
|
||||
event.listen(ManholeDomesticChamber, "before_update", calculate_mh_dc_total)
|
||||
Reference in New Issue
Block a user