Merge pull request #181 from devinmatte/develop

Fixing Attendance issue and Style Changes

Author: devinmatte

conditional/blueprints/attendance.py

@@ -137,7 +137,7 @@ def display_attendance_cm(user_dict=None):
     log.info('Display Committee Meeting Attendance Page')
 
     return render_template('attendance_cm.html',
-                           username=request.headers.get("x-webauth-user"),
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 
@@ -149,7 +149,7 @@ def display_attendance_ts(user_dict=None):
     log.info('Display Technical Seminar Attendance Page')
 
     return render_template('attendance_ts.html',
-                           username=request.headers.get("x-webauth-user"),
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 

conditional/templates/dashboard.html

@@ -352,7 +352,7 @@ <h3 class="panel-title">Directorship Meeting Attendance</h3>
                         {% for meeting in cm_attendance %}
                         <tr>
                             <td>{{meeting['committee']}}</td>
-                            <td>{{meeting['timestamp']}}</td>
+                            <td>{{meeting['timestamp'].strftime('%Y-%m-%d')}}</td>
                         </tr>
                         {% endfor %}
                         </tbody>

conditional/templates/intro_eval_slideshow.html

@@ -47,8 +47,13 @@ <h3>{{m['technical_seminars']|length}}</h3>
               </div>
             </div>
           </div>
-        <h4><span class="icon glyphicon glyphicon-{% if m['freshman_project'] == 'Passed' %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span> Freshman Project</h4>
-        
+
+        <h4>
+            {% if m['freshman_project'] != 'Pending' %}
+                <span class="icon glyphicon glyphicon-{% if m['freshman_project'] == 'Passed' %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span> Freshman Project
+            {% endif %}
+        </h4>
+
         <div class="actions" data-uid="{{m['uid']}}" data-cn="{{m['name']}}">
           <button class="pass" type="button">Pass</button>
           <button class="fail" type="button">Fail</button>

conditional/templates/intro_evals.html

@@ -124,7 +124,11 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
                 </div>
             </div>
             {% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 or m['comments'] != "" %}
-                <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 class="evals-dropdown">
+                    <span 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>
+                    </span>
+                </div>
             {% endif %}
             <div class="collapse" id="evalsCollapse-{{m['uid']}}">
                 {% if m['house_meetings_missed']|length > 0 %}

conditional/templates/spring_evals.html

@@ -93,7 +93,11 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                         </div>
 
                 {% if m['house_meetings_missed']|length > 0 or m['major_projects_len'] > 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 class="evals-dropdown">
+                        <span 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>
+                        </span>
+                    </div>
                 {% endif %}
                 <div class="collapse" id="evalsCollapse{{m['uid']}}">
                     {% if m['house_meetings_missed']|length > 0 %}

frontend/stylesheets/pages/_evals.scss

@@ -72,3 +72,7 @@
   box-shadow: none;
   padding: 3px 7px;
 }
+
+.evals-dropdown {
+  text-align: center;
+}