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 @@

Freshman Evaluations Directorship Meetings - {% if freshman['committee_meetings'] >= 10 %} + {% if freshman['committee_meetings'] >= 6 %} {% else %} - {% endif %} {{freshman['committee_meetings']}} / 10 + {% endif %} {{freshman['committee_meetings']}} / 6 @@ -76,18 +76,6 @@

Freshman Evaluations - - Freshman Project - - {% if freshman['fresh_proj'] == "Passed" %} - Passed - {% elif freshman['fresh_proj'] == "Pending" %} - Pending - {% else %} - Failed - {% endif %} - -
diff --git a/conditional/templates/intro_eval_slideshow.html b/conditional/templates/intro_eval_slideshow.html index d3d948a..2e10241 100644 --- a/conditional/templates/intro_eval_slideshow.html +++ b/conditional/templates/intro_eval_slideshow.html @@ -24,7 +24,7 @@

{{m['signatures_missed']}}

- {% set committee_meetings_passed = m['committee_meetings'] >= 10 %} + {% set committee_meetings_passed = m['committee_meetings'] >= 6 %}

{{m['committee_meetings']}}

diff --git a/conditional/templates/intro_evals.html b/conditional/templates/intro_evals.html index d9b692e..d321fbe 100644 --- a/conditional/templates/intro_evals.html +++ b/conditional/templates/intro_evals.html @@ -74,15 +74,15 @@
{{ m['uid'] }}
{% endif %}
- {% if m['committee_meetings'] < 10 %} + {% if m['committee_meetings'] < 6 %}
Directorship Meetings - {{m['committee_meetings']}} / 10 + {{m['committee_meetings']}} / 6
{% else %}
Directorship Meetings - {{m['committee_meetings']}} / 10 + {{m['committee_meetings']}} / 6
{% endif %} @@ -204,7 +204,7 @@

Other Comments

{% endif %} - {% if m['committee_meetings'] < 10 %} + {% if m['committee_meetings'] < 6 %} {{m['committee_meetings']}} {% else %} {{m['committee_meetings']}} diff --git a/conditional/util/member.py b/conditional/util/member.py index 077895e..1c4ae8c 100644 --- a/conditional/util/member.py +++ b/conditional/util/member.py @@ -104,7 +104,6 @@ def get_freshman_data(user_name): freshman['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"]) freshman['social_events'] = freshman_data.social_events freshman['general_comments'] = freshman_data.other_notes - freshman['fresh_proj'] = freshman_data.freshman_project freshman['sig_missed'] = freshman_data.signatures_missed freshman['eval_date'] = freshman_data.eval_date return freshman diff --git a/package.json b/package.json index f4cc2bf..219cb26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "conditional", - "version": "1.10.1", + "version": "1.10.2", "description": "CSH Re-evaluation (MEGA_EVALS RE:RE:LOADED)", "license": "MIT", "homepage": "http://csh.rit.edu/",