Merge pull request #386 from ComputerScienceHouse/feature/mstrodl/seminars-on-dash

Show seminars for members too

Author: joeoneil

conditional/blueprints/dashboard.py

@@ -6,6 +6,8 @@
 from conditional.models.models import HouseMeeting
 from conditional.models.models import MajorProject
 from conditional.models.models import MemberHouseMeetingAttendance
+from conditional.models.models import MemberSeminarAttendance
+from conditional.models.models import TechnicalSeminar
 from conditional.models.models import SpringEval
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
@@ -20,7 +22,12 @@
 
 dashboard_bp = Blueprint('dashboard_bp', __name__)
 
+def is_seminar_attendance_valid(attendance):
+    seminar = TechnicalSeminar.query.filter(
+        TechnicalSeminar.id == attendance.seminar_id).first()
+    return seminar and seminar.approved and seminar.timestamp > start_of_year()
 
+# pylint: disable=too-many-statements
 @dashboard_bp.route('/dashboard/')
 @auth.oidc_auth
 @get_user
@@ -85,6 +92,18 @@ def display_dashboard(user_dict=None):
 
     data['major_projects_count'] = len(data['major_projects'])
 
+    # technical seminar total
+    t_seminars = [s.seminar_id for s in
+                  MemberSeminarAttendance.query.filter(
+                      MemberSeminarAttendance.uid == user_dict['account'].uid,
+                  ) if is_seminar_attendance_valid(s)]
+    data['ts_total'] = len(t_seminars)
+    attendance = [m.name for m in TechnicalSeminar.query.filter(
+        TechnicalSeminar.id.in_(t_seminars)
+        )]
+
+    data['ts_list'] = attendance
+
     spring['mp_status'] = "Failed"
     for mp in data['major_projects']:
         if mp['status'] == "Pending":

conditional/templates/dashboard.html

@@ -109,6 +109,21 @@ <h3 class="panel-title">Membership Evaluations
                         {% endif %}
                     </h3>
                 </div>
+                <div class="panel-body" style="padding:0px 0px 8px 8px">
+                    <b>Technical Seminars</b> {% if ts_total == 0 %}
+                    <div class="panel-body">
+                        <div class="alert alert-warning" role="alert">You have not attended any technical seminars.</div>
+                    </div>
+                    {% else %}
+                    <div class="panel-body table-fill">
+                        <ul>
+                            {% for ts in ts_list %}
+                            <li>{{ts}}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                    {% endif %}
+                </div>
                 <div class="panel-body table-fill">
                     <table class="table table-striped table-responsive no-bottom-margin">
                         <tbody>