Skip to content

Commit 99370b9

Browse files
MstrodlMstrodl
committed
Merge branch 'develop'
2 parents 8a205f0 + 2001345 commit 99370b9

File tree

7 files changed

+11
-24
lines changed

7 files changed

+11
-24
lines changed

‎conditional/blueprints/intro_evals.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def get_fid_cm_count(member_id):
6565
'eval_date': fid.eval_date.strftime("%Y-%m-%d"),
6666
'signatures_missed': signatures_missed,
6767
'committee_meetings': get_fid_cm_count(fid.id),
68-
'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10,
68+
'committee_meetings_passed': get_fid_cm_count(fid.id) >= 6,
6969
'house_meetings_missed':
7070
[
7171
{
@@ -114,7 +114,7 @@ def get_fid_cm_count(member_id):
114114
'eval_date': freshman_data.eval_date.strftime("%Y-%m-%d"),
115115
'signatures_missed': freshman_data.signatures_missed,
116116
'committee_meetings': len(get_cm(member)),
117-
'committee_meetings_passed': len(get_cm(member)) >= 10,
117+
'committee_meetings_passed': len(get_cm(member)) >= 6,
118118
'house_meetings_missed':
119119
[
120120
{

‎conditional/models/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class FreshmanAccount(db.Model):
2121
def __init__(self, name, onfloor, room=None, missed=None, rit_username=None):
2222
self.name = name
2323
today = date.fromtimestamp(time.time())
24-
self.eval_date = today + timedelta(weeks=10)
24+
self.eval_date = today + timedelta(weeks=6)
2525
self.onfloor_status = onfloor
2626
self.room_number = room
2727
self.signatures_missed = missed

‎conditional/templates/dashboard.html

+2-14
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ <h3 class="panel-title">Freshman Evaluations
6161
<tr>
6262
<td class="title">Directorship Meetings</td>
6363
<td><span class="pull-right">
64-
{% if freshman['committee_meetings'] >= 10 %}
64+
{% if freshman['committee_meetings'] >= 6 %}
6565
<span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
66-
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{freshman['committee_meetings']}} / 10
66+
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{freshman['committee_meetings']}} / 6
6767
</span>
6868
</td>
6969
</tr>
@@ -76,18 +76,6 @@ <h3 class="panel-title">Freshman Evaluations
7676
</span>
7777
</td>
7878
</tr>
79-
<tr>
80-
<td class="title">Freshman Project</td>
81-
<td>
82-
{% if freshman['fresh_proj'] == "Passed" %}
83-
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
84-
{% elif freshman['fresh_proj'] == "Pending" %}
85-
<span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
86-
{% else %}
87-
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
88-
{% endif %}
89-
</td>
90-
</tr>
9179
</tbody>
9280
</table>
9381
<div class="panel-body" style="padding:0px 0px 8px 8px">

‎conditional/templates/intro_eval_slideshow.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h3>{{m['signatures_missed']}}</h3>
2424
</div>
2525
</div>
2626
<div class="col-xs-12 col-md-3">
27-
{% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
27+
{% set committee_meetings_passed = m['committee_meetings'] >= 6 %}
2828
<div class="item{% if committee_meetings_passed %} passed{% endif %}" >
2929
<span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
3030
<h3>{{m['committee_meetings']}}</h3>

‎conditional/templates/intro_evals.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
7474
{% endif %}
7575
</div>
7676
<div class="text-center">
77-
{% if m['committee_meetings'] < 10 %}
77+
{% if m['committee_meetings'] < 6 %}
7878
<div class="eval-info-label">
7979
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Directorship Meetings
80-
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
80+
<span class="eval-info-number">{{m['committee_meetings']}} / 6</span>
8181
</div>
8282
{% else %}
8383
<div class="eval-info-label">
8484
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Directorship Meetings
85-
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
85+
<span class="eval-info-number">{{m['committee_meetings']}} / 6</span>
8686
</div>
8787
{% endif %}
8888

@@ -204,7 +204,7 @@ <h4>Other Comments</h4>
204204
{% endif %}
205205
</td>
206206
<td data-sort="{{ m['committee_meetings'] }}">
207-
{% if m['committee_meetings'] < 10 %}
207+
{% if m['committee_meetings'] < 6 %}
208208
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['committee_meetings']}}
209209
{% else %}
210210
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['committee_meetings']}}

‎conditional/util/member.py

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ def get_freshman_data(user_name):
104104
freshman['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
105105
freshman['social_events'] = freshman_data.social_events
106106
freshman['general_comments'] = freshman_data.other_notes
107-
freshman['fresh_proj'] = freshman_data.freshman_project
108107
freshman['sig_missed'] = freshman_data.signatures_missed
109108
freshman['eval_date'] = freshman_data.eval_date
110109
return freshman

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "conditional",
3-
"version": "1.10.1",
3+
"version": "1.10.2",
44
"description": "CSH Re-evaluation (MEGA_EVALS RE:RE:LOADED)",
55
"license": "MIT",
66
"homepage": "http://csh.rit.edu/",

0 commit comments

Comments
 (0)