Skip to content

Commit 73a5236

Browse files
mbillowmbillow
authored
Merge pull request #58 from ComputerScienceHouse/develop
Hotfix 1.0.2b
2 parents 471f908 + 99fcb51 commit 73a5236

File tree

8 files changed

+43
-35
lines changed

8 files changed

+43
-35
lines changed

‎.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
language: python
2+
python:
3+
- "3.3"
4+
5+
install:
6+
- "pip install -r requirements.txt"
7+
- "curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.7/install.sh | bash"
8+
- "nvm install"
9+
- "nvm use"
10+
- "npm install -g gulp"
11+
- "npm install"
12+
script:
13+
- "gulp production"

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Conditional
22
===========
33

4+
[![Build Status](https://travis-ci.org/ComputerScienceHouse/conditional.svg?branch=travis-ci)](https://travis-ci.org/ComputerScienceHouse/conditional)
5+
46
A comprehensive membership evaluations solution for Computer Science House.
57

68
Development

‎conditional/blueprints/attendance.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,7 @@
3232

3333

3434
def get_name(m):
35-
if 'givenName' in m:
36-
first = m['givenName'][0].decode('utf-8')
37-
else:
38-
first = ""
39-
40-
if 'sn' in m:
41-
last = m['sn'][0].decode('utf-8')
42-
else:
43-
last = ""
44-
45-
return "{first} {last}".format(first=first, last=last)
35+
return m['cn'][0].decode('utf-8')
4636

4737

4838
@attendance_bp.route('/attendance/ts_members')

‎conditional/blueprints/intro_evals.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def get_fid_cm_count(member_id):
6262
'name': fid.name,
6363
'uid': fid.id,
6464
'eval_date': fid.eval_date.strftime("%Y-%m-%d"),
65-
'signatures_missed': 65535,
65+
'signatures_missed': -1,
6666
'committee_meetings': get_fid_cm_count(fid.id),
6767
'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10,
6868
'house_meetings_missed':
@@ -87,7 +87,8 @@ def get_fid_cm_count(member_id):
8787
],
8888
'social_events': '',
8989
'freshman_project': "Pending",
90-
'comments': 'Does not have account yet',
90+
'comments': "",
91+
'ldap_account': False,
9192
'status': "Pending"
9293
}
9394
ie_members.append(freshman)
@@ -138,6 +139,7 @@ def get_fid_cm_count(member_id):
138139
'social_events': freshman_data.social_events,
139140
'freshman_project': freshman_data.freshman_project,
140141
'comments': freshman_data.other_notes,
142+
'ldap_account': True,
141143
'status': freshman_data.freshman_eval_result
142144
}
143145
ie_members.append(member)

‎conditional/templates/intro_evals.html

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@
2020
</div>
2121
<div class="col-sm-5 col-md-4 col-lg-5">
2222
<h4 class="eval-name">{{m['name']}}</h4>
23-
<h6 class="eval-uid">{{m['uid']}}</h6>
23+
{% if not m['ldap_account'] %}
24+
<span class="label label-default">Internal Account: {{m['uid']}}</span>
25+
{% else %}
26+
<h6 class="eval-uid">{{ m['uid'] }}</h6>
27+
{% endif %}
28+
2429
</div>
2530
<!---->
2631
<div class="col-sm-5 col-md-6 col-lg-5 vcenter">
2732
<div class="row">
2833
<div class="text-center">
29-
{% if m['signatures_missed'] > 0 %}
30-
<div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
31-
{% elif m['signatures_missed'] == 65535 %}
32-
<div class="eval-info-label warning">Packet Not Yet Complete</div>
34+
{% if m['signatures_missed'] == 0 %}
35+
<div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
36+
{% elif m['signatures_missed'] > 0 %}
37+
<div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
3338
{% else %}
34-
<div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
39+
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Packet in Progress</div>
3540
{% endif %}
3641
</div>
3742
<div class="text-center">
@@ -44,7 +49,7 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
4449
</div>
4550
<div class="text-center">
4651
{% if m['freshman_project'] == "Pending" %}
47-
<div class="eval-info-label warning">Freshman Project: <span class="glyphicon glyphicon-hourglass white"></span></div>
52+
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Project Results Pending</div>
4853
{% elif m['freshman_project'] == "Passed" %}
4954
<div class="eval-info-label success">Freshman Project: <span class="glyphicon glyphicon-ok-sign white"></span></div>
5055
{% else %}
@@ -63,11 +68,9 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
6368
</div>
6469
</div>
6570
</div>
66-
<div class="row">
67-
71+
{% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 or m['comments'] != "" %}
6872
<button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse-{{m['uid']}}" aria-expanded="false" aria-controls="evalsCollapse-{{m['uid']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
69-
70-
</div>
73+
{% endif %}
7174
<div class="collapse" id="evalsCollapse-{{m['uid']}}">
7275
{% if m['house_meetings_missed']|length > 0 %}
7376
<!-- VV only display if missing house meetings VV -->
@@ -93,7 +96,7 @@ <h4>Missed House Meetings</h4>
9396
</table>
9497
{% endif %}
9598
<!-- ^^ HOUSE MEETINGS TABLE -->
96-
{% if True or m['technical_seminars']|length > 0 %}
99+
{% if m['technical_seminars']|length > 0 %}
97100

98101
<h4>Technical Seminars</h4>
99102
<table class="table">
@@ -105,15 +108,18 @@ <h4>Technical Seminars</h4>
105108
{% endfor %}
106109
</tbody>
107110
</table>
108-
{% endif %} {% if m['social_events'] != "" %}
111+
{% endif %}
112+
{% if m['social_events'] != "" %}
109113

110114
<h4>Social Events</h4>
111115
<p>{{m['social_events']}}</p>
112116
{% endif %}
113117

118+
{% if m['comments'] != "" %}
114119

115-
<h4>Other Notes</h4>
120+
<h4>Other Comments</h4>
116121
<p>{{m['comments']}}</p>
122+
{% endif %}
117123
</div>
118124
</div>
119125

‎conditional/templates/major_project_submission.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3 class="page-title">Major Project Form</h3>
1111
<div class="panel-body">
1212
<div class="form-group label-floating is-empty">
1313
<label class="control-label" for="name">Project Name</label>
14-
<input class="form-control" id="name" name="name" type="text">
14+
<input class="form-control" id="name" name="name" type="text" maxlength="64">
1515
</div>
1616
</div>
1717
</div>

‎conditional/templates/spring_evals.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,7 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
5555
</div>
5656

5757
{% if m['house_meetings_missed']|length > 0 or m['major_projects_len'] > 0 %}
58-
<div class="row">
59-
<div class="col-xs-12 col-sm-12 col-md-12">
60-
6158
<button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse{{m['uid']}}" aria-expanded="false" aria-controls="evalsCollapse{{m['uid']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
62-
63-
</div>
64-
</div>
6559
{% endif %}
6660
<div class="collapse" id="evalsCollapse{{m['uid']}}">
6761
{% if m['house_meetings_missed']|length > 0 %}

‎frontend/stylesheets/pages/_evals.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020
.eval-panel {
21-
padding: 25px 20px 10px;
21+
padding: 25px 20px;
2222
}
2323

2424
.col-sm-2 {
@@ -49,6 +49,7 @@
4949
border: 0;
5050
background: transparent;
5151
width: 100%;
52+
height: 0;
5253
text-align: center;
5354
}
5455
}

0 commit comments

Comments
 (0)