Skip to content

Merge updates to freshman evals from develop #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 25, 2022
Merged

Merge updates to freshman evals from develop #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d06c6e7
Remove Freshman Project
jabbate19 Sep 14, 2021
c210589
Update member.py
jabbate19 Sep 16, 2021
94a929a
Merge pull request #318 from jabbate19/develop
galenguyer Sep 16, 2021
9bee966
Change 10 to 6 for Freshman Directorships
jabbate19 Jan 31, 2022
a724020
Merge pull request #335 from jabbate19/develop
mxmeinhold Feb 3, 2022
2001345
package: bump to 1.10.2
Mstrodl Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conditional/blueprints/intro_evals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
[
{
Expand Down Expand Up @@ -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':
[
{
Expand Down
2 changes: 1 addition & 1 deletion conditional/models/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 2 additions & 14 deletions conditional/templates/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ <h3 class="panel-title">Freshman Evaluations
<tr>
<td class="title">Directorship Meetings</td>
<td><span class="pull-right">
{% if freshman['committee_meetings'] >= 10 %}
{% if freshman['committee_meetings'] >= 6 %}
<span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{freshman['committee_meetings']}} / 10
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{freshman['committee_meetings']}} / 6
</span>
</td>
</tr>
Expand All @@ -76,18 +76,6 @@ <h3 class="panel-title">Freshman Evaluations
</span>
</td>
</tr>
<tr>
<td class="title">Freshman Project</td>
<td>
{% if freshman['fresh_proj'] == "Passed" %}
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
{% elif freshman['fresh_proj'] == "Pending" %}
<span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
{% else %}
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
{% endif %}
</td>
</tr>
</tbody>
</table>
<div class="panel-body" style="padding:0px 0px 8px 8px">
Expand Down
2 changes: 1 addition & 1 deletion conditional/templates/intro_eval_slideshow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3>{{m['signatures_missed']}}</h3>
</div>
</div>
<div class="col-xs-12 col-md-3">
{% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
{% set committee_meetings_passed = m['committee_meetings'] >= 6 %}
<div class="item{% if committee_meetings_passed %} passed{% endif %}" >
<span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
<h3>{{m['committee_meetings']}}</h3>
Expand Down
8 changes: 4 additions & 4 deletions conditional/templates/intro_evals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
{% endif %}
</div>
<div class="text-center">
{% if m['committee_meetings'] < 10 %}
{% if m['committee_meetings'] < 6 %}
<div class="eval-info-label">
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Directorship Meetings
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
<span class="eval-info-number">{{m['committee_meetings']}} / 6</span>
</div>
{% else %}
<div class="eval-info-label">
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Directorship Meetings
<span class="eval-info-number">{{m['committee_meetings']}} / 10</span>
<span class="eval-info-number">{{m['committee_meetings']}} / 6</span>
</div>
{% endif %}

Expand Down Expand Up @@ -204,7 +204,7 @@ <h4>Other Comments</h4>
{% endif %}
</td>
<td data-sort="{{ m['committee_meetings'] }}">
{% if m['committee_meetings'] < 10 %}
{% if m['committee_meetings'] < 6 %}
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['committee_meetings']}}
{% else %}
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['committee_meetings']}}
Expand Down
1 change: 0 additions & 1 deletion conditional/util/member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down