Merge pull request #240 from uw-it-aca/qa

Qa

.jshintignore

@@ -1,3 +1,3 @@
-myuw_mobile/static/js/vendor/**
-myuw_mobile/static/vendor/js/**
-myuw_mobile/static/js/test/**
+myuw/static/js/vendor/**
+myuw/static/vendor/js/**
+myuw/static/js/test/**

.travis.yml

@@ -15,7 +15,7 @@ before_script:
   - cp travis-ci/manage.py manage.py
   - python manage.py syncdb --noinput
 script:
-  - pep8 myuw/ --exclude=migrations
+  - pep8 myuw/ --exclude=migrations,myuw/static
   - jshint myuw/static/js/  --verbose
   - mocha myuw/static/js/test/ --recursive
   - coverage run --source=myuw/ --omit=myuw/migrations/* manage.py test myuw

myuw/dao/__init__.py

@@ -1,3 +1,4 @@
+from restclients.dao import SWS_DAO
 from myuw.dao.pws import get_netid_of_current_user
 from myuw.models import User
 
@@ -8,3 +9,9 @@ def get_user_model():
     user, created = User.objects.get_or_create(uwnetid=user_netid)
 
     return user
+
+
+def is_using_file_dao():
+    dao = SWS_DAO()._getDAO()
+    class_name = dao.__class__.__name__
+    return class_name == "File" or class_name == "ByWeek"

myuw/dao/calendar.py

@@ -1,13 +1,14 @@
-from myuw.dao.term import get_comparison_date
-from myuw.dao.calendar_mapping import get_calendars_for_current_user
-from restclients.trumba import get_calendar_by_name
+import re
+import pytz
 from datetime import timedelta, datetime, time
-from restclients.exceptions import DataFailureException
+from urllib import quote_plus, urlencode
 from django.conf import settings
 from django.utils import timezone
-from urllib import quote_plus, urlencode
-import re
-import pytz
+from restclients.exceptions import DataFailureException
+from restclients.trumba import get_calendar_by_name
+from myuw.dao.term import get_comparison_date
+from myuw.dao.calendar_mapping import get_calendars_for_current_user
+
 
 # Number of future days to search for displaying events
 DISPLAY_CUTOFF_DAYS = 14

myuw/dao/card_display_dates.py

@@ -6,29 +6,24 @@
 
 from django.conf import settings
 from datetime import datetime, timedelta
-from myuw.dao.term import get_comparison_date,\
-    is_in_summer_b_term, is_summer_term,\
-    get_current_quarter, get_next_quarter,\
-    get_term_after, get_last_term, get_bof_1st_instruction,\
-    get_eof_last_instruction, get_bof_7d_before_last_instruction,\
-    get_eof_7d_after_class_start, get_eof_last_final_exam
+from myuw.dao.term import get_comparison_datetime,\
+    get_current_quarter, get_next_quarter, get_previous_quarter,\
+    get_term_after, is_in_summer_quarter,\
+    is_in_summer_b_term, get_bod_current_term_class_start,\
+    get_eod_current_term_last_instruction, get_bod_7d_before_last_instruction,\
+    get_eod_7d_after_class_start, get_eod_current_term_last_final_exam
+from myuw.dao.term import get_bod_class_start_quarter_after as\
+    get_bod_quarter_after
 
 
 def in_show_grades_period(term, request):
-    """
-    return true if it is within the grades display window -
-    before the 1st day of next quarter
-    """
-    comparison_date = get_comparison_date(request)
-    next_term = get_term_after(term)
-    return comparison_date < next_term.first_day_quarter
+    return (term is not None and request is not None and
+            get_comparison_datetime(request) < get_bod_quarter_after(term))
 
 
 def get_card_visibilty_date_values(request=None):
-    now = get_comparison_date(request)
-    after_midnight = datetime(now.year, now.month, now.day,
-                              0, 0, 1)
-    values = get_values_by_date(after_midnight, request)
+    values = get_values_by_date(get_comparison_datetime(request),
+                                request)
     set_js_overrides(request, values)
     return values
 
@@ -37,7 +32,7 @@ def get_values_by_date(now, request):
     """
     now is a datetime object of 1 second after the beginning of the day.
     """
-    last_term = get_last_term(request)
+    last_term = get_previous_quarter(request)
 
     return {
         "is_after_7d_before_last_instruction":
@@ -66,7 +61,7 @@ def get_values_by_date(now, request):
             is_before_bof_term(now, request),
         "is_before_last_day_of_classes":
             is_before_last_day_of_classes(now, request),
-        "is_summer": is_summer_term(request),
+        "is_summer": is_in_summer_quarter(request),
         "is_after_summer_b": is_in_summer_b_term(request),
         "current_summer_term": "%s,%s" % (last_term.year, "summer"),
         "last_term": "%s,%s" % (last_term.year, last_term.quarter),
@@ -78,30 +73,30 @@ def is_before_bof_term(now, request):
     The term switches after the grade submission deadline.
     @return true if it is before the begining of the 1st day of instruction
     """
-    return now < get_bof_1st_instruction(request)
+    return now < get_bod_current_term_class_start(request)
 
 
 def is_before_eof_7d_after_class_start(now, request):
     """
     @return true if it is before the end of the 7 days
     after the instruction start day
     """
-    return now < get_eof_7d_after_class_start(request)
+    return now < get_eod_7d_after_class_start(request)
 
 
 def is_after_7d_before_last_instruction(now, request):
     """
     @return true if it is after the begining of 7 days
     before instruction end
     """
-    return now > get_bof_7d_before_last_instruction(request)
+    return now > get_bod_7d_before_last_instruction(request)
 
 
 def is_before_last_day_of_classes(now, request):
     """
     @return true if it is before the end of the last day of classes
     """
-    return now < get_eof_last_instruction(request)
+    return now < get_eod_current_term_last_instruction(request)
 
 
 def is_after_last_day_of_classes(now, request):
@@ -115,7 +110,7 @@ def is_before_eof_finals_week(now, request):
     """
     @return true if it is before the end of the last day of finalsweek
     """
-    return now < get_eof_last_final_exam(request)
+    return now < get_eod_current_term_last_final_exam(request)
 
 
 def is_after_bof_and_before_eof_reg_period(now, request):

myuw/dao/enrollment.py

@@ -5,11 +5,13 @@
 
 import logging
 import traceback
+from restclients.sws.enrollment import get_enrollment_by_regid_and_term
 from myuw.logger.timer import Timer
 from myuw.logger.logback import log_resp_time, log_exception, log_info
 from myuw.dao.pws import get_regid_of_current_user
-from restclients.sws.enrollment import get_enrollment_by_regid_and_term
 from myuw.dao.term import get_current_quarter
+
+
 logger = logging.getLogger(__name__)