Skip to content

Commit

Permalink
Merge branch 'qa' into feature/MUWM-5233
Browse files Browse the repository at this point in the history
  • Loading branch information
fanglinfang committed Jul 11, 2024
2 parents 4a5a324 + 5771f8f commit 158d333
Show file tree
Hide file tree
Showing 44 changed files with 622 additions and 253 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
runs-on: ubuntu-22.04

container:
image: node:14.6.0-stretch
image: node:20

steps:
- name: Checkout Repo
Expand All @@ -183,6 +183,7 @@ jobs:

container:
image: cypress/browsers:node14.16.0-chrome90-ff88
# this image works. later images failed

steps:
- name: Checkout Repo
Expand Down
12 changes: 6 additions & 6 deletions docker/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down
2 changes: 1 addition & 1 deletion docker/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
]
11 changes: 3 additions & 8 deletions myuw/dao/student_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from myuw.dao.degree import get_degrees_json
from myuw.dao.enrollment import (
get_main_campus, get_latest_class_level, get_enrollments_of_terms)
from myuw.dao.gws import is_grad_student
from myuw.dao.pws import get_regid_of_current_user
from myuw.dao.term import get_current_and_next_quarters

Expand Down Expand Up @@ -41,13 +40,9 @@ def get_applicant_profile(request):

def get_student_profile(request):
"""
Returns the JSON response for a student's profile
Returns the JSON response
"""
profile = get_applicant_profile(request)

response = profile
response['is_student'] = True
response['is_grad_student'] = is_grad_student(request)
response = get_applicant_profile(request)

# MUWM-5045
response['degree_status'] = get_degree_status(request)
Expand Down Expand Up @@ -91,7 +86,7 @@ def get_academic_info(request, response):
for term in terms:
if term in enrollments:
enrollment = enrollments[term]
response['class_level'] = enrollment.class_level
response['class_level'] = enrollment.class_level.upper()
break

for term in terms:
Expand Down
6 changes: 3 additions & 3 deletions myuw/data/quicklinks.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions myuw/data/resource_link_import.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -69,7 +69,7 @@ Campus Life,Campus Safety,all,http://www.washington.edu/safecampus/,SafeCampus,,
Campus Life,Campus Safety,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
Campus Life,Campus Safety,all,https://mychem.ehs.washington.edu/,MyChem,,,,,,,no
Campus Life,Campus Safety,all,,,https://www.washington.edu/uwem/,UW Emergency Management,https://www.uwb.edu/emergency,UW Bothell Emergency Page,https://www.tacoma.uw.edu/fa/safety/emergency-preparedness,UW Tacoma Emergency Response,no
Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2024/04/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
Campus Life,Getting Around Campus,all,,,https://transportation.uw.edu/getting-here,Getting to Seattle Campus,http://www.uwb.edu/visitors/directions,Getting to UW Bothell Campus,https://www.tacoma.uw.edu/fa/facilities/transportation/parking-and-transportation-resources#permalink-19448,Getting to UW Tacoma Campus,no
Campus Life,Getting Around Campus,all,,,https://transportation.uw.edu/getting-here/transit/u-pass#u-pass-students,U-PASS for Students,https://www.uwb.edu/commuter-services/transportation/upass,U-PASS,https://www.tacoma.uw.edu/uwt/fa/facilities/transportation/u-pass,U-PASS,no
Campus Life,Getting Around Campus,all,,,https://transportation.uw.edu/getting-here/transit/u-pass#u-pass-faculty-staff,U-PASS for Employees,,,,,no
Expand Down Expand Up @@ -116,7 +116,7 @@ Events and Activities,Student Clubs and Organizations,all,,,https://hub.washingt
"Health, Wellness, & Support",Advocacy and Support,all,https://www.washington.edu/titleix/report/,Make a Title IX report,,,,,,,no
"Health, Wellness, & Support",Health & Wellness,all,https://wellbeing.uw.edu/,Husky Health & Well-Being,,,,,,,no
"Health, Wellness, & Support",Health & Wellness,all,,,http://www.washington.edu/counseling/,Counseling Center,https://www.uwb.edu/student-affairs/counseling,Counseling Services,https://www.tacoma.uw.edu/uwt/caps,Counseling & Psychological Services,no
"Health, Wellness, & Support",Health & Wellness,all,,,https://wellbeing.uw.edu/unit/hall-health/,Hall Health Center,https://www.uwb.edu/arc/hawrc,Health and Wellness Resource Center,https://www.tacoma.uw.edu/sh,Student Health Services (SHS),no
"Health, Wellness, & Support",Health & Wellness,all,,,https://wellbeing.uw.edu/unit/hall-health/,Hall Health Center,https://www.uwb.edu/student-affairs/hawrc,Health and Wellness Resource Center,https://www.tacoma.uw.edu/sh,Student Health Services (SHS),no
"Health, Wellness, & Support",Health & Wellness,all,,,https://wellbeing.uw.edu/unit/livewell/,LiveWell Office,,,,,no
"Health, Wellness, & Support",Health & Wellness,all,,,http://www.washington.edu/ima/,Recreational Sports Programs (IMA),https://www.uwb.edu/arc/,Activities and Recreation Center(ARC),http://www.tacoma.uw.edu/uwy/,Recreation & Fitness,no
"Health, Wellness, & Support",Health & Wellness,all,https://www.washington.edu/wholeu/,Whole U (for staff and faculty),,,,,,,no
Expand Down Expand Up @@ -177,4 +177,4 @@ Research,Research Data and Publishing,all,https://guides.lib.uw.edu/research/spo
Research,Technical Support,all,https://itconnect.uw.edu/help/,UW-IT Technical Support,,,,,,,no
Research,Technical Support,all,https://uw.service-now.com/sp?id=sc_audience&sys_id=bd183bc1db07bb8c37ae9ec6db9619d9&sysparm_category=bd183bc1db07bb8c37ae9ec6db9619d9,UW-IT Services for Researchers,,,,,,,no
Research,Technical Support,all,https://itconnect.uw.edu/research/,UW-IT Research Computing Resources,,,,,,,no
Research,Technical Support,all,https://www.lib.washington.edu/dataservices/tools/storage-options,Data Storage Options,,,,,,,no
Research,Technical Support,all,https://www.lib.washington.edu/dataservices/tools/storage-options,Data Storage Options,,,,,,,no
2 changes: 1 addition & 1 deletion myuw/templates/restclients/customform/_common/netid.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions myuw/templates/restclients/customform/_common/regid.html
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
9 changes: 0 additions & 9 deletions myuw/templates/restclients/customform/book/iacourse.html
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion myuw/templates/restclients/customform/myplan/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions myuw/templates/restclients/customform/sws/advisers.html

This file was deleted.

43 changes: 43 additions & 0 deletions myuw/templates/restclients/customform/sws/course.html
Original file line number Diff line number Diff line change
@@ -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>
13 changes: 0 additions & 13 deletions myuw/templates/restclients/customform/sws/degree.html

This file was deleted.

12 changes: 0 additions & 12 deletions myuw/templates/restclients/customform/sws/notices.html

This file was deleted.

41 changes: 41 additions & 0 deletions myuw/templates/restclients/customform/sws/student.html
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit 158d333

Please sign in to comment.