Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revising static notices messaging & styles #3147

Merged
merged 25 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -88,10 +88,10 @@ jobs:
exclude_paths: 'migrations'

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-$(echo ${{ hashFiles('Dockerfile') }} | head -c 16)
Expand All @@ -107,7 +107,7 @@ jobs:
run: echo "VUE_DEVTOOLS=True" >> $GITHUB_ENV

- name: Build App Image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
target: app-container
tags: ${{ needs.context.outputs.image_tag }}
Expand All @@ -118,7 +118,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache

- name: Build Test Image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
target: app-test-container
tags: app-test-container
Expand Down Expand Up @@ -147,10 +147,18 @@ jobs:
image_tag: ${{ needs.context.outputs.image_tag }}
gcp_json_key: ${{ secrets.GCP_JSON_KEY }}

- uses: actions/upload-artifact@v3
- name: Change ownership of coverage files
run: sudo chown runner:docker .coverage.*

- name: List all files in the workspace
run: ls -la

- name: Upload Python Coverage
uses: actions/upload-artifact@v4
with:
name: python-coverage
path: .coverage.*
include-hidden-files: true

outputs:
image_tag: ${{ steps.cicd.outputs.image_tag }}
Expand All @@ -163,9 +171,9 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -187,9 +195,9 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -218,7 +226,7 @@ jobs:
apt install lcov -y
lcov -a lcov-jest.info -a coverage/lcov.info -o lcov.info

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: jest-cypress-coverage
path: lcov.info
Expand All @@ -229,25 +237,25 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: python-coverage

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: jest-cypress-coverage

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Set up Ruby 2.6
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.3.5

- name: Record Test Results
env:
Expand All @@ -272,7 +280,7 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deployment Pipeline
if: >-
Expand Down
2 changes: 1 addition & 1 deletion docker/prod-values.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
autoscaling:
enabled: true
minReplicas: 3
minReplicas: 4
maxReplicas: 120
targetAverageUtilization: 100
resources:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"Current": {
"Address": null,
"AlumAffiliationState": null,
"ChangedSinceDate": null,
"Department": null,
"DevelopmentID": null,
"DisplayName": null,
"EduPersonAffiliationAffiliate": false,
"EduPersonAffiliationAlum": false,
"EduPersonAffiliationEmployee": false,
"EduPersonAffiliationFaculty": false,
"EduPersonAffiliationMember": false,
"EduPersonAffiliationStaff": false,
"EduPersonAffiliationStudent": false,
"Email": null,
"EmployeeAffiliationState": null,
"EmployeeID": null,
"FirstName": null,
"HomeDepartment": null,
"Href": "/identity/v2/person.json?uwregid=&uwnetid=&employee_id=&student_number=1033334&student_system_key=&development_id=&last_name=&first_name=&display_name=&edupersonaffiliation_student=&edupersonaffiliation_staff=&edupersonaffiliation_faculty=&edupersonaffiliation_employee=&edupersonaffiliation_member=&edupersonaffiliation_alum=&edupersonaffiliation_affiliate=&changed_since_date=&phone_number=&mail_stop=&home_dept=&department=&address=&title=&email=&alumAffiliationState=&employeeAffiliationState=&studentAffiliationState=&verbose=on&page_size=10&page_start=1",
"LastName": null,
"MailStop": null,
"PageSize": "10",
"PageStart": "1",
"PhoneNumber": null,
"StudentAffiliationState": null,
"StudentNumber": "1033334",
"StudentSystemKey": null,
"Title": null,
"UWNetID": null,
"UWRegID": null,
"Verbose": true
},
"Next": null,
"PageSize": "10",
"PageStart": "1",
"Persons": [
{
"DisplayName": "Jamesian McMiddle Average",
"EduPersonAffiliations": [
"alum",
"employee",
"member",
"staff",
"student"
],
"IsTestEntity": true,
"PersonAffiliations": {
"AlumPersonAffiliation": {
"AlumAffiliationState": "current",
"DevelopmentID": "0000773877"
},
"EmployeePersonAffiliation": {
"EmployeeAffiliationState": "current",
"EmployeeID": "123456789",
"EmployeeWhitePages": {
"Addresses": [],
"EmailAddresses": [],
"Faxes": [],
"Mobiles": [],
"Name": "Average, Jamesian McMiddle",
"Pagers": [],
"Phones": [],
"Positions": [],
"PublishInDirectory": false,
"TouchDials": [],
"VoiceMails": []
},
"HomeDepartment": "C&C TEST BUDGET",
"MailStop": null
},
"StudentPersonAffiliation": {
"StudentAffiliationState": "current",
"StudentNumber": "1033334",
"StudentSystemKey": "000083856",
"StudentWhitePages": {
"Class": null,
"Departments": [],
"Email": null,
"Name": "Average, Jamesian McMiddle",
"Phone": null,
"PublishInDirectory": false
}
}
},
"PreferredFirstName": "Jamesian",
"PreferredMiddleName": "McMiddle",
"PreferredSurname": "Average",
"PriorUWNetIDs": [],
"PriorUWRegIDs": [],
"Pronouns": "they/them/theirs",
"RegisteredFirstMiddleName": "JAMES AVERAGE",
"RegisteredName": "JAMES AVERAGE STUDENT",
"RegisteredSurname": "STUDENT",
"RepositoryTimeStamp": "6/6/2024 4:53:02 PM",
"UIDNumber": "35443",
"UWNetID": "javerage",
"UWRegID": "9136CCB8F66711D5BE060004AC494FFE",
"WhitepagesPublish": false
}
],
"Previous": null,
"TotalCount": 1
}
2 changes: 1 addition & 1 deletion myuw/templates/restclients/customform/sws/student.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1>SWS Student</h1>
{% csrf_token %}
<p>
<b>For</b>
<label for="uwregid">UW NetID or RegID:</label>
<label for="uwregid">UW NetID, student number or RegID:</label>
<input id="uwregid" name="uwregid" size="32" type="text">
</p>
<p>Find any of the following:</p>
Expand Down
2 changes: 2 additions & 0 deletions myuw/test/views/test_rest_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ class RestSearchViewTest(MyuwApiTest):
def test_get_regid(self):
self.assertEqual(
get_regid("javerage"), "9136CCB8F66711D5BE060004AC494FFE")
self.assertEqual(
get_regid("1033334"), "9136CCB8F66711D5BE060004AC494FFE")
self.assertEqual(
get_regid("9136CCB8F66711D5BE060004AC494FFE"),
"9136CCB8F66711D5BE060004AC494FFE")
Expand Down
2 changes: 2 additions & 0 deletions myuw/views/rest_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ def get_input_value(post_req, name):
def get_regid(userid):
if userid and len(userid) == 32:
return userid
if userid and len(userid) == 7 and userid.isdigit():
return pws.get_person_by_student_number(userid).uwregid
return pws.get_person_by_netid(userid).uwregid


Expand Down
37 changes: 22 additions & 15 deletions myuw_vue/components/home/new_student/to-register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@
:icon="faInfoCircle"
class="me-3 mt-1 text-mid-beige myuw-text-lg"
/>
<div class="mb-1"><span class="myuw-font-encode-sans">Required Immunizations</span>
<span class="text-muted fw-light fst-italic myuw-text-sm px-2">(Item does not reflect
completion status)</span>
<div class="mb-1">
<span class="myuw-font-encode-sans">Reminder: Required Immunizations</span>
<span class="myuw-text-md d-block">
(<em>Note:</em> This message is shown even if you have completed this step.)
</span>
<button
v-uw-collapse.measlesimmunization
type="button"
Expand All @@ -77,8 +79,8 @@
through vaccinations or lab evidence of positive titer. Students ages 16
through 21 also are required to show proof of a Meningitis ACWY vaccination
taken at 16 years old or older.
<a href="https://wellbeing.uw.edu/medical/immunizations/immunization-requirement/">
Learn more about immunization requirements and deadlines.</a>
<a href="https://wellbeing.uw.edu/medical/immunizations/immunization-requirement/"
>Learn more about immunization requirements and deadlines.</a>
</p>
</div>
</uw-collapse>
Expand All @@ -90,24 +92,29 @@
:icon="faInfoCircle"
class="me-3 mt-1 text-mid-beige myuw-text-lg"
/>
<div class="mb-1"><span class="myuw-font-encode-sans">Required Husky Prevention & Response
student course</span>
<span class="text-muted fw-light fst-italic myuw-text-sm px-2">(Item does not reflect
completion status)</span>
<div class="mb-1">
<span class="myuw-font-encode-sans">
Reminder: Required Husky Prevention &amp; Respons student course
</span>
<span class="myuw-text-md d-block">
(<em>Note:</em> This message is shown even if you have completed this step.)
</span>
<button
v-uw-collapse.titleix
type="button"
class="btn btn-link p-0 border-0 align-top notice-link text-start myuw-text-md d-block"
>Learn about and complete the one-time online course</button>
<uw-collapse id="titleix">
<div class="p-3 mt-2 bg-light text-dark notice-body">
<p><a href="https://www.washington.edu/titleix/title-ix-student-course/">Husky
Prevention & Response</a> is a one-time online course on preventing and
<p>
<a href="https://www.washington.edu/titleix/title-ix-student-course/"
>Husky Prevention &amp; Response</a> is a one-time online course on preventing and
responding to sex-based and gender-based violence and harassment. Complete the
course — which takes 60–90 minutes — before the start of your first quarter.
If you do not complete the course, you may be unable to register for future
quarters. <a href="https://tixstudent.uw.edu">Access and complete the
course – tixstudent.uw.edu.</a>
course — which takes 60–90 minutes — before the start of your first quarter.
If you do not complete the course, you may be unable to register for future
quarters.
<a href="https://tixstudent.uw.edu"
>Access and complete the course – tixstudent.uw.edu.</a>
</p>
</div>
</uw-collapse>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"vue-observe-visibility": "1.0.0",
"vue-template-compiler": "2.7.16",
"vuex": "3.6.2",
"webpack": "5.90.3",
"webpack": "5.94.0",
"webpack-bundle-analyzer": "4.10.1",
"webpack-bundle-tracker": "3.0.1",
"webpack-cli": "5.1.4"
Expand Down
Loading