Fix Eval Padding Issues and #52

Author: mbillow

conditional/blueprints/intro_evals.py

@@ -87,7 +87,7 @@ def get_fid_cm_count(member_id):
                  ],
             'social_events': '',
             'freshman_project': "Pending",
-            'comments': 'Does not have account yet',
+            'ldap_account': False,
             'status': "Pending"
         }
         ie_members.append(freshman)
@@ -137,7 +137,7 @@ def get_fid_cm_count(member_id):
                  ],
             'social_events': freshman_data.social_events,
             'freshman_project': freshman_data.freshman_project,
-            'comments': freshman_data.other_notes,
+            'ldap_account': True,
             'status': freshman_data.freshman_eval_result
         }
         ie_members.append(member)

conditional/templates/intro_evals.html

@@ -20,7 +20,12 @@
                     </div>
                     <div class="col-sm-5 col-md-4 col-lg-5">
                         <h4 class="eval-name">{{m['name']}}</h4>
-                        <h6 class="eval-uid">{{m['uid']}}</h6>
+                            {% if not m['ldap_account'] %}
+                                <span class="label label-default">Internal Account: {{m['uid']}}</span>
+                            {% else %}
+                                <h6 class="eval-uid">{{ m['uid'] }}</h6>
+                            {% endif %}
+
                     </div>
                     <!---->
                     <div class="col-sm-5 col-md-6 col-lg-5 vcenter">
@@ -63,11 +68,9 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                     </div>
                 </div>
             </div>
-            <div class="row">
-
+            {% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 %}
                 <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>
-
-            </div>
+            {% endif %}
             <div class="collapse" id="evalsCollapse-{{m['uid']}}">
                 {% if m['house_meetings_missed']|length > 0 %}
                 <!-- VV only display if missing house meetings VV -->
@@ -93,7 +96,7 @@ <h4>Missed House Meetings</h4>
                 </table>
                 {% endif %}
                 <!-- ^^ HOUSE MEETINGS TABLE -->
-                {% if True or m['technical_seminars']|length > 0 %}
+                {% if m['technical_seminars']|length > 0 %}
 
                 <h4>Technical Seminars</h4>
                 <table class="table">
@@ -110,10 +113,6 @@ <h4>Technical Seminars</h4>
                 <h4>Social Events</h4>
                 <p>{{m['social_events']}}</p>
                 {% endif %}
-
-
-                <h4>Other Notes</h4>
-                <p>{{m['comments']}}</p>
             </div>
         </div>
 

conditional/templates/spring_evals.html

@@ -55,13 +55,7 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                         </div>
 
                 {% if m['house_meetings_missed']|length > 0 or m['major_projects_len'] > 0 %}
-                <div class="row">
-                    <div class="col-xs-12 col-sm-12 col-md-12">
-
                         <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>
-
-                    </div>
-                </div>
                 {% endif %}
                 <div class="collapse" id="evalsCollapse{{m['uid']}}">
                     {% if m['house_meetings_missed']|length > 0 %}

frontend/stylesheets/pages/_evals.scss

@@ -18,7 +18,7 @@
 }
 
 .eval-panel {
-  padding: 25px 20px 10px;
+  padding: 25px 20px;
 }
 
 .col-sm-2 {
@@ -49,6 +49,7 @@
     border: 0;
     background: transparent;
     width: 100%;
+    height: 0;
     text-align: center;
   }
 }