From 1f0b0837bb01bb667e7f9239c9c9d6261738331d Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 27 Mar 2019 21:18:56 -0400 Subject: [PATCH 1/2] Add new model fields for heatpump scores for MOS-UPK. --- app/forms/scores.py | 9 +++++++++ app/models/scores.py | 3 +++ 2 files changed, 12 insertions(+) diff --git a/app/forms/scores.py b/app/forms/scores.py index 4560557..b6bb11d 100644 --- a/app/forms/scores.py +++ b/app/forms/scores.py @@ -19,6 +19,15 @@ class HeatPumpScoreForm(UserForm, Form): stable_tenure_of_ownership = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) + building_age = = wtf.StringField( + validators=[wtf.validators.Required(), + wtf.validators.Length(max=64)]) + pre_post_war = = wtf.StringField( + validators=[wtf.validators.Required(), + wtf.validators.Length(max=64)]) + complaint_311 = = wtf.StringField( + validators=[wtf.validators.Required(), + wtf.validators.Length(max=64)]) building_id = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) diff --git a/app/models/scores.py b/app/models/scores.py index 6be58d1..45e9437 100644 --- a/app/models/scores.py +++ b/app/models/scores.py @@ -13,6 +13,9 @@ class HeatPumpScore(Model, Tracked, db.Model): type_of_fuel = db.Column(db.Integer) owner_occupied = db.Column(db.Integer) stable_tenure_of_ownership = db.Column(db.Integer) + building_age = db.Column(db.Integer) + pre_post_war = db.Column(db.String) + complaint_311 = db.Column(db.Integer) class TargetingScore(Model, Tracked, db.Model): -- GitLab From 49d148855fe3882caf00f4ab67cf1e26a56dbd93 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 27 Mar 2019 21:46:18 -0400 Subject: [PATCH 2/2] Fix typo in forms. --- app/forms/scores.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/forms/scores.py b/app/forms/scores.py index b6bb11d..bfd92e5 100644 --- a/app/forms/scores.py +++ b/app/forms/scores.py @@ -19,13 +19,13 @@ class HeatPumpScoreForm(UserForm, Form): stable_tenure_of_ownership = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) - building_age = = wtf.StringField( + building_age = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) - pre_post_war = = wtf.StringField( + pre_post_war = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) - complaint_311 = = wtf.StringField( + complaint_311 = wtf.StringField( validators=[wtf.validators.Required(), wtf.validators.Length(max=64)]) building_id = wtf.StringField( -- GitLab