Only show current year's worth of data

Author: mbillow

conditional/__init__.py

@@ -1,5 +1,6 @@
 import os
 import subprocess
+from datetime import datetime
 from flask import Flask, redirect, request, render_template, g
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
@@ -30,6 +31,12 @@
                app.config['LDAP_BIND_PW'],
                ro=app.config['LDAP_RO'])
 
+def start_of_year():
+    start = datetime(datetime.today().year, 6, 1)
+    if datetime.today() < start:
+        start = datetime(datetime.today().year-1, 6, 1)
+    return start
+
 # pylint: disable=C0413
 
 from conditional.blueprints.dashboard import dashboard_bp

conditional/blueprints/attendance.py

@@ -25,7 +25,7 @@
 
 from conditional.util.flask import render_template
 
-from conditional import db
+from conditional import db, start_of_year
 
 logger = structlog.get_logger()
 
@@ -414,6 +414,7 @@ def get_seminar_attendees(meeting_id):
                    "attendees": get_meeting_attendees(m.id),
                    "type": "cm"
                    } for m in CommitteeMeeting.query.filter(
+                       CommitteeMeeting.timestamp > start_of_year(),
                        CommitteeMeeting.approved).all()]
         all_ts = [{"id": m.id,
                    "name": m.name,
@@ -422,20 +423,23 @@ def get_seminar_attendees(meeting_id):
                    "attendees": get_seminar_attendees(m.id),
                    "type": "ts"
                    } for m in TechnicalSeminar.query.filter(
+                       TechnicalSeminar.timestamp > start_of_year(),
                        TechnicalSeminar.approved).all()]
         pend_cm = [{"id": m.id,
                     "name": m.committee,
                     "dt_obj": m.timestamp,
                     "date": m.timestamp.strftime("%a %m/%d/%Y"),
                     "attendees": get_meeting_attendees(m.id)
                    } for m in CommitteeMeeting.query.filter(
+                       CommitteeMeeting.timestamp > start_of_year(),
                        CommitteeMeeting.approved == False).all()] # pylint: disable=singleton-comparison
         pend_ts = [{"id": m.id,
                     "name": m.name,
                     "dt_obj": m.timestamp,
                     "date": m.timestamp.strftime("%a %m/%d/%Y"),
                     "attendees": get_seminar_attendees(m.id)
                    } for m in TechnicalSeminar.query.filter(
+                       TechnicalSeminar.timestamp > start_of_year(),
                        TechnicalSeminar.approved == False).all()] # pylint: disable=singleton-comparison
         all_meetings = sorted((all_cm + all_ts), key=lambda k: k['dt_obj'], reverse=True)[offset:limit]
         if len(all_cm) % 10 != 0:

conditional/blueprints/dashboard.py

@@ -9,7 +9,6 @@
 from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_get_active_members
 
-from conditional.models.models import MemberCommitteeAttendance
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MajorProject
 from conditional.models.models import Conditional
@@ -19,7 +18,9 @@
 
 from conditional.util.housing import get_queue_position
 from conditional.util.flask import render_template
-from conditional.util.member import get_freshman_data, get_voting_members
+from conditional.util.member import get_freshman_data, get_voting_members, get_cm, get_hm
+
+from conditional import start_of_year
 
 logger = structlog.get_logger()
 
@@ -55,18 +56,13 @@ def display_dashboard():
         data['freshman'] = False
 
     spring = {}
-    c_meetings = [m.meeting_id for m in
-                  MemberCommitteeAttendance.query.filter(
-                      MemberCommitteeAttendance.uid == member.uid
-                  ) if CommitteeMeeting.query.filter(
-                      CommitteeMeeting.id == m.meeting_id).first().approved]
+    c_meetings = get_cm(member)
     spring['committee_meetings'] = len(c_meetings)
-    h_meetings = [(m.meeting_id, m.attendance_status) for m in
-                  MemberHouseMeetingAttendance.query.filter(
-                      MemberHouseMeetingAttendance.uid == member.uid)]
+    h_meetings = [(m.meeting_id, m.attendance_status) for m in get_hm(member)]
     spring['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
-    eval_entry = SpringEval.query.filter(SpringEval.uid == member.uid
-                                         and SpringEval.active).first()
+    eval_entry = SpringEval.query.filter(SpringEval.uid == member.uid,
+                                         SpringEval.date_created > start_of_year(),
+                                         SpringEval.active == True).first() # pylint: disable=singleton-comparison
     if eval_entry is not None:
         spring['status'] = eval_entry.status
     else:
@@ -92,7 +88,8 @@ def display_dashboard():
             'status': p.status,
             'description': p.description
         } for p in
-        MajorProject.query.filter(MajorProject.uid == member.uid)]
+        MajorProject.query.filter(MajorProject.uid == member.uid,
+                                  MajorProject.date > start_of_year())]
 
     data['major_projects_count'] = len(data['major_projects'])
 
@@ -112,7 +109,9 @@ def display_dashboard():
             'description': c.description,
             'status': c.status
         } for c in
-        Conditional.query.filter(Conditional.uid == member.uid)]
+        Conditional.query.filter(
+            Conditional.uid == member.uid,
+            Conditional.date_due > start_of_year())]
     data['conditionals'] = conditionals
     data['conditionals_len'] = len(conditionals)
 
@@ -121,18 +120,23 @@ def display_dashboard():
             'type': m.committee,
             'datetime': m.timestamp.date()
         } for m in CommitteeMeeting.query.filter(
-            CommitteeMeeting.id.in_(c_meetings)
+            CommitteeMeeting.id.in_(c_meetings),
+            CommitteeMeeting.timestamp > start_of_year()
         )]
 
     hm_attendance = [
         {
             'reason': m.excuse,
-            'datetime': HouseMeeting.query.filter(
-                HouseMeeting.id == m.meeting_id).first().date
+            'datetime': m.date
         } for m in
-        MemberHouseMeetingAttendance.query.filter(
-            MemberHouseMeetingAttendance.uid == member.uid
-        ).filter(MemberHouseMeetingAttendance.attendance_status == "Absent")]
+        MemberHouseMeetingAttendance.query.outerjoin(
+            HouseMeeting,
+            MemberHouseMeetingAttendance.meeting_id == HouseMeeting.id).with_entities(
+                MemberHouseMeetingAttendance.excuse,
+                HouseMeeting.date).filter(
+            MemberHouseMeetingAttendance.uid == member.uid,
+            MemberHouseMeetingAttendance.attendance_status == "Absent",
+            HouseMeeting.date > start_of_year())]
 
     data['cm_attendance'] = cm_attendance
     data['cm_attendance_len'] = len(cm_attendance)

conditional/blueprints/intro_evals.py

@@ -6,9 +6,7 @@
 
 from conditional.util.ldap import ldap_get_intro_members
 
-
 from conditional.models.models import FreshmanCommitteeAttendance
-from conditional.models.models import MemberCommitteeAttendance
 from conditional.models.models import CommitteeMeeting
 from conditional.models.models import FreshmanAccount
 from conditional.models.models import FreshmanEvalData
@@ -20,6 +18,10 @@
 from conditional.models.models import TechnicalSeminar
 from conditional.util.flask import render_template
 
+from conditional.util.member import get_cm, get_hm
+
+from conditional import start_of_year
+
 intro_evals_bp = Blueprint('intro_evals_bp', __name__)
 
 logger = structlog.get_logger()
@@ -32,11 +34,6 @@ def display_intro_evals(internal=False):
     log.info('frontend', action='display intro evals listing')
 
     # get user data
-    def get_uid_cm_count(member_id):
-        return len([a for a in MemberCommitteeAttendance.query.filter(
-            MemberCommitteeAttendance.uid == member_id)
-            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
-
     def get_fid_cm_count(member_id):
         return len([a for a in FreshmanCommitteeAttendance.query.filter(
             FreshmanCommitteeAttendance.fid == member_id)
@@ -52,6 +49,7 @@ def get_fid_cm_count(member_id):
 
     # freshmen who don't have accounts
     fids = [f for f in FreshmanAccount.query.filter(
+        FreshmanAccount.eval_date > start_of_year(),
         FreshmanAccount.eval_date > datetime.now())]
 
     for fid in fids:
@@ -108,33 +106,29 @@ def get_fid_cm_count(member_id):
         uid = member.uid
         name = member.cn
         freshman_data = FreshmanEvalData.query.filter(
+            FreshmanEvalData.eval_date > start_of_year(),
             FreshmanEvalData.uid == uid).first()
 
         if freshman_data is None:
             continue
         elif freshman_data.freshman_eval_result != "Pending" and internal:
             continue
 
-        h_meetings = [m.meeting_id for m in
-                      MemberHouseMeetingAttendance.query.filter(
-                          MemberHouseMeetingAttendance.uid == uid
-                      ).filter(
-                          MemberHouseMeetingAttendance.attendance_status == "Absent"
-                      )]
-        member = {
+        h_meetings = [m.meeting_id for m in get_hm(member)]
+        member_info = {
             'name': name,
             'uid': uid,
             'eval_date': freshman_data.eval_date.strftime("%Y-%m-%d"),
             'signatures_missed': freshman_data.signatures_missed,
-            'committee_meetings': get_uid_cm_count(uid),
-            'committee_meetings_passed': get_uid_cm_count(uid) >= 10,
+            'committee_meetings': len(get_cm(member)),
+            'committee_meetings_passed': len(get_cm(member)) >= 10,
             'house_meetings_missed':
                 [
                     {
                         "date": m.date.strftime("%Y-%m-%d"),
                         "reason":
                             MemberHouseMeetingAttendance.query.filter(
-                                MemberHouseMeetingAttendance.uid == uid).filter(
+                                MemberHouseMeetingAttendance.uid == uid,
                                 MemberHouseMeetingAttendance.meeting_id == m.id).first().excuse
                     }
                     for m in HouseMeeting.query.filter(
@@ -146,7 +140,9 @@ def get_fid_cm_count(member_id):
                     TechnicalSeminar.id.in_(
                         [a.seminar_id for a in MemberSeminarAttendance.query.filter(
                             MemberSeminarAttendance.uid == uid)
-                            if TechnicalSeminar.query.filter(TechnicalSeminar.id == a.seminar_id).first().approved]
+                            if TechnicalSeminar.query.filter(
+                                TechnicalSeminar.id == a.seminar_id,
+                                TechnicalSeminar.timestamp > start_of_year()).first().approved]
                     ))
                  ],
             'social_events': freshman_data.social_events,
@@ -155,7 +151,7 @@ def get_fid_cm_count(member_id):
             'ldap_account': True,
             'status': freshman_data.freshman_eval_result
         }
-        ie_members.append(member)
+        ie_members.append(member_info)
 
     ie_members.sort(key=lambda x: x['freshman_project'] == "Passed")
     ie_members.sort(key=lambda x: len(x['house_meetings_missed']))

conditional/blueprints/major_project_submission.py

@@ -9,7 +9,7 @@
 from conditional.util.ldap import ldap_get_member
 from conditional.util.flask import render_template
 
-from conditional import db
+from conditional import db, start_of_year
 from sqlalchemy import desc
 
 
@@ -38,7 +38,9 @@ def display_major_project():
             'id': p.id,
             'is_owner': bool(user_name == p.uid)
         } for p in
-        MajorProject.query.order_by(desc(MajorProject.id))]
+        MajorProject.query.filter(
+            MajorProject.date > start_of_year()).order_by(
+                desc(MajorProject.id))]
 
     major_projects_len = len(major_projects)
     # return names in 'first last (username)' format

conditional/blueprints/spring_evals.py

@@ -5,16 +5,16 @@
 
 from conditional.util.ldap import ldap_get_active_members
 
-from conditional.models.models import MemberCommitteeAttendance
-from conditional.models.models import CommitteeMeeting
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MajorProject
 from conditional.models.models import HouseMeeting
 from conditional.models.models import SpringEval
 
 from conditional.util.flask import render_template
 
-from conditional import db
+from conditional.util.member import get_cm, get_hm
+
+from conditional import db, start_of_year
 
 spring_evals_bp = Blueprint('spring_evals_bp', __name__)
 
@@ -27,11 +27,6 @@ def display_spring_evals(internal=False):
                      request_id=str(uuid.uuid4()))
     log.info('frontend', action='display membership evaluations listing')
 
-    def get_cm_count(member_id):
-        return len([a for a in MemberCommitteeAttendance.query.filter(
-            MemberCommitteeAttendance.uid == member_id)
-            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
-
     user_name = None
     if not internal:
         user_name = request.headers.get('x-webauth-user')
@@ -42,31 +37,26 @@ def get_cm_count(member_id):
     for account in active_members:
         uid = account.uid
         spring_entry = SpringEval.query.filter(
-            SpringEval.uid == uid and
-            SpringEval.active).first()
+            SpringEval.date_created > start_of_year(),
+            SpringEval.uid == uid,
+            SpringEval.active == True).first() # pylint: disable=singleton-comparison
 
         if spring_entry is None:
             spring_entry = SpringEval(uid)
             db.session.add(spring_entry)
             db.session.flush()
             db.session.commit()
-            # something bad happened to get here...
         elif spring_entry.status != "Pending" and internal:
             continue
 
         eval_data = None
 
-        h_meetings = [m.meeting_id for m in
-                      MemberHouseMeetingAttendance.query.filter(
-                          MemberHouseMeetingAttendance.uid == uid
-                      ).filter(
-                          MemberHouseMeetingAttendance.attendance_status == "Absent"
-                      )]
+        h_meetings = [m.meeting_id for m in get_hm(account)]
         member = {
             'name': account.cn,
             'uid': uid,
             'status': spring_entry.status,
-            'committee_meetings': get_cm_count(uid),
+            'committee_meetings': len(get_cm(account)),
             'house_meetings_missed':
                 [
                     {
@@ -86,6 +76,7 @@ def get_cm_count(member_id):
                     'status': p.status,
                     'description': p.description
                 } for p in MajorProject.query.filter(
+                    MajorProject.date > start_of_year(),
                     MajorProject.uid == uid)]
         }
         member['major_projects_len'] = len(member['major_projects'])
@@ -94,8 +85,10 @@ def get_cm_count(member_id):
                 'name': p.name,
                 'status': p.status,
                 'description': p.description
-            } for p in MajorProject.query.filter(MajorProject.uid == uid)
-            if p.status == "Passed"]
+            } for p in MajorProject.query.filter(
+                MajorProject.date > start_of_year(),
+                MajorProject.status == "Passed",
+                MajorProject.uid == uid)]
         member['major_projects_passed_len'] = len(member['major_projects_passed'])
         member['major_project_passed'] = False
         for mp in member['major_projects']: