Merge pull request #435 from uw-it-aca/develop

Develop
uw-it-aca · Jul 12, 2024 · f9e95c1 · f9e95c1
2 parents 347c982 + d5ff16e
commit f9e95c1
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 173 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG DJANGO_CONTAINER_VERSION=2.0.3
 
-FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-prebundler-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} AS app-prebundler-container
 
 USER root
 
@@ -33,13 +33,13 @@ ARG VUE_DEVTOOLS
 ENV VUE_DEVTOOLS=$VUE_DEVTOOLS
 RUN npm run build
 
-FROM app-prebundler-container as app-container
+FROM app-prebundler-container AS app-container
 
 COPY --chown=acait:acait --from=node-bundler /app/compass/static /app/compass/static
 
 RUN /app/bin/python manage.py collectstatic --noinput
 
-FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} AS app-test-container
 
 USER root
 

diff --git a/compass/fixtures/uw_person/student.json b/compass/fixtures/uw_person/student.json
@@ -75,10 +75,19 @@
             "local_addr_line2": null,
             "local_addr_postal_code": null,
             "local_addr_state": "CA",
-            "local_phone_number": "(999) 123-4567",
+            "local_phone_number": "9991234567",
             "new_continuing_returning_code": "0",
             "new_continuing_returning_desc": "CONTINUING",
             "parent_name": "Average,Joe",
+            "parent_addr_4digit_zip": "1353",
+            "parent_addr_5digit_zip": "94306",
+            "parent_addr_city": "PALO ALTO",
+            "parent_addr_country": null,
+            "parent_addr_line1": "2323 PRINCETON ST",
+            "parent_addr_line2": null,
+            "parent_addr_postal_code": null,
+            "parent_addr_state": "CA",
+            "parent_phone_number": "4048675309",
             "perm_addr_4digit_zip": "1353",
             "perm_addr_5digit_zip": "94306",
             "perm_addr_city": "PALO ALTO",
@@ -87,6 +96,7 @@
             "perm_addr_line2": null,
             "perm_addr_postal_code": null,
             "perm_addr_state": "CA",
+            "perm_phone_number": "4048675309",
             "previous_institution_name": "PALO ALTO SENIOR H S",
             "previous_institution_type": "1",
             "previous_institution_type_desc": "HIGH SCHOOL",

diff --git a/compass_vue/components/nav-menu.vue b/compass_vue/components/nav-menu.vue
@@ -22,7 +22,7 @@
         >
       </li>
 
-      <li aria-hidden="true" class="nav-item mt-1 mb-2">
+      <li v-show="userRoles.includes(Role.Manager)" aria-hidden="true" class="nav-item mt-1 mb-2">
         <a
           href="#"
           class="nav-link disabled text-gray d-block p-0 internal-link"
@@ -42,7 +42,7 @@
           ><i class="bi bi-bar-chart-line-fill me-2"></i>Reports</router-link
         >
       </li>
-      <li class="nav-item mb-1">
+      <li v-show="userRoles.includes(Role.Manager)" class="nav-item mb-1">
         <router-link
           :to="'/affiliations'"
           class="nav-link text-gray d-block px-3 py-2 bg-dark-purple-hover rounded-3"