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

Qa to Main  fix/MUWM-5232

Author: fanglinfang

myuw/dao/degree.py

@@ -12,7 +12,7 @@
 from myuw.dao.term import (
     last_4instruction_weeks, during_april_may,
     is_cur_term_before, is_cur_term_same,
-    within_2terms_after_given_term)
+    within_2terms_after_given_term, after_last_final_exam_day)
 
 
 def get_degrees(request):
@@ -50,6 +50,10 @@ def get_degrees_json(request):
                     last_4instruction_weeks(
                         request, degree.year, degree.quarter)
                 )  # MUWM-5195
+                json_data["after_last_final_exam_day"] = (
+                    after_last_final_exam_day(
+                        request, degree.year, degree.quarter)
+                )  # MUWM-5232
             if degree.is_granted():
                 json_data["within_2terms_after_granted"] = (
                     within_2terms_after_given_term(

myuw/dao/term.py

@@ -164,6 +164,17 @@ def last_4instruction_weeks(request, year, quarter):
         current_term == comparison_term and comparison_dt > starting_point)
 
 
+def after_last_final_exam_day(request, year, quarter):
+    comparison_term = get_specific_term(year, quarter)
+    comparison_term_last_final_day = (
+        comparison_term.get_eod_last_final_exam() - timedelta(days=1))
+    end_day = (comparison_term_last_final_day + timedelta(days=28))
+    comparison_dt = get_comparison_datetime(request)
+    return (
+        comparison_dt >= comparison_term_last_final_day and
+        comparison_dt <= end_day)
+
+
 def get_term_from_quarter_string(quarter_string):
     """
     Return a uw_sws.models.Term object

myuw/test/dao/test_degree.py

@@ -8,6 +8,7 @@
 
 DEGREE_DATA = {
     'degrees': [{
+        'after_last_final_exam_day': False,
         'campus': 'SEATTLE',
         'diploma_mail': 0,
         'diploma_mail_to_local_address': False,
@@ -54,6 +55,7 @@ def test_get_degrees_json(self):
         degree_data = get_degrees_json(
             get_request_with_user('javerage')
         )
+        self.maxDiff = None
         self.assertEquals(degree_data, DEGREE_DATA)
         self.maxDiff = None
         degree_data = get_degrees_json(
@@ -125,3 +127,20 @@ def test_get_degrees_json(self):
         self.assertEquals(
             degree_data,
             {'degrees': None, 'error_code': 404})
+
+        # MUWM-5232
+        degree_data = get_degrees_json(
+            get_request_with_user(
+                'javerage', get_request_with_date("2013-08-22")))
+        self.assertFalse(
+            degree_data['degrees'][0]['after_last_final_exam_day'])
+        degree_data=get_degrees_json(
+            get_request_with_user(
+                'javerage', get_request_with_date("2013-08-23")))
+        self.assertTrue(
+            degree_data['degrees'][0]['after_last_final_exam_day'])
+        degree_data=get_degrees_json(
+            get_request_with_user(
+                'javerage', get_request_with_date("2013-09-19")))
+        self.assertTrue(
+            degree_data['degrees'][0]['after_last_final_exam_day'])

myuw/test/dao/test_term.py

@@ -13,7 +13,7 @@
     get_future_number_quarters, during_april_may, is_cur_term_same,
     get_next_non_summer_quarter, get_next_autumn_quarter,
     is_in_summer_a_term, is_in_summer_b_term,
-    within_2terms_after_given_term,
+    within_2terms_after_given_term, after_last_final_exam_day,
     get_bod_current_term_class_start, get_eod_7d_after_class_start,
     get_eod_current_term, get_eod_current_term_last_instruction,
     get_bod_7d_before_last_instruction, get_eod_current_term_last_final_exam,
@@ -431,3 +431,13 @@ def test_term_dat_context_before_start_break(self):
         self.assertEquals(context['quarter'], 'spring')
         self.assertEquals(context['is_finals'], False)
         self.assertEquals(context['is_break'], True)
+
+    def test_after_last_final_exam_day(self):
+        request = get_request_with_date("2013-08-22")
+        self.assertFalse(after_last_final_exam_day(request, 2013, 'summer'))
+        request = get_request_with_date("2013-08-23")
+        self.assertTrue(after_last_final_exam_day(request, 2013, 'summer'))
+        request = get_request_with_date("2013-09-19")
+        self.assertTrue(after_last_final_exam_day(request, 2013, 'summer'))
+        request = get_request_with_date("2013-09-20")
+        self.assertFalse(after_last_final_exam_day(request, 2013, 'summer'))

myuw_vue/components/home/graduation/application-submitted.vue

@@ -14,6 +14,13 @@
       </h2>
     </template>
     <template #card-body>
+      <div v-if="showLastTermGradAlert"
+        class="alert alert-primary myuw-text-md text-center" role="alert"
+      >
+        Did you graduate last quarter? Don&apos;t worry,
+        <strong>it may take several weeks for your degree to be officially granted.</strong>
+        Once your graduation status updates, MyUW will reflect the change.
+      </div>
       <div class="row gx-md-4">
         <div v-if="hasActiveApplication" class="col-12 mb-xl-0">
           <p class="myuw-text-md">
@@ -625,6 +632,14 @@ export default {
       }
       return value;
     },
+    showLastTermGradAlert() {
+      // MUWM-5232: from the last final exam day until status is no longer 3-5
+      let value = this.degrees && Boolean(this.degrees[0].after_last_final_exam_day);
+      if (!value && this.hasDoubleDegrees) {
+        value = Boolean(this.degrees[1].after_last_final_exam_day);
+      }
+      return value;
+    },
     hasGrantedDegree() {
       // MUWM-5195: from degree earned term till 2 terms after it
       let value = (

myuw_vue/tests/degree-appl-submitted.test.js

@@ -73,6 +73,7 @@ describe('Graduation Card', () => {
     expect(wrapper.vm.hasActiveApplBeforeEarnedTerm).toBe(false);
     expect(wrapper.vm.hasActiveApplication).toBe(true);
     expect(wrapper.vm.hasGrantedDegree).toBe(false);
+    expect(wrapper.vm.showLastTermGradAlert).toBe(false);
     expect(wrapper.vm.seattle).toBeTruthy();
     expect(wrapper.vm.bothell).toBe(false);
     expect(wrapper.vm.tacoma).toBe(false);

myuw_vue/tests/mock_data/profile/javerage.json

@@ -54,6 +54,7 @@
         "is_degree_earned_term": true,
         "before_degree_earned_term": false,
         "during_april_may": false,
+        "after_last_final_exam_day": false,
         "last_4_inst_weeks_in_degree_term": true
       }
     ],