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

Qa

Author: fanglinfang

myuw/dao/student_profile.py

@@ -94,6 +94,17 @@ def get_academic_info(request, response):
             response['class_level'] = enrollment.class_level
             break
 
+    for term in terms:
+        if term in enrollments:
+            enrollment = enrollments[term]
+            if enrollment.has_pending_resident_change:
+                response['has_pending_residency_change'] = True
+                response['pending_residency_change_term'] = {
+                    'year': term.year,
+                    'quarter': term.quarter
+                }
+                break
+
     response['term_majors'] = _get_degrees_for_terms(terms, enrollments,
                                                      "majors")
     response['has_pending_major'] = False

myuw/resources/sws/file/student/v5/enrollment.json_reg_id_9136CCB8F66711D5BE060004AC494002_verbose_true_transcriptable_course_all_changed_since_date_

@@ -403,7 +403,7 @@
             "PendingClassChange": false,
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
-            "PendingResidentChange": false,
+            "PendingResidentChange": true,
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",

myuw/test/dao/test_student_profile.py

@@ -37,7 +37,7 @@ def test_get_minors_for_terms(self):
         self.assertEquals(len(minors[0]['minors']), 1)
         self.assertEquals(len(minors[1]['minors']), 2)
 
-    def test_no_change(self):
+    def test_major_no_change(self):
         req = get_request_with_user('javg005',
                                     get_request_with_date("2013-04-01"))
         terms, enrollments = get_cur_future_enrollments(req)
@@ -104,3 +104,12 @@ def test_degree_status(self):
                                     get_request_with_date("2013-04-01"))
         data = get_student_profile(req)
         self.assertIsNone(data['degree_status'])
+
+    def test_residency_status_change(self):
+        req = get_request_with_user('javg002',
+                                    get_request_with_date("2013-04-01"))
+        data = get_student_profile(req)
+        self.assertTrue(data['has_pending_residency_change'])
+        self.assertEqual(
+            data['pending_residency_change_term'],
+            {"year": 2013, "quarter": "autumn"})

myuw_vue/components/_common/textbooks.vue

@@ -11,6 +11,18 @@
       </h2>
     </template>
     <template #card-body>
+      <div v-if="tacoma" class="alert alert-danger myuw-text-md" role="alert">
+        <font-awesome-icon :icon="faExclamationTriangle" />
+        <b>Textbook information on MyUW is currently incorrect due to a change in
+          bookstore vendor.
+        </b><br>
+        Links to textbooks for each course section can be found on the
+          <a href="https://www.tacoma.uw.edu/ts-quicksearch/application-core/secure/"
+          >UWT Time Schedule Quicksearch</a> or the
+          <a href="https://www.bkstr.com/uwtacomastore/shop/textbooks-and-course-materials"
+          >bookstore website</a>.
+         We are working to update UWT bookstore information to display correct textbooks.
+      </div>
       <ul class="list-unstyled mb-2 myuw-text-md">
         <li v-for="(section, i) in bookData.sections" :key="i"
           class="d-flex mb-2">
@@ -82,6 +94,7 @@ export default {
   computed: {
     ...mapState({
       student: (state) => state.user.affiliations.student,
+      tacoma: (state) => state.user.affiliations.tacoma,
       isBeforeEndOfFirstWeek: (state) =>
         state.cardDisplayDates.is_before_eof_7days_of_term,
     }),

myuw_vue/components/profile/student-profile.vue

@@ -39,15 +39,19 @@
             </template>
           </ul>
         </uw-card-property>
-        <!-- commenting out residency for MUWM-5290
-          <uw-card-property v-if="showResidency" title="Residency">
-              {{residentDisplayString}}
-            <br><a v-out="'About residency statuses'"
-             href="https://registrar.washington.edu/students/residency/"
-             title="About residency statuses"
+        <uw-card-property v-if="showResidency" title="Residency">
+          {{residentDisplayString}}
+          <span v-if="hasPendingResidencyChange"><br>
+            Beginning {{ titleCaseWord(pendingResidencyChangeTerm.quarter) }}
+            {{ pendingResidencyChangeTerm.year }}:
+            Pending change in residency status
+          </span>
+          <br>
+          <a v-out="'About residency statuses'"
+            href="https://registrar.washington.edu/students/residency/"
+            title="About residency statuses"
           >About residency statuses</a>
         </uw-card-property> 
-      -->
       </uw-card-property-group>
       <uw-card-property-group>
         <uw-card-property title="Local Address">
@@ -153,6 +157,8 @@ export default {
       permanentPhone: (state) => state.value.permanent_phone,
       directoryRelease: (state) => state.value.directory_release,
       residentCode: (state) => state.value.resident_code,
+      hasPendingResidencyChange: (state) => state.value.has_pending_residency_change,
+      pendingResidencyChangeTerm: (state) => state.value.pending_residency_change_term,
     }),
     ...mapGetters('profile', {
       isReady: 'isReady',
@@ -180,10 +186,11 @@ export default {
     },
     residentDisplayString(){
       const resValues = ["1", "2"],
-        nonresValues = ["3", "4", "5", "6"];
+        nonresValues = ["3", "4", "6"];
       if(resValues.includes(this.residentCode)){
         return "Resident";
       }
+      if(this.residentCode === "5") return "Non-resident student visa";
       if(nonresValues.includes(this.residentCode)){
         return "Non-resident";
       }

myuw_vue/components/textbooks/textbooks.vue

@@ -1,6 +1,17 @@
 <template>
   <uw-panel :loaded="isReady" :errored="isErrored">
     <template #panel-body>
+      <div v-if="tacoma" class="alert alert-danger myuw-text-md" role="alert">
+        <font-awesome-icon :icon="faExclamationTriangle" />
+        <b>Textbook information on MyUW is currently incorrect due to a change in
+        bookstore vendor</b>.<br>
+        Links to textbooks for each course section can be found on the
+        <a href="https://www.tacoma.uw.edu/ts-quicksearch/application-core/secure/"
+        >UWT Time Schedule Quicksearch</a> or the
+        <a href="https://www.bkstr.com/uwtacomastore/shop/textbooks-and-course-materials"
+        >bookstore website</a>.
+        We are working to update UWT bookstore information to display correct textbooks.
+      </div>
       <div v-if="bookData.teachingSections.length > 0">
         <h2 class="h5">Teaching</h2>
         <hr class="bg-secondary">
@@ -91,6 +102,9 @@ export default {
     };
   },
   computed: {
+    ...mapState({
+      tacoma: (state) => state.user.affiliations.tacoma,
+    }),
     ...mapState('stud_schedule', {
       studSchedule(state) {
         return state.value[this.term];

myuw_vue/tests/mock_data/profile/javg002.json

@@ -32,6 +32,7 @@
   "permanent_phone": "4255556789",
   "visa_type": "F1",
   "veteran_code": "0",
+  "resident_code": "5",
   "is_student": true,
   "is_grad_student": false,
   "degree_status": {
@@ -40,6 +41,11 @@
   },
   "campus": "Seattle",
   "class_level": "SENIOR",
+  "has_pending_residency_change": true,
+  "pending_residency_change_term": {
+    "year": 2013,
+    "quarter": "autumn"
+  },
   "term_majors": [
     {
       "quarter": "spring",

myuw_vue/tests/student-profile.test.js

@@ -8,6 +8,7 @@ import profile from '../vuex/store/profile';
 
 import StudentProfileCard from '../components/profile/student-profile.vue';
 import javg001Profile from './mock_data/profile/javg001.json';
+import javg002Profile from './mock_data/profile/javg002.json';
 
 const localVue = createLocalVue(Vuex);
 
@@ -33,13 +34,20 @@ describe('Student Profile Card', () => {
   });
 
   it('Verify computed properties', async () => {
-    axios.get.mockResolvedValue({data: javg001Profile, status: 200});
+    axios.get.mockResolvedValue({data: javg002Profile, status: 200});
     const wrapper = shallowMount(StudentProfileCard, {store, localVue});
     await new Promise(setImmediate);
 
     expect(wrapper.vm.showCard).toBe(true);
-    expect(wrapper.vm.profile).toBeTruthy();
+    expect(wrapper.vm.showResidency).toBeTruthy();
+    expect(wrapper.vm.residentDisplayString).toBe("Non-resident student visa");
+    expect(wrapper.vm.hasPendingResidencyChange).toBeTruthy();
+    expect(wrapper.vm.pendingResidencyChangeTerm).toBeTruthy();
     expect(wrapper.vm.termMajors).toBeTruthy();
+    expect(wrapper.vm.hasMinors).toBeTruthy();
+    expect(wrapper.vm.termMinors).toBeTruthy();
+    expect(wrapper.vm.localAddress).toBeTruthy();
+    expect(wrapper.vm.permanentAddress).toBeTruthy();
   });
 
   it('addressLocationString()', async () => {

myuw_vue/tests/textbooks.test.js

@@ -42,6 +42,13 @@ describe('Textbook cards', () => {
         inst_schedule,
         textbooks,
       },
+      state: {
+        user: {
+          affiliations: {
+            seattle: true,
+          }
+        }
+      }
     });
   });