Skip to content

Commit 112c600

Browse files
committed
Whoops, forgot that was a field in the form...
1 parent aac421d commit 112c600

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

conditional/blueprints/intro_evals.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def get_fid_cm_count(member_id):
8787
],
8888
'social_events': '',
8989
'freshman_project': "Pending",
90+
'comments': "",
9091
'ldap_account': False,
9192
'status': "Pending"
9293
}
@@ -137,6 +138,7 @@ def get_fid_cm_count(member_id):
137138
],
138139
'social_events': freshman_data.social_events,
139140
'freshman_project': freshman_data.freshman_project,
141+
'comments': freshman_data.other_notes,
140142
'ldap_account': True,
141143
'status': freshman_data.freshman_eval_result
142144
}

conditional/templates/intro_evals.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
6868
</div>
6969
</div>
7070
</div>
71-
{% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 %}
71+
{% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 or m['comments'] != "" %}
7272
<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>
7373
{% endif %}
7474
<div class="collapse" id="evalsCollapse-{{m['uid']}}">
@@ -108,11 +108,18 @@ <h4>Technical Seminars</h4>
108108
{% endfor %}
109109
</tbody>
110110
</table>
111-
{% endif %} {% if m['social_events'] != "" %}
111+
{% endif %}
112+
{% if m['social_events'] != "" %}
112113

113114
<h4>Social Events</h4>
114115
<p>{{m['social_events']}}</p>
115116
{% endif %}
117+
118+
{% if m['comments'] != "" %}
119+
120+
<h4>Other Comments</h4>
121+
<p>{{m['comments']}}</p>
122+
{% endif %}
116123
</div>
117124
</div>
118125

0 commit comments

Comments
 (0)