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

Fix/muwm 5182 (#2856)

Author: fanglinfang

myuw/dao/degree.py

@@ -10,7 +10,7 @@
 from myuw.dao import is_using_file_dao, get_netid_of_current_user
 from myuw.dao.pws import get_regid_of_current_user
 from myuw.dao.term import (
-    during_april_may, is_cur_term_before, is_cur_term_same)
+    last_4w_inst, during_april_may, is_cur_term_before, is_cur_term_same)
 from myuw.dao.term import more_than_2terms_before as before_display_window
 
 
@@ -49,7 +49,7 @@ def get_degrees_json(request):
             json_data["before_degree_earned_term"] = is_cur_term_before(
                 request, degree.year, degree.quarter)
             json_data["during_april_may"] = during_april_may(request)
-
+            json_data["last_4w_inst"] = last_4w_inst(request)
             degrees.append(json_data)
         response['degrees'] = degrees
     except DataFailureException as ex:

myuw/dao/degree_notice.py

@@ -45,6 +45,15 @@
             "to your UW address – set up forwarding</span>" +
             "<span class=\"notice-body-with-title\"></span>"
         )
+    },
+    {
+        "NoticeCategory": "Degree",
+        "NoticeType": "NextDestination",
+        "NoticeContent": (
+            "<span class=\"notice-title\">What do graduates do after " +
+            "leaving UW?</span>" +
+            "<span class=\"notice-body-with-title\"></span>"
+        )
     }
 ]
 

myuw/dao/notice_categorization.py

@@ -398,5 +398,10 @@
         "myuw_category": "Graduation EmailForwarding",
         "location_tags": ['graduation'],
         "critical": False
+    },
+    "degree_nextdestination": {
+        "myuw_category": "Graduation NextDestination",
+        "location_tags": ['graduation'],
+        "critical": False
     }
 }

myuw/dao/term.py

@@ -150,6 +150,15 @@ def more_than_2terms_before(request, year, quarter):
     return comparison_term < pprev_term
 
 
+def last_4w_inst(request):
+    """
+    return True if it is four weeks prior last day class of the term
+    """
+    comparison_dt = get_comparison_datetime(request)
+    starting_point = get_bod_days_before_last_instruction(request, 28)
+    return comparison_dt > starting_point
+
+
 def get_term_from_quarter_string(quarter_string):
     """
     Return a uw_sws.models.Term object
@@ -388,15 +397,25 @@ def get_eod_current_term_last_instruction(request, break_at_a_term=False):
             request, break_at_a_term)
 
 
+def get_bod_days_before_last_instruction(request, days):
+    """
+    @return the datetime object of the beginning of
+    the given number of days before the last instruction day for
+    current quarter and current summer-term if applicable.
+    Exclude the last instruction day.
+    """
+    return (get_eod_current_term_last_instruction(request, True) -
+            timedelta(days=days))
+
+
 def get_bod_7d_before_last_instruction(request):
     """
     @return the datetime object of the beginning of
     the 7 days before the last instruction day for
     current quarter and current summer-term if applicable.
     Exclude the last instruction day.
     """
-    return (get_eod_current_term_last_instruction(request, True) -
-            timedelta(days=8))
+    return get_bod_days_before_last_instruction(request, 8)
 
 
 def get_eod_current_term_last_final_exam(request, break_at_a_term=False):

myuw/test/api/test_notices.py

@@ -23,7 +23,7 @@ def test_javerage_notices(self):
 
         data = json.loads(response.content)
 
-        self.assertEquals(len(data), 28)
+        self.assertEquals(len(data), 29)
         self.assertFalse(data[0]["is_read"])
 
         hash_value = data[0]["id_hash"]
@@ -37,7 +37,7 @@ def test_javerage_notices(self):
         self.assertEquals(response.status_code, 200)
 
         data = json.loads(response.content)
-        self.assertEquals(len(data), 28)
+        self.assertEquals(len(data), 29)
 
         match = False
         for el in data:

myuw/test/dao/test_degree.py

@@ -18,6 +18,7 @@
         'is_degree_earned_term': False,
         'before_degree_earned_term': True,
         'during_april_may': True,
+        "last_4w_inst": False,
         'level': 1,
         'name_on_diploma': 'John Joseph Average',
         'quarter': 'summer',

myuw/test/dao/test_degree_notice.py

@@ -10,7 +10,7 @@ class TestDegreeNotices(TestCase):
 
     def test_get_graduation_notices(self):
         notices = get_graduation_notices()
-        self.assertEquals(len(notices), 4)
+        self.assertEquals(len(notices), 5)
         self.assertEquals(notices[0].notice_category, "Degree")
 
         final_notices = categorize_notices(notices)

myuw/test/dao/test_notice_categorization.py

@@ -8,7 +8,7 @@
 class TestNoticeCategories(TestCase):
 
     def test_categories(self):
-        self.assertEqual(len(NOTICE_CATEGORIES.keys()), 79)
+        self.assertEqual(len(NOTICE_CATEGORIES.keys()), 80)
 
         categorization = NOTICE_CATEGORIES.get("studentalr_intlstucheckin")
         self.assertIsNotNone(categorization)

myuw/test/dao/test_term.py

@@ -9,7 +9,7 @@
     get_specific_term, is_past, is_future, sws_now,
     get_default_date, get_default_datetime, get_comparison_date,
     get_current_quarter, get_next_quarter, is_cur_term_before,
-    get_previous_quarter, get_previous_number_quarters,
+    get_previous_number_quarters, last_4w_inst,
     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, more_than_2terms_before,
@@ -100,6 +100,12 @@ def test_during_april_may(self):
         self.assertTrue(is_cur_term_same(request, 2013, 'winter'))
         self.assertFalse(during_april_may(request))
 
+    def test_last_4w_inst(self):
+        request = get_request_with_date("2013-11-08")
+        self.assertFalse(last_4w_inst(request))
+        request = get_request_with_date("2013-11-09")
+        self.assertTrue(last_4w_inst(request))
+
     def test_current_quarter(self):
         now_request = get_request()
         quarter = get_current_quarter(now_request)

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

@@ -193,6 +193,33 @@
             </ul>
           </div>
 
+          <div v-if="hasActiveOrGrantedDegreeLast4weeksInst">
+            <h3 class="h6 myuw-font-encode-sans">
+              Your plans after graduation
+            </h3>
+            <ul class="list-unstyled myuw-text-md">
+              <li>
+                <uw-collapsed-item :notice="degreeNextDestination">
+                  <template #notice-body>
+                    <p>
+                      Each year we track, aggregate and
+                      <a href="https://careers.uw.edu/outcomes/"
+                        >visualize UW bachelor graduate's next destination.</a>
+                    </p>
+                    <p>
+                      What are <i>you</i> planning to do? Whether you&apos;re intending to work,
+                        travel, go to grad school, or are still figuring it out,
+                        we want to know!
+                        <a href="https://careers.uw.edu/resources/next-destination-survey/"
+                        >Please take 5 mins to tell us your plans</a>
+                        so we can better coach students and inform future graduates
+                        &ndash; we want to hear from every graduate! </p>
+                  </template>
+                </uw-collapsed-item>
+              </li>
+            </ul>
+          </div>
+
           <div v-if="hasActiveOrGrantedDegreeDuringEarnedTerm">
             <h3 class="h6 myuw-font-encode-sans">
               Verify that your information and data will not be lost
@@ -480,6 +507,12 @@ export default {
         (notice) => notice.category === 'Graduation EmailForwarding'
       )[0];
     },
+    degreeNextDestination() {
+      // MUWM-5182
+      return this.degreeNotices.filter((notice) =>
+        notice.category === 'Graduation NextDestination'
+      )[0];
+    },
     showCard() {
       return this.graduatingSenior && (this.isFetching || this.showContent || this.showError);
     },
@@ -492,7 +525,8 @@ export default {
         Boolean(this.degreeCeremony) &&
         Boolean(this.degreeDiploma) &&
         Boolean(this.degreeSaveWork) &&
-        Boolean(this.degreeEmailForwarding)
+        Boolean(this.degreeEmailForwarding) &&
+        Boolean(this.degreeNextDestination)
       );
     },
     showError() {
@@ -560,6 +594,23 @@ export default {
       }
       return value;
     },
+    hasActiveOrGrantedDegreeLast4weeksInst() {
+      // MUWM-5182  since the beginning of the last 4th week of instruction
+      let value = (
+        this.degrees &&
+        (this.isActive(this.degrees[0]) || this.isGranted(this.degrees[0])) &&
+        this.degrees[0].is_degree_earned_term &&
+        this.degrees[0].last_4w_inst
+      );
+      if (!value && this.hasDoubleDegrees) {
+        value = (
+          (this.isActive(this.degrees[1]) || this.isGranted(this.degrees[1])) &&
+          this.degrees[1].is_degree_earned_term &&
+          this.degrees[1].last_4w_inst
+        );
+      }
+      return value;
+    },
     hasActiveApplication() {
       let value = this.degrees && this.isActive(this.degrees[0]);
       if (!value && this.hasDoubleDegrees) {
@@ -614,16 +665,16 @@ export default {
       fetchProfile: 'fetch',
     }),
     hasMisconduct(degree) {
-      return degree.is_admin_hold;
+      return degree.is_admin_hold;  // degree status: 1
     },
     isIncomplete(degree) {
-      return degree.is_incomplete;
+      return degree.is_incomplete;  // degree status: 2
     },
     isActive(degree) {
-      return degree.has_applied;
+      return degree.has_applied;  // degree status: 3,4,5
     },
     isGranted(degree) {
-      return degree.is_granted;
+      return degree.is_granted;  // degree status: 9
     },
     degreeTerm(degree) {
       return this.titleCaseWord(degree.quarter) + ' ' + degree.year;

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

@@ -78,7 +78,7 @@ describe('Graduation Card', () => {
     expect(wrapper.vm.tacoma).toBe(false);
     expect(wrapper.vm.degreeTerm(wrapper.vm.degrees[0])).toBe('Summer 2013');
     expect(wrapper.findComponent(Graduation).exists()).toBe(true);
-    expect(wrapper.vm.degreeNotices.length).toBe(4);
+    expect(wrapper.vm.degreeNotices.length).toBe(5);
     expect(wrapper.vm.degreeCeremony).toBeTruthy;
     expect(wrapper.vm.degreeDiploma).toBeTruthy;
     expect(wrapper.vm.degreeSaveWork).toBeTruthy;
@@ -100,10 +100,14 @@ describe('Graduation Card', () => {
     expect(wrapper.vm.doubleDegreesInDiffTerms).toBe(true);
     expect(wrapper.vm.hasActiveOrGrantedDegreeDuringAprilMay).toBe(true);
     expect(wrapper.vm.hasActiveOrGrantedDegreeDuringEarnedTerm).toBe(true);
+    expect(wrapper.vm.hasActiveOrGrantedDegreeLast4weeksInst).toBe(true);
     expect(wrapper.vm.hasActiveApplBeforeEarnedTerm).toBe(true);
     expect(wrapper.vm.hasActiveApplication).toBe(true);
     expect(wrapper.vm.hasGrantedDegree).toBe(false);
-    expect(wrapper.findAllComponents(CollapsedItem).length).toBe(4);
+    expect(wrapper.vm.degreeNextDestination.category).toBe(
+      "Graduation NextDestination"
+    );
+    expect(wrapper.findAllComponents(CollapsedItem).length).toBe(5);
   });
   it('Verify double degrees diff status', async () => {
     axios.get.mockImplementation((url) => {
@@ -119,6 +123,7 @@ describe('Graduation Card', () => {
     expect(wrapper.vm.doubleDegreeDiffStatus).toBe(true);
     expect(wrapper.vm.doubleDegreesInDiffTerms).toBe(false);
     expect(wrapper.vm.hasActiveOrGrantedDegreeDuringAprilMay).toBe(true);
+    expect(wrapper.vm.hasActiveOrGrantedDegreeLast4weeksInst).toBe(true);
     expect(wrapper.vm.hasActiveOrGrantedDegreeDuringEarnedTerm).toBe(true);
     expect(wrapper.vm.hasActiveApplBeforeEarnedTerm).toBe(false);
     expect(wrapper.vm.hasActiveApplication).toBe(false);

myuw_vue/tests/mock_data/notice/eight.json

@@ -352,6 +352,18 @@
       "graduation"
     ]
   },
+  {
+    "notice_content": "<span class=\"notice-title\">What do graduates do after leaving UW?</span><span class=\"notice-body-with-title\"></span>",
+    "attributes": [],
+    "category": "Graduation NextDestination",
+    "sws_category": "Degree",
+    "is_critical": false,
+    "id_hash": "872f5b28b56e5e056d1f0ecbcf65dbc1",
+    "is_read": false,
+    "location_tags": [
+      "graduation"
+    ]
+  },
   {
     "notice_content": "<span class=\"notice-title\"> 2015-2016 FAFSA aid still available</span>&nbsp;<span class=\"notice-body-with-title\">You can still <a href=\"https://fafsa.gov\">apply for financial aid</a> even though the priority deadline has passed.</span>",
     "attributes": [

myuw_vue/tests/mock_data/notice/javerage.json

@@ -567,6 +567,18 @@
             "graduation"
         ]
     },
+    {
+        "notice_content": "<span class=\"notice-title\">What do graduates do after leaving UW?</span><span class=\"notice-body-with-title\"></span>",
+        "attributes": [],
+        "category": "Graduation NextDestination",
+        "sws_category": "Degree",
+        "is_critical": false,
+        "id_hash": "872f5b28b56e5e056d1f0ecbcf65dbc1",
+        "is_read": false,
+        "location_tags": [
+            "graduation"
+        ]
+    },
     {
         "notice_content": "<span class=\"notice-title\">How to update your diploma name and mailing address</span><span class=\"notice-body-with-title\"></span>",
         "attributes": [],

myuw_vue/tests/mock_data/notice/javg004.json

@@ -554,6 +554,18 @@
             "graduation"
         ]
     },
+    {
+        "notice_content": "<span class=\"notice-title\">What do graduates do after leaving UW?</span><span class=\"notice-body-with-title\"></span>",
+        "attributes": [],
+        "category": "Graduation NextDestination",
+        "sws_category": "Degree",
+        "is_critical": false,
+        "id_hash": "872f5b28b56e5e056d1f0ecbcf65dbc1",
+        "is_read": false,
+        "location_tags": [
+            "graduation"
+        ]
+    },
     {
         "notice_content": "<span class=\"notice-title\">How to update your diploma name and mailing address</span><span class=\"notice-body-with-title\"></span>",
         "attributes": [],

myuw_vue/tests/mock_data/profile/eight.json

@@ -53,7 +53,8 @@
         "is_incomplete": true,
         "is_degree_earned_term": true,
         "before_degree_earned_term": false,
-        "during_april_may": true
+        "during_april_may": true,
+        "last_4w_inst": true
       },
       {
         "campus": "TACOMA",
@@ -72,7 +73,8 @@
         "is_incomplete": false,
         "is_degree_earned_term": true,
         "before_degree_earned_term": false,
-        "during_april_may": true
+        "during_april_may": true,
+        "last_4w_inst": true
       }
     ],
     "error_code": null

myuw_vue/tests/mock_data/profile/javerage.json

@@ -53,7 +53,8 @@
         "is_incomplete": false,
         "is_degree_earned_term": false,
         "before_degree_earned_term": true,
-        "during_april_may": true
+        "during_april_may": true,
+        "last_4w_inst": true
       }
     ],
     "error_code": null

myuw_vue/tests/mock_data/profile/javg003.json

@@ -53,7 +53,8 @@
         "is_incomplete": false,
         "is_degree_earned_term": true,
         "before_degree_earned_term": false,
-        "during_april_may": true
+        "during_april_may": true,
+        "last_4w_inst": true
       },
       {
         "campus": "SEATTLE",
@@ -72,7 +73,8 @@
         "is_incomplete": false,
         "is_degree_earned_term": true,
         "before_degree_earned_term": false,
-        "during_april_may": true
+        "during_april_may": true,
+        "last_4w_inst": true
       }
     ],
     "error_code": null