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

Qa

Author: fanglinfang

myuw/dao/degree_notice.py myuw/dao/category_notice.py

@@ -2,14 +2,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """
-Define graduation card content items as notices so that
+Define card content as categorized notices so that
 they can be marked "new"
 """
 
 from uw_sws.models import Notice
 
 
-GRADUATION_NOTICES = [
+CATEGORIZED_NOTICES = [
     {
         "NoticeCategory": "Degree",
         "NoticeType": "Ceremony",
@@ -54,17 +54,27 @@
             "leaving UW?</span>" +
             "<span class=\"notice-body-with-title\"></span>"
         )
+    },
+    {
+        "NoticeCategory": "Teaching",
+        "NoticeType": "ClassResAccessible",
+        "NoticeContent": (
+            "<span class=\"notice-title\">Are your class resources " +
+            "accessible for all students?</span>" +
+            "<span class=\"notice-body-with-title\"></span>"
+        )
     }
 ]
 
 
-def get_graduation_notices():
+def get_category_notices(category):
     notices = []
-    for notice in GRADUATION_NOTICES:
-        notice_obj = Notice()
-        notice_obj.notice_category = notice.get("NoticeCategory")
-        notice_obj.notice_content = notice.get("NoticeContent")
-        notice_obj.notice_type = notice.get("NoticeType")
-        notice_obj.attributes = []
-        notices.append(notice_obj)
+    for notice in CATEGORIZED_NOTICES:
+        if notice.get("NoticeCategory") == category:
+            notice_obj = Notice()
+            notice_obj.notice_category = notice.get("NoticeCategory")
+            notice_obj.notice_content = notice.get("NoticeContent")
+            notice_obj.notice_type = notice.get("NoticeType")
+            notice_obj.attributes = []
+            notices.append(notice_obj)
     return notices

myuw/dao/notice.py

@@ -10,8 +10,9 @@
 from django.db import IntegrityError
 from uw_sws.notice import get_notices_by_regid
 from myuw.models import UserNotices
-from myuw.dao.degree_notice import get_graduation_notices
+from myuw.dao.category_notice import get_category_notices
 from myuw.dao.enrollment import get_latest_class_level
+from myuw.dao.instructor import is_instructor
 from myuw.dao.pws import get_regid_of_current_user
 from myuw.dao.notice_mapping import categorize_notices
 from myuw.dao.user import get_user_model
@@ -43,13 +44,17 @@ def mark_notices_read_for_current_user(request, notice_hashes):
 
 def get_notices_for_current_user(request):
     notices = []
+    if is_instructor(request):
+        # MUWM-5199
+        notices += categorize_notices(get_category_notices("Teaching"))
+
     if is_student(request):
         notices += _get_notices_by_regid(get_regid_of_current_user(request))
 
         # MUWM-5065
         class_level = get_latest_class_level(request)
         if class_level and class_level.upper() == 'SENIOR':
-            notices += categorize_notices(get_graduation_notices())
+            notices += categorize_notices(get_category_notices("Degree"))
 
     notices += categorize_notices(get_myuw_notices_for_user(request))
     return _get_user_notices(request, notices)

myuw/dao/notice_categorization.py

@@ -403,5 +403,10 @@
         "myuw_category": "Graduation NextDestination",
         "location_tags": ['graduation'],
         "critical": False
+    },
+    "teaching_classresaccessible": {
+        "myuw_category": "Teaching ClassResAccessible",
+        "location_tags": ['teaching_summary'],
+        "critical": False
     }
 }

myuw/test/api/test_instructor_schedule.py

@@ -60,7 +60,7 @@ def test_bill_current_term(self):
                          'https://canvas.uw.edu/courses/149651')
         self.assertEqual(section1['limit_estimate_enrollment'], 15)
         self.assertEqual(section1['final_exam']['latitude'],
-                         '47.653693')
+                         47.6536929997)
         self.assertEqual(
             section1["email_list"]['section_list']['list_address'],
             'ess102a_sp13')
@@ -102,8 +102,8 @@ def test_billseata_current_term(self):
         data = json.loads(resp.content)
         # MUWM-4085
         final = data['sections'][0]['final_exam']
-        self.assertTrue(len(final['longitude']) > 0)
-        self.assertTrue(len(final['latitude']) > 0)
+        self.assertTrue(final['longitude'])
+        self.assertTrue(final['latitude'])
 
 
 @require_url('myuw_instructor_schedule_api',
@@ -194,7 +194,7 @@ def test_bill_section(self):
             data['sections'][0]['limit_estimate_enrollment'], 15)
         self.assertEqual(
             data['sections'][0]['final_exam']['latitude'],
-            '47.653693')
+            47.6536929997)
         self.assertEqual(data['sections'][0]['canvas_url'],
                          'https://canvas.uw.edu/courses/149651')
         self.assertEqual(

myuw/test/api/test_instructor_section.py

@@ -85,7 +85,7 @@ def test_bill_section(self):
         self.assertEqual(
             data['sections'][0]['limit_estimate_enrollment'], 15)
         self.assertEqual(
-            data['sections'][0]['final_exam']['latitude'], '47.653693')
+            data['sections'][0]['final_exam']['latitude'], 47.6536929997)
         self.assertEqual(data['sections'][0]['canvas_url'],
                          'https://canvas.uw.edu/courses/149651')
         self.assertEqual(
@@ -186,7 +186,7 @@ def test_bill_section(self):
         self.assertEqual(
             data['sections'][0]['limit_estimate_enrollment'], 15)
         self.assertEqual(
-            data['sections'][0]['final_exam']['latitude'], '47.653693')
+            data['sections'][0]['final_exam']['latitude'], 47.6536929997)
         self.assertEqual(data['sections'][0]['canvas_url'],
                          'https://canvas.uw.edu/courses/149651')
         self.assertEqual(

myuw/test/dao/test_building.py

@@ -14,13 +14,13 @@ class TestBuildings(TestCase):
 
     def test_get_by_code(self):
         building = get_building_by_code('PAA')
-        self.assertEquals(building.longitude, '-122.304747')
+        self.assertEquals(building.longitude, -122.304747)
         self.assertEquals(
             building.json_data(),
             {
                 'code': 'PAA',
-                'latitude': '47.653693',
-                'longitude': '-122.304747',
+                'latitude': 47.6536929997,
+                'longitude': -122.304747,
                 'name': 'Mechanical Engineering Building',
                 'number': '1347'
             })

myuw/test/dao/test_category_notice.py

@@ -0,0 +1,31 @@
+# Copyright 2022 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
+from django.test import TestCase
+from myuw.dao.category_notice import get_category_notices
+from myuw.dao.notice_mapping import categorize_notices
+
+
+class TestDegreeNotices(TestCase):
+
+    def test_get_category_notices(self):
+        notices = get_category_notices("Degree")
+        self.assertEquals(len(notices), 5)
+        self.assertEquals(notices[0].notice_category, "Degree")
+
+        final_notices = categorize_notices(notices)
+        for notice in final_notices:
+            print(notice)
+            self.assertTrue('Graduation' in notice.custom_category)
+            self.assertEquals(notice.location_tags[0], 'graduation')
+            self.assertFalse(notice.is_critical)
+
+        notices = get_category_notices("Teaching")
+        self.assertEquals(len(notices), 1)
+
+        final_notices = categorize_notices(notices)
+        for notice in final_notices:
+            print(notice)
+            self.assertTrue('Teaching' in notice.custom_category)
+            self.assertEquals(notice.location_tags[0], 'teaching_summary')
+            self.assertFalse(notice.is_critical)

myuw/test/dao/test_degree_notice.py

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

myuw/test/dao/test_notice_categorization.py

@@ -1153,15 +1153,15 @@ def test_building_map_uri(self):
         self.assertEqual(len(schedule_json['periods']), 2)
         meeting = schedule_json['periods'][0]['sections'][0]['meetings'][0]
         # MUWM-3981
-        self.assertEqual(meeting['latitude'], "47.653693")
-        self.assertEqual(meeting['longitude'], "-122.304747")
+        self.assertEqual(meeting['latitude'], 47.6536929997)
+        self.assertEqual(meeting['longitude'], -122.304747)
         self.assertEqual(
             meeting['building_name'],
             "Mechanical Engineering Building")
         # MUWM_596
         final = schedule_json['periods'][1]['sections'][0]['final_exam']
-        self.assertEqual(final['latitude'], "47.653693")
-        self.assertEqual(final['longitude'], "-122.304747")
+        self.assertEqual(final['latitude'], 47.6536929997)
+        self.assertEqual(final['longitude'], -122.304747)
         self.assertEqual(
             final['building_name'],
             "Mechanical Engineering Building")

myuw/test/dao/test_visual_schedule.py

@@ -10,28 +10,46 @@ class TestBuilding(MyuwApiTest):
     def test_building(self):
         fac_obj = Facilities().search_by_number("1347")
         b_obj = CampusBuilding.upd_building(fac_obj)
-        self.assertEquals(b_obj.latitude, '47.653693')
-        self.assertEquals(b_obj.longitude, '-122.304747')
+        self.assertEquals(b_obj.latitude, 47.6536929997)
+        self.assertEquals(b_obj.longitude, -122.304747)
         self.assertEquals(b_obj.name, "Mechanical Engineering Building")
         self.assertEquals(b_obj.code, 'MEB')
         self.assertEquals(b_obj.number, '1347')
         self.assertEquals(
             b_obj.json_data(),
             {
                 'code': 'MEB',
-                'latitude': '47.653693',
-                'longitude': '-122.304747',
+                'latitude': 47.6536929997,
+                'longitude': -122.304747,
                 'name': 'Mechanical Engineering Building',
                 'number': '1347',
             }
         )
         self.assertIsNotNone(str(b_obj))
 
         obj1 = CampusBuilding.get_building_by_code('MEB')
-        self.assertEquals(b_obj, obj1)
+        self.assertEquals(
+            obj1.json_data(),
+            {
+                'code': 'MEB',
+                'latitude': '47.6536929997',
+                'longitude': '-122.304747',
+                'name': 'Mechanical Engineering Building',
+                'number': '1347',
+            }
+        )
 
         obj2 = CampusBuilding.get_building_by_number('1347')
-        self.assertEquals(b_obj, obj2)
+        self.assertEquals(
+            obj2.json_data(),
+            {
+                'code': 'MEB',
+                'latitude': '47.6536929997',
+                'longitude': '-122.304747',
+                'name': 'Mechanical Engineering Building',
+                'number': '1347',
+            }
+        )
 
         self.assertTrue(CampusBuilding.exists('MEB'))
         self.assertTrue(CampusBuilding.exists_by_number('1347'))

myuw/test/model/test_campus_building.py

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import Collapse from '../../_templates/collapse.vue';
+import Collapse from '../_templates/collapse.vue';
 import {mapActions} from 'vuex';
 export default {
   components: {
@@ -61,5 +61,5 @@ export default {
 </script>
 <style lang="scss" scoped>
 @use "sass:map";
-@import '../../../../myuw/static/css/myuw/variables.scss';
+@import '../../../myuw/static/css/myuw/variables.scss';
 </style>

myuw_vue/components/home/graduation/collapsed-item.vue myuw_vue/components/_common/collapsed-item.vue

@@ -137,6 +137,14 @@
           <div v-if="hasGrantedDegree">
             <h3 class="h6 myuw-font-encode-sans">Post-Graduation Success</h3>
             <ul class="list-style myuw-text-md">
+              <li>
+                Ensure that all information on your
+                <a href="https://sdb.admin.uw.edu/sisStudents/uwnetid/untranscript.aspx"
+                  >unofficial transcript</a
+                > is correct &#8211; any degrees, major and minor types. If anything is incorrect,
+                  contact the registrar&apos;s office and your academic advisor within 45 days of
+                  your degree being granted.
+              </li>
               <li>
                 Get guidance and resources for
                 <a href="https://www.washington.edu/graduation/after-graduation/"
@@ -229,21 +237,25 @@
                 <uw-collapsed-item :notice="degreeDiploma">
                   <template #notice-body>
                     <p>
-                      The Office of the University Registrar will send you an email about one month
-                      after graduation with the link to a form where you can log in and enter your
-                      diploma name and diploma mailing address.
+                      You can use the
+                      <a href="https://registrar.washington.edu/diploma-name/">
+                      Diploma Name and Address form</a>
+                       to update your diploma name and mailing address until the registrar&apos;s
+                       office places the diploma order for your quarter of graduation &#8211;
+                       approximately one month after your degree is granted.
                     </p>
                     <p>
-                      If you do not submit the form by the deadline given in the email, the name on
-                      your diploma will default to the name on your official student record which
-                      may vary from your preferred name.
+                      We urge you to update your information now. If you do not update your diploma
+                      name and address within this timeframe, information from your student record
+                      will be used to issue and mail your diploma.
                     </p>
                     <p>
-                      For more information about diplomas, visit the
+                      For more information about diplomas, including shipping time and CeDiplomas,
+                      visit the
                       <a href="https://registrar.washington.edu/students/graduation-diplomas/"
                         >Graduations and Diplomas</a
                       >
-                      site.
+                      page.
                     </p>
                   </template>
                 </uw-collapsed-item>
@@ -447,7 +459,7 @@
 import { mapGetters, mapState, mapActions } from 'vuex';
 import { faChevronUp, faChevronDown } from '@fortawesome/free-solid-svg-icons';
 import Card from '../../_templates/card.vue';
-import CollapsedItem from './collapsed-item.vue';
+import CollapsedItem from '../../_common/collapsed-item.vue';
 import Collapse from '../../_templates/collapse.vue';
 import Feedback from '../../_templates/feedback.vue';