Merge branch 'qa' into fix/MUWM-5349

uw-it-aca · Jul 10, 2024 · 8d57d90 · 8d57d90
2 parents 74048e7 + 964bd34
commit 8d57d90
Show file tree

Hide file tree

Showing 21 changed files with 392 additions and 148 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -183,6 +183,7 @@ jobs:
 
     container:
       image: cypress/browsers:node14.16.0-chrome90-ff88
+      # this image works. later images failed
 
     steps:
       - name: Checkout Repo

diff --git a/docker/settings.py b/docker/settings.py
@@ -10,15 +10,15 @@
 
 INSTALLED_APPS += [
     'uw_oidc',
-    'compressor',
-    'django_client_logger',
     'django_user_agents',
-    'hx_toolkit',
-    'persistent_message',
-    'rc_django',
-    'userservice',
     'supporttools',
+    'userservice',
+    'rc_django',   # after supporttools
+    'persistent_message',
     'blti',
+    'hx_toolkit',
+    'compressor',
+    'django_client_logger',
     'myuw.apps.MyUWConfig',
     'webpack_loader',
 ]

diff --git a/docker/urls.py b/docker/urls.py
@@ -6,9 +6,9 @@
 
 
 urlpatterns += [
+    re_path(r'^', include('myuw.urls')),
     re_path(r'^support', include('userservice.urls')),
     re_path(r'^restclients/', include('rc_django.urls')),
     re_path(r'^persistent_message/', include('persistent_message.urls')),
     re_path(r'^logging/', include('django_client_logger.urls')),
-    re_path(r'^', include('myuw.urls')),
 ]
diff --git a/myuw/data/quicklinks.csv b/myuw/data/quicklinks.csv
@@ -15,11 +15,11 @@ http://www.washington.edu/students/timeschd/T/,Time Schedule - Tacoma,tacoma,stu
 http://www.washington.edu/students/timeschd/95index.html,Time Schedule - PCE,,student,yes
 https://wellbeing.uw.edu/,Husky Health & Well-Being,seattle,student,
 https://scout.uw.edu,Scout,,student,
-https://gsuite.google.com/dashboard,Google Apps,,student,
+https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,student,
 https://www.office.com/,Office 365 Apps,,student,
-https://gsuite.google.com/dashboard,Google Apps,,faculty,
+https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,faculty,
 https://www.office.com/,Office 365 Apps,,faculty,
-https://gsuite.google.com/dashboard,Google Apps,,employee,
+https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,employee,
 https://www.office.com/,Office 365 Apps,,employee,
 https://washington.zoom.us/,Zoom,,,
 https://uwnetid.washington.edu/manage/?forward,Email Forwarding,,alumni,

diff --git a/myuw/data/resource_link_import.csv b/myuw/data/resource_link_import.csv
@@ -37,7 +37,7 @@ Academics,Tools and Software,all,https://uw.hosted.panopto.com/,Panopto Lecture
 Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Other Software and Hardware Services,,,,,,,no
 Academics,Tools and Software,all,https://itconnect.uw.edu/learn/tools/,Help with Teaching and Learning Tools,,,,,,,no
 Academics,Tools and Software,all,http://www.linkedinlearning.uw.edu/,LinkedIn Learning,,,,,,,no
-Academics,Tools and Software,all,https://gsuite.google.com/dashboard,Google Apps,,,,,,,no
+Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,,,,,,no
 Academics,Tools and Software,all,https://www.office.com/,Office 365 Apps,,,,,,,no
 "Email, and Accounts and Identity",Email,all,https://outlook.office365.com/uw.edu,UW Office 365 Email,,,,,,,no
 "Email, and Accounts and Identity",Email,all,http://mail.google.com/a/uw.edu,UW Gmail,,,,,,,no

diff --git a/myuw/templates/restclients/customform/_common/netid.html b/myuw/templates/restclients/customform/_common/netid.html
@@ -2,7 +2,7 @@
 {% csrf_token %}
   <p>
     <label for="uwnetid">UW NetID:</label>
-    <input id="uwnetid" name="uwnetid" size="64" type="text">
+    <input id="uwnetid" name="uwnetid" size="20" type="text">
   </p>
   <p>
     <input value="Submit" type="submit">

diff --git a/myuw/templates/restclients/customform/_common/regid.html b/myuw/templates/restclients/customform/_common/regid.html
@@ -1,8 +1,8 @@
 <form method="post" action="{{form_action}}">
 {% csrf_token %}
   <p>
-    <label for="uwregid">UW RegID:</label>
-    <input id="uwregid" name="uwregid" size="40" type="text">
+    <label for="uwregid">UW NetID or RegID:</label>
+    <input id="uwregid" name="uwregid" size="32" type="text">
   </p>
   <p>
     <input value="Submit" type="submit">

diff --git a/myuw/templates/restclients/customform/book/iacourse.html b/myuw/templates/restclients/customform/book/iacourse.html
@@ -1,11 +1,2 @@
 <h1>University Bookstore Inclusive Access Course Materials</h1>
 {% include "restclients/customform/_common/regid.html" %}
-
-<h2>Regids:</h2>
-<ul>
-  <li>javerage: 9136CCB8F66711D5BE060004AC494FFE</li>
-  <li>jbothell: FE36CCB8F66711D5BE060004AC494FCD</li>
-  <li>jinter: 9136CCB8F66711D5BE060004AC494F31</li>
-  <li>jnew: FE36CCB8F66711D5BE060004AC494F31</li>
-  <li>eight: 12345678901234567890123456789012</li>
-</ul>
diff --git a/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html b/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html
@@ -1,4 +1,4 @@
 <div>
-    <label for="id">Student System Key:</label>
-    <input id="id" name="id" type="text" size="10" >
+    <label for="id">UW NetID:</label>
+    <input id="id" name="id" type="text" size="20" >
 </div>
diff --git a/myuw/templates/restclients/customform/iasystem/evaluation.html b/myuw/templates/restclients/customform/iasystem/evaluation.html
@@ -27,10 +27,10 @@
     <input class="" id="year" name="year" value="{{search.year}}" size="4">
     </p>
     <p>
-    <label for="instructor_id">Instructor Employee ID:</label>
+    <label for="instructor_id">Instructor EmployeeID or UWNetID:</label>
     <input class="" id="instructor_id" name="instructor_id" value="{{search.instructor_id}}" size="10">
     </p>
-    <label for="student_id">Student Number:</label>
+    <label for="student_id">Student Number or UWNetID:</label>
     <input class="" id="student_id" name="student_id" value="{{search.student_id}}" size="10">
     </p>
     <input value="Search" type="submit">

diff --git a/myuw/templates/restclients/customform/myplan/index.html b/myuw/templates/restclients/customform/myplan/index.html
@@ -2,7 +2,7 @@ <h1>MyPlan</h1>
 <form method="post" action="{{form_action}}">
 {% csrf_token %}
   <p>
-    <label for="uwregid">UW RegID:</label>
+    <label for="uwregid">UW NetID or RegID:</label>
     <input id="uwregid" name="uwregid" size="40" type="text">
   </p>
   <p>

diff --git a/myuw/templates/restclients/customform/sws/advisers.html b/myuw/templates/restclients/customform/sws/advisers.html
diff --git a/myuw/templates/restclients/customform/sws/course.html b/myuw/templates/restclients/customform/sws/course.html
@@ -0,0 +1,43 @@
+<h1>SWS Section</h1>
+
+<form method="post" action="{{form_action}}">
+  {% csrf_token %}
+  <p>
+    <b>For</b>
+    <label for="year">Year:</label>
+    <input class="year" id="year" name="year" value="" size="4">
+    and
+    <label for="quarter">Quarter:</label> 
+    <select class="quarter" id="quarter" name="quarter">
+      <option value="">select...</option>
+      <option value="winter">winter</option>
+      <option value="spring">spring</option>
+      <option value="summer">summer</option>
+      <option value="autumn">autumn</option>
+    </select>
+  </p>
+  <p><b>Find using</b> (at least one of the following)</p>
+  <ul>
+  <li>
+    <label for="curriculum_abbreviation">Curriculum Abbreviation:</label>
+    <input class="curriculum_abbreviation"
+      id="curriculum_abbreviation" name="curriculum_abbreviation" value=""
+       type="text" size="8">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <label for="course_number">Course number:</label>
+    <input class="course_number" id="course_number" name="course_number"
+      value="" type="text" size="3">
+  </li>
+  <li>
+    <label for="sln">SLN:</label>
+    <input class="sln" id="sln" name="sln" value="" type="text" size="7">
+  </li>
+  <li>
+    <label for="uwregid">By instructor's NetID or RegID:</label>
+    <input id="uwregid" name="uwregid" size="32" type="text">
+  </li>
+  </ul>
+  <br />
+  <p>
+    <input value="Submit" type="submit">
+  </p>
+</form>
diff --git a/myuw/templates/restclients/customform/sws/degree.html b/myuw/templates/restclients/customform/sws/degree.html
diff --git a/myuw/templates/restclients/customform/sws/notices.html b/myuw/templates/restclients/customform/sws/notices.html
diff --git a/myuw/templates/restclients/customform/sws/student.html b/myuw/templates/restclients/customform/sws/student.html
@@ -0,0 +1,41 @@
+<h1>SWS Student</h1>
+
+<form method="post" action="{{form_action}}">
+  {% csrf_token %}
+  <p>
+    <b>For</b>
+    <label for="uwregid">UW NetID or RegID:</label>
+    <input id="uwregid" name="uwregid" size="32" type="text">
+  </p>
+  <p>Find any of the following:</p>
+  <fieldset>
+    <div>
+      <input type="radio" id="res" name="res" value="adviser" />
+      <label for="res">Advisers</label>
+    </div>
+    <div>
+      <input type="radio" id="res" name="res" value="degree" />
+      <label for="res">Degrees</label>
+    </div>
+    <div>
+      <input type="radio" id="res" name="res" value="enrollment" />
+      <label for="res">Enrollments</label>
+    </div>
+    <div>
+      <input type="radio" id="res" name="res" value="financial" />
+      <label for="res">Financial</label>
+    </div>
+    <div>
+      <input type="radio" id="res" name="res" value="person" />
+      <label for="res">Person</label>
+    </div>
+    <div>
+      <input type="radio" id="res" name="res" value="notice" />
+      <label for="res">Notices</label>
+    </div>
+  </fieldset>
+  <br />
+  <p>
+    <input value="Submit" type="submit">
+  </p>
+</form>
diff --git a/myuw/templates/supporttools/custom_sidebar_links.html b/myuw/templates/supporttools/custom_sidebar_links.html
@@ -33,21 +33,18 @@ <h3>Content Management</h3>
 
     <h3>Web Services</h3>
     <ul>
-        {% url 'restclients_proxy' 'sws' 'student/v5.json' as sws_url %}
-        {% if sws_url %}
-            <li><a href="{{ sws_url }}">{{ restclients_sws_link|default:"Browse Student Web Service" }}</a></li>
-        {% endif %}
-
-        {% url 'restclients_proxy' 'pws' 'identity/v2.json' as pws_url %}
-        {% if pws_url %}
-            <li><a href="{{ pws_url }}">{{ restclients_pws_link|default:"Browse Person Web Service" }}</a></li>
+        {% url 'myuw_rest_search' 'sws' 'course.html' as course_url %}
+        {% if course_url %}
+        <li>
+            <a href="{{ course_url }}">SWS Course</a>
+        </li>
         {% endif %}
-
-        {% url 'restclients_proxy' 'gws' 'group_sws/v3/search' as gws_url %}
-        {% if gws_url %}
-            <li><a href="{{ gws_url }}">
-                {{ restclients_gws_link|default:"Search Groups Web Service" }}</a>
-            </li>
+        
+        {% url 'myuw_rest_search' 'sws' 'student.html' as student_url %}
+        {% if student_url %}
+        <li>
+            <a href="{{ student_url }}">SWS Student</a>
+        </li>
         {% endif %}
 
         {% url 'myuw_rest_search' 'hfs' 'accounts.html' as hfs_url %}
@@ -57,20 +54,20 @@ <h3>Web Services</h3>
             </li>
         {% endif %}
 
+        {% url 'myuw_rest_search' 'book' 'iacourse.html' as iacourse_url %}
+        {% if iacourse_url %}
+        <li>
+            <a href="{{ iacourse_url }}">IA Course Digital Materials</a>
+        </li>
+        {% endif %}
+
         {% url 'myuw_rest_search' 'iasystem' 'index.html' as ias_url %}
         {% if ias_url %}
             <li><a href="{{ ias_url }}">
                 {{ restclients_iasystem_link|default:"IASystem Course Eval" }}</a>
             </li>
         {% endif %}
 
-        {% url 'restclients_proxy' 'pws' 'idcard/v1/photo' as idcard_url %}
-        {% if idcard_url %}
-            <li><a href="{{ idcard_url }}">
-                {{ restclients_pws_link|default:"ID Photo Search" }}</a>
-            </li>
-        {% endif %}
-
         {% url 'myuw_rest_search' 'libcurrics' 'index.html' as libcurrics_url %}
         {% if libcurrics_url %}
             <li>
@@ -99,27 +96,6 @@ <h3>Web Services</h3>
             </li>
         {% endif %}
 
-        {% url 'myuw_rest_search' 'sws' 'notices.html' as notices_url %}
-        {% if notices_url %}
-            <li>
-                <a href="{{ notices_url }}">Notices</a>
-            </li>
-        {% endif %}
-
-        {% url 'myuw_rest_search' 'sws' 'advisers.html' as advisers_url %}
-        {% if advisers_url %}
-            <li>
-                <a href="{{ advisers_url }}">Undergrad Academic Advisers</a>
-            </li>
-        {% endif %}
-
-        {% url 'myuw_rest_search' 'sws' 'degree.html' as degree_url %}
-        {% if degree_url %}
-        <li>
-            <a href="{{ degree_url }}">Undergrad Degree Status</a>
-        </li>
-        {% endif %}
-
         {% url 'myuw_rest_search' 'uwnetid' 'password.html' as pw_url %}
         {% if pw_url %}
             <li>
@@ -141,19 +117,36 @@ <h3>Web Services</h3>
             </li>
         {% endif %}
 
-        {% url 'myuw_rest_search' 'book' 'iacourse.html' as iacourse_url %}
-        {% if iacourse_url %}
-        <li>
-            <a href="{{ iacourse_url }}">IA Courses</a>
-        </li>
-        {% endif %}
-
         {% url 'myuw_rest_search' 'upass' 'index.html' as upass_url %}
         {% if upass_url %}
             <li>
                 <a href="{{ upass_url }}">UPASS</a>
             </li>
         {% endif %}
+        <br />
+        {% url 'restclients_proxy' 'sws' 'student/v5.json' as sws_url %}
+        {% if sws_url %}
+        <li><a href="{{ sws_url }}">{{ restclients_sws_link|default:"Browse Student Web Service" }}</a></li>
+        {% endif %}
+
+        {% url 'restclients_proxy' 'pws' 'identity/v2.json' as pws_url %}
+        {% if pws_url %}
+        <li><a href="{{ pws_url }}">{{ restclients_pws_link|default:"Browse Person Web Service" }}</a></li>
+        {% endif %}
+
+        {% url 'restclients_proxy' 'gws' 'group_sws/v3/search' as gws_url %}
+        {% if gws_url %}
+        <li><a href="{{ gws_url }}">
+                {{ restclients_gws_link|default:"Search Groups Web Service" }}</a>
+        </li>
+        {% endif %}
+
+        {% url 'restclients_proxy' 'pws' 'idcard/v1/photo' as idcard_url %}
+        {% if idcard_url %}
+        <li><a href="{{ idcard_url }}">
+                {{ restclients_pws_link|default:"ID Photo Search" }}</a>
+        </li>
+        {% endif %}
 
         <br />
         {% url 'restclients_errors' as url %}