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

Qa

Author: vegitron

.jshintignore

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

.travis.yml

@@ -8,12 +8,14 @@ before_script:
   - pip install python-coveralls
   - pip install pep8
   - npm install jshint
+  - npm install mocha
   - cp travis-ci/manage.py manage.py
   - python manage.py syncdb --noinput
 script:
   - pep8 myuw_mobile/ --exclude=migrations,myuw_mobile/test,myuw_mobile/management
   - jshint myuw_mobile/static/js/  --verbose
-  - coverage run --source=myuw_mobile/ manage.py test myuw_mobile
+  - mocha myuw_mobile/static/js/test/ --recursive
+  - coverage run --source=myuw_mobile/ --omit=myuw_mobile/migrations/* manage.py test myuw_mobile
 after_script:
   - coveralls
 notifications:

myuw_mobile/dao/card_display_dates.py

@@ -29,9 +29,13 @@ def get_values_by_date(now, request):
     is_after_grade_submission_deadline = False
     is_after_last_day_of_classes = False
     is_after_start_of_registration_display_period = False
+    is_after_start_of_summer_reg_display_period1 = False
+    is_after_start_of_summer_reg_display_periodA = False
     is_before_end_of_finals_week = False
     is_before_last_day_of_classes = False
     is_before_end_of_registration_display_period = False
+    is_before_end_of_summer_reg_display_period1 = False
+    is_before_end_of_summer_reg_display_periodA = False
     is_before_first_day_of_term = False
 
     if now.date() < current_term.first_day_quarter:
@@ -45,28 +49,31 @@ def get_values_by_date(now, request):
     if now >= d + timedelta(days=1):
         is_after_last_day_of_classes = True
 
-    # XXX - this will be a bug when summer quarter comes around
-    # because there will need to be a summer term + a next non-summer term
-    # version of this.  We're holding off on the summer term card though...
-    if (now >= next_term.registration_services_start - timedelta(days=7) and
-            now < next_term.registration_period2_start + timedelta(days=7)):
-        is_after_start_of_registration_display_period = True
-        is_before_end_of_registration_display_period = True
+    term_reg_data = {
+        "after_start": False,
+        "after_summer1_start": False,
+        "after_summerA_start": False,
+    }
 
+    get_reg_data(now, next_term, term_reg_data)
     # We also need to be able to show this term's registration stuff, because
     # the period 2 stretches past the grade submission deadline
-    if (now >= current_term.registration_services_start - timedelta(days=7) and
-            now < current_term.registration_period2_start + timedelta(days=7)):
-        is_after_start_of_registration_display_period = True
-        is_before_end_of_registration_display_period = True
-
+    get_reg_data(now, current_term, term_reg_data)
     # We also need to be able to show the term after next, in spring quarter
-    start = term_after_next.registration_services_start - timedelta(days=7)
-    end = term_after_next.registration_period2_start + timedelta(days=7)
-    if now >= start and now < end:
+    get_reg_data(now, term_after_next, term_reg_data)
+
+    if term_reg_data["after_start"]:
         is_after_start_of_registration_display_period = True
         is_before_end_of_registration_display_period = True
 
+    if term_reg_data["after_summer1_start"]:
+        is_after_start_of_summer_reg_display_period1 = True
+        is_before_end_of_summer_reg_display_period1 = True
+
+    if term_reg_data["after_summerA_start"]:
+        is_after_start_of_summer_reg_display_periodA = True
+        is_before_end_of_summer_reg_display_periodA = True
+
     raw_date = current_term.last_final_exam_date
     d = datetime(raw_date.year, raw_date.month, raw_date.day)
     if now < d:
@@ -81,19 +88,47 @@ def get_values_by_date(now, request):
     after_registration = is_after_start_of_registration_display_period
     before_reg_end = is_before_end_of_registration_display_period
 
+    summerA_start = is_after_start_of_summer_reg_display_periodA
+    summer1_start = is_after_start_of_summer_reg_display_period1
+
+    summerA_end = is_before_end_of_summer_reg_display_periodA
+    summer1_end = is_before_end_of_summer_reg_display_period1
+
     last_term = get_term_before(current_term)
     return {
         "is_after_grade_submission_deadline": after_submission,
         "is_after_last_day_of_classes": is_after_last_day_of_classes,
         "is_after_start_of_registration_display_period": after_registration,
+        "is_after_start_of_summer_reg_display_periodA": summerA_start,
+        "is_after_start_of_summer_reg_display_period1": summer1_start,
         "is_before_end_of_finals_week": is_before_end_of_finals_week,
         "is_before_last_day_of_classes": is_before_last_day_of_classes,
         "is_before_end_of_registration_display_period": before_reg_end,
+        "is_before_end_of_summer_reg_display_periodA": summerA_end,
+        "is_before_end_of_summer_reg_display_period1": summer1_end,
         "is_before_first_day_of_term": is_before_first_day_of_term,
         "last_term": "%s,%s" % (last_term.year, last_term.quarter),
     }
 
 
+def get_reg_data(now, term, data):
+    if term.quarter == "summer":
+        if (now >= term.registration_period1_start - timedelta(days=7) and
+                now < term.registration_period1_start + timedelta(days=7)):
+            data["after_summerA_start"] = True
+            data["before_summerA_end"] = True
+
+        elif (now >= term.registration_period1_start + timedelta(days=7) and
+                now < term.registration_period2_start + timedelta(days=7)):
+            data["after_summer1_start"] = True
+            data["before_summer1_end"] = True
+    else:
+        if (now >= term.registration_period1_start - timedelta(days=14) and
+                now < term.registration_period2_start + timedelta(days=7)):
+            data["after_start"] = True
+            data["before_end"] = True
+
+
 def set_js_overrides(request, values):
     after_reg = 'is_after_start_of_registration_display_period'
     before_reg = 'is_before_end_of_registration_display_period'
@@ -103,6 +138,7 @@ def set_js_overrides(request, values):
            'myuw_before_finals_end': 'is_before_end_of_finals_week',
            'myuw_before_last_day': 'is_before_last_day_of_classes',
            'myuw_before_end_of_reg_display': before_reg,
+           'myuw_before_first_day': 'is_before_first_day_of_term',
            }
 
     for key, value in MAP.iteritems():

myuw_mobile/dao/registered_term.py

@@ -5,13 +5,14 @@
 
 import logging
 from myuw_mobile.dao.term import is_a_term, is_b_term, is_full_summer_term
-from myuw_mobile.dao.term import get_current_summer_term
+from myuw_mobile.dao.term import get_current_summer_term, get_comparison_date
 from myuw_mobile.dao.schedule import get_next_quarter_schedule
 from myuw_mobile.dao.schedule import get_next_autumn_quarter_schedule
 from myuw_mobile.dao.schedule import has_summer_quarter_section
 from myuw_mobile.dao import get_user_model
 from myuw_mobile.models import SeenRegistration
 from django.utils import timezone
+from datetime import datetime
 
 
 logger = logging.getLogger(__name__)
@@ -166,9 +167,10 @@ def _get_registered_summer_terms(registered_summer_sections):
 
 
 # MUWM-2210
-def should_highlight_future_quarters(schedule):
+def should_highlight_future_quarters(schedule, request):
     should_highlight = False
-    now = timezone.now()
+    # MUWM-2373
+    now = get_comparison_date(request)
 
     for term in schedule:
         summer_term = "F"
@@ -181,11 +183,21 @@ def should_highlight_future_quarters(schedule):
         model, created = sr_get_or_create(user=get_user_model(),
                                           year=term["year"],
                                           quarter=term["quarter"],
-                                          summer_term=summer_term
+                                          summer_term=summer_term,
                                           )
 
-        days_diff = (now - model.first_seen_date).days
-        if days_diff < 1:
+        # Want to make sure that we have a full day, not just today/tomorrow
+        actual_now = timezone.now()
+        now_datetime = datetime(now.year, now.month, now.day, actual_now.hour,
+                                actual_now.minute, actual_now.second,
+                                tzinfo=actual_now.tzinfo)
+        if created:
+            model.first_seen_date = now_datetime
+            model.save()
+
+        days_diff = (now_datetime - model.first_seen_date).days
+        # XXX - this needs to be changed when we can set a time in the override
+        if days_diff < 1.02:
             should_highlight = True
 
     return should_highlight

myuw_mobile/dao/term.py

@@ -191,8 +191,8 @@ def is_same_summer_term(summer_term1, summer_term2):
     return summer_term1.lower() == summer_term2.lower()
 
 
-def is_past(term):
+def is_past(term, request):
     """
     return true if the term is in the past
     """
-    return term.last_final_exam_date < date.today()
+    return term.last_final_exam_date < get_comparison_date(request)

myuw_mobile/logger/session_log.py

@@ -3,13 +3,18 @@
 from myuw_mobile.dao.gws import is_grad_student, is_undergrad_student
 import logging
 import json
+import hashlib
 
 logger = logging.getLogger('session')
 
 
 def log_session(netid, session_key, request):
+    if session_key is None:
+        session_key = ''
+
+    session_hash = hashlib.md5(session_key).hexdigest()
     log_entry = {'netid': netid,
-                 'session_key': session_key,
+                 'session_key': session_hash,
                  'class_level': None,
                  'is_grad': None,
                  'campus': None}

myuw_mobile/models.py

@@ -139,7 +139,6 @@ class SeenRegistration(models.Model):
     unique_together = (("user",
                         "year",
                         "quarter",
-                        "summer_term",
-                        "first_seen_date"
+                        "summer_term"
                         ),
                        )

myuw_mobile/resources/sws/file/student/v5/notice/00000000000000000000000000000001.json

@@ -1,9 +1,66 @@
 {
     "Notices": [
+        {
+            "NoticeAttributes": [
+                {
+                    "Name": "Date",
+                    "DataType": "date",
+                    "Value": "next-week"
+                },
+                {
+                    "Name": "DisplayBegin",
+                    "DataType": "date",
+                    "Value": "yesterday"
+                },
+                {
+                    "Name": "DisplayEnd",
+                    "DataType": "date",
+                    "Value": "next-week"
+                },
+                {
+                    "Name": "Quarter",
+                    "DataType": "string",
+                    "Value": "Autumn"
+                }
+   
+            ],
+            "NoticeCategory": "StudentDAD",
+            "NoticeContent": "<span class=\"notice-title\">Estimated Registration Date</span><span class=\"notice-body-with-title\">Your estimated Period I Priority Registration Date for autumn quarter is <span class=\"date\"> Thurs, May 15</span>. Registration begins at 6:00 AM. <a href=\"http://www.washington.edu/students/reg/priorau14.html\">View your Period 1 Priority Registration Date</a>.</span>",
+            "NoticeType": "EstPd1RegDate"
+        },
+        {
+            "NoticeAttributes": [
+                {
+                    "Name": "Date",
+                    "DataType": "date",
+                    "Value": "next-week"
+                },
+                {
+                    "Name": "DisplayBegin",
+                    "DataType": "date",
+                    "Value": "yesterday"
+                },
+                {
+                    "Name": "DisplayEnd",
+                    "DataType": "date",
+                    "Value": "next-week"
+                },
+                {
+                    "Name": "Quarter",
+                    "DataType": "string",
+                    "Value": "Summer"
+                }
+   
+            ],
+            "NoticeCategory": "StudentDAD",
+            "NoticeContent": "<span class=\"notice-title\">Estimated Registration Date</span><span class=\"notice-body-with-title\">Your estimated Period I Priority Registration Date for summer quarter is <span class=\"date\"> Thurs, May 13</span>. Registration begins at 6:00 AM. <a href=\"http://www.washington.edu/students/reg/priorau14.html\">View your Period 1 Priority Registration Date</a>.</span>",
+            "NoticeType": "EstPd1RegDate"
+        }
+
     ],
     "Person": {
         "Href": "",
         "Name": "None STUDENT",
         "RegID": "00000000000000000000000000000001"
     }
-}
+}

myuw_mobile/resources/sws/file/student/v5/person/12345678901234567890123456789012.json

@@ -1,5 +1,5 @@
 {"BirthDate":"1994-10-26",
-"DirectoryRelease":true,
+"DirectoryRelease":false,
 "Email":"[email protected]",
 "EmployeeID":"87654321",
 "FirstName":"Evelyn Marie",
@@ -19,18 +19,18 @@
 "LocalAddress":{"City":"Tacoma",
         "Country":"",
         "Line1":"1101 Pacific Ave S",
-        "Line2":"APT 307",
+        "Line2":"#307",
         "PostalCode":"",
         "State":"WA",
         "Zip":"98424"},
 "PermanentPhone":"2535552468",
-"RegID":"9136CCB8F66711D5BE060004AC494FFE",
+"RegID":"12345678901234567890123456789012",
 "Resident":null,
 "StudentName":"Hightower,Evelyn Marie",
 "StudentNumber":"1443336",
 "StudentSystemKey":"000083857",
-"TestScore":{"Href":"\/student\/v5\/testscore\/9136CCB8F66711D5BE060004AC494FFE.json",
-"RegID":"9136CCB8F66711D5BE060004AC494FFE"},
+"TestScore":{"Href":"\/student\/v5\/testscore\/12345678901234567890123456789012.json",
+"RegID":"12345678901234567890123456789012"},
 "UWNetID":"eight",
 "Veteran":{"Code":"0",
 "Description":null},

myuw_mobile/resources/sws/file/student/v5/person/9136CCB8F66711D5BE060004AC494FFE.json

@@ -14,10 +14,10 @@
         "Line2":"APT 102",
         "PostalCode":"",
         "State":"WA",
-        "Zip":"98105"},
+        "Zip":"98105-4566"},
 "LocalPhone":null,
 "PermanentAddress":{"City":"Bellevue",
-        "Country":"",
+        "Country":"United States",
         "Line1":"1645 140th Ave NE",
         "Line2":"APT 980",
         "PostalCode":"",

myuw_mobile/resources/sws/file/student/v5/person/FE36CCB8F66711D5BE060004AC494F31.json

@@ -23,7 +23,7 @@
         "PostalCode":"",
         "State":"WA",
         "Zip":"98055"},
-"PermanentPhone":"2065551357",
+"PermanentPhone":null,
 "RegID":"FE36CCB8F66711D5BE060004AC494F31",
 "Resident":null,
 "StudentName":"Newsome,Jaylen",

myuw_mobile/resources/sws/file/student/v5/person/FE36CCB8F66711D5BE060004AC494FCD.json

@@ -9,7 +9,7 @@
 "Year":2013},
 "LastName":"Othello",
 "LocalAddress":{"City":"Edmonds",
-        "Country":"",
+        "Country":"United States",
         "Line1":"502 Main St",
         "Line2":"",
         "PostalCode":"",