Skip to content

Commit

Permalink
Merge pull request #660 from bcgov/vuetify-mt
Browse files Browse the repository at this point in the history 
changed the school of GRAD in Status to trax
  • Loading branch information
@shaunlumbcgov
shaunlumbcgov authored Oct 30, 2024
2 parents 748a0ec + a0a3a9b commit c7305e4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 84 deletions.
27 changes: 14 additions & 13 deletions frontend/src/components/Header/BCHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,19 @@
:key="link.id"
@click="menu = false"
>
<router-link
<v-btn
:to="link.route"
style="text-decoration: none; color: inherit"
variant="text"
color="primary"
style="
text-transform: none;
text-decoration: none;
color: inherit;
"
class="text-start"
>
<v-list-item-title>{{ link.title }}</v-list-item-title>
</router-link>
</v-btn>
</v-list-item>
<v-spacer />
<v-list-item v-if="!profile.pen">
Expand All @@ -63,29 +70,23 @@

<v-app-bar v-if="!smallScreen" density="compact">
<v-toolbar>
<v-btn
text
v-for="link in menuLinks"
:key="link.id"
class="text-none"
density="compact"
>
<v-btn text v-for="link in menuLinks" :key="link.id" class="text-none">
<router-link
:to="link.route"
style="text-decoration: none; color: inherit"
>
{{ link.title }}
</router-link>
</v-btn>
<v-btn v-if="!profile.pen" class="text-none" density="compact">
<v-btn v-if="!profile.pen" class="text-none">
<a
id="profile-route"
class="text-decoration-none text-disabled"
:disabled="true"
>Profile (Student Not Loaded)</a
>
</v-btn>
<v-btn v-else density="compact">
<v-btn v-else>
<router-link
:to="`/student-profile/${profile.studentID}`"
id="profile-route"
Expand All @@ -99,7 +100,7 @@
<v-text-field
density="compact"
variant="outlined"
size="30"
size="40"
type="search"
v-model="penInput"
maxlength="9"
Expand Down
68 changes: 1 addition & 67 deletions frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,7 @@
<v-card no-body title="GRAD Status">
<v-card-text class="p-3">
<GRADStatusForm class="gradstatus-actions float-right"></GRADStatusForm>

<!-- Info callout in edit form when student status is MER/Merged -->
<!-- <div
v-if="studentGradStatus && studentGradStatus.studentStatus == 'MER'"
>
<v-alert show variant="info" type="info" class="p-3 mb-1">
<h4 class="alert-heading">Student status: Merged</h4>
<p class="locked-message">
This student's status is set to 'Merged'. Their data cannot be
changed.
</p>
</v-alert>
</div> -->
<!-- Warning callout in edit form when student status is N/Not Active -->
<!-- <div v-if="studentGradStatus && studentGradStatus.studentStatus == 'N'">
<v-alert show variant="tonal" type="warning" class="p-3 mb-1">
<h4 class="alert-heading">Student status: Not active</h4>
<p class="locked-message">
This student's status is set to 'Not active'. Re-activate their
record by setting their 'Student status' to 'Active' if they are
enrolled in a school.
</p>
</v-alert>
</div> -->
<!-- Warning callout in edit form when student status is TER/Terminated -->
<!-- <div
v-else-if="
studentGradStatus && studentGradStatus.studentStatus == 'TER'
"
>
<v-alert show variant="tonal" type="warning" class="p-3 mb-1">
<h4 class="alert-heading">Student status: Terminated</h4>
<p class="locked-message">
This student's status is set to 'Terminated'. Re-activate their
record by setting their 'Student status' to 'Current' if they are
enrolled in a school.
</p>
</v-alert>
</div> -->
<!-- Warning callout in edit form when student status is ARC/Archived -->
<!-- <div
v-else-if="
studentGradStatus && studentGradStatus.studentStatus == 'ARC'
"
>
<v-alert show variant="tonal" type="warning" class="p-3 mb-1">
<h4 class="alert-heading">Student status: Archived</h4>
<p class="locked-message">
This student is not active. Re-activate by setting their status to
"Current" if they are currently attending school
</p>
</v-alert>
</div> -->
<!-- Warning callout in edit form when student status is DEC/Deceased -->
<!-- <div
v-else-if="
studentGradStatus && studentGradStatus.studentStatus == 'DEC'
"
>
<v-alert show variant="tonal" type="warning" class="p-3 mb-1">
<h4 class="alert-heading">Student status: Deceased</h4>
<p class="locked-message">
Warning: This student is showing as "Deceased".
</p>
</v-alert>
</div> -->
<v-table density="compact" aria-label="edit grad status">
<v-table density="comfortable" aria-label="edit grad status">
<tbody>
<!-- Program -->
<tr>
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
label="Select a school"
:items="getSchoolsList"
:item-title="schoolTitle"
item-value="mincode"
item-value="minCode"
variant="outlined"
density="compact"
class="mt-4"
Expand Down Expand Up @@ -352,13 +352,13 @@
.$message
}}
</div>
<!-- :disabled="disableSchoolAtGrad" -->
<v-autocomplete
:disabled="disableSchoolAtGrad"
v-model="editedGradStatus.schoolAtGrad"
label="Select a school"
:items="getSchoolsList"
:item-title="schoolTitle"
item-value="mincode"
item-value="minCode"
variant="outlined"
class="mt-4"
density="compact"
Expand Down Expand Up @@ -878,7 +878,7 @@ export default {
schoolTitle(item) {
// Customize this method to return the desired format
if (item) {
return `${item.mincode} - ${item.displayName}`;
return `${item.minCode} - ${item.schoolName}`;
} else {
return null;
}
Expand Down

0 comments on commit c7305e4

Please sign in to comment.