diff --git a/conditional/blueprints/intro_evals.py b/conditional/blueprints/intro_evals.py index a67650e..7cd276b 100644 --- a/conditional/blueprints/intro_evals.py +++ b/conditional/blueprints/intro_evals.py @@ -65,7 +65,7 @@ def get_fid_cm_count(member_id): 'eval_date': fid.eval_date.strftime("%Y-%m-%d"), 'signatures_missed': signatures_missed, 'committee_meetings': get_fid_cm_count(fid.id), - 'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10, + 'committee_meetings_passed': get_fid_cm_count(fid.id) >= 6, 'house_meetings_missed': [ { @@ -114,7 +114,7 @@ def get_fid_cm_count(member_id): 'eval_date': freshman_data.eval_date.strftime("%Y-%m-%d"), 'signatures_missed': freshman_data.signatures_missed, 'committee_meetings': len(get_cm(member)), - 'committee_meetings_passed': len(get_cm(member)) >= 10, + 'committee_meetings_passed': len(get_cm(member)) >= 6, 'house_meetings_missed': [ { diff --git a/conditional/models/models.py b/conditional/models/models.py index 4e54c50..e3124f2 100644 --- a/conditional/models/models.py +++ b/conditional/models/models.py @@ -21,7 +21,7 @@ class FreshmanAccount(db.Model): def __init__(self, name, onfloor, room=None, missed=None, rit_username=None): self.name = name today = date.fromtimestamp(time.time()) - self.eval_date = today + timedelta(weeks=10) + self.eval_date = today + timedelta(weeks=6) self.onfloor_status = onfloor self.room_number = room self.signatures_missed = missed diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html index d441310..3069b9e 100644 --- a/conditional/templates/dashboard.html +++ b/conditional/templates/dashboard.html @@ -61,9 +61,9 @@