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

Qa

myuw/test/views/test_teaching.py

@@ -17,6 +17,19 @@ def test_instrucor_access(self):
             HTTP_USER_AGENT="Lynx/2.8.2rel.1 libwww-FM/2.14")
         self.assertEqual(response.status_code, 200)
 
+    @skipIf(missing_url("myuw_teaching_page",
+                        kwargs={}), "myuw urls not configured")
+    def test_current_quarter_access(self):
+        url = reverse("myuw_teaching_page", kwargs={})
+        self.set_user('bill')
+        response = self.client.get(
+            url,
+            HTTP_USER_AGENT="Lynx/2.8.2rel.1 libwww-FM/2.14")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['display_term']["year"], 2013)
+        self.assertEqual(
+            response.context['display_term']["quarter"], 'spring')
+
     @skipIf(missing_url("myuw_teaching_page",
                         kwargs={'year': '2013', 'quarter': 'summer'}),
             "myuw urls not configured")

myuw/urls.py

@@ -293,6 +293,8 @@
             student_photo_list, name="myuw_photo_list"),
     re_path(r'^teaching/(?P<year>2[0-9]{3}),(?P<quarter>[a-z]+)$',
             teaching, name="myuw_teaching_page"),
+    # MUWM-5363
+    re_path(r'^teaching/current$', teaching, name="myuw_teaching_page"),
     re_path(r'^teaching/?$', teaching, name="myuw_teaching_page"),
     re_path(r'^notices/?', notices, name="myuw_notices_page"),
     re_path(r'^thrive_messages/?', thrive_messages,

myuw/views/teaching.py

@@ -1,6 +1,7 @@
 # Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
+from myuw.dao.term import get_current_quarter
 from myuw.views.page import page
 from myuw.util.page_view import page_view
 
@@ -9,7 +10,12 @@
 def teaching(request,
              year=None,
              quarter=None):
-    context = get_context(year, quarter)
+    if year is None and quarter is None:
+        # MUWM-5363
+        term = get_current_quarter(request)
+        context = get_context(term.year, term.quarter)
+    else:
+        context = get_context(year, quarter)
     return page(request, 'teaching.html', context=context)
 
 

myuw_vue/components/teaching/classlist/photo-list.vue

@@ -6,7 +6,7 @@
     <h3 class="visually-hidden">
       Grid of Student Photos
     </h3>
-    <div class="sort-buttons myuw-text-md">
+    <!--div class="sort-buttons myuw-text-md">
       <span class="py-1" style=""><strong>Sort by:</strong></span><button
         v-for="field in fields"
         :key="field.key"
@@ -16,7 +16,7 @@
       >
         {{ field.label }}
       </button>
-    </div>
+    </div -->
     <ol class="list-unstyled d-flex flex-wrap">
       <li v-for="(reg, i) in sortedRegistrations"
           :id="`student-photo-${reg.regid}`"