Skip to content

Commit

Permalink
Merge branch 'vuetifyv3' of https://github.com/bcgov/EDUC-GRAD-ADMIN
Browse files Browse the repository at this point in the history
…into vuetify-mt
  • Loading branch information
michaeltangbcgov committed Oct 30, 2024
2 parents 1bc6f60 + 748a0ec commit a0a3a9b
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions frontend/src/components/StudentSearch/StudentAdvancedSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
</div>
</v-row>
</v-form>
<div v-if="studentSearchResults">
<div v-if="studentSearchResults?.length > 0">
<v-alert
type="success"
variant="tonal"
Expand All @@ -261,6 +261,16 @@
:text="`${advancedSearchMessage}\n${advancedSearchAPIMessage}`"
></v-alert>
</div>
<div v-else>
<v-alert
type="error"
variant="tonal"
border="start"
class="mt-8 mb-2 ml-1 py-3 width-fit-content"
v-if="advancedSearchAPIMessage"
:text="advancedSearchAPIMessage"
></v-alert>
</div>

<transition name="fade">
<div v-if="studentSearchResults" class="table-responsive">
Expand Down Expand Up @@ -520,7 +530,7 @@ export default {
// },
findStudentsByAdvancedSearch: function () {
this.advancedSearchMessage = "";
this.message = "";
this.advancedSearchAPIMessage = "";
this.errorMessage = "";
if (this.v$.$invalid) {
Expand Down Expand Up @@ -593,7 +603,6 @@ export default {
},
keyHandler: function (e) {
if (e.keyCode === 13) {
this.studentSearchResults = [];
//enter key pressed
this.findStudentsByAdvancedSearch();
}
Expand All @@ -609,6 +618,9 @@ export default {
}
this.advancedSearchInput.birthdateFrom.value = "";
this.advancedSearchInput.birthdateTo.value = "";
this.advancedSearchMessage = "";
this.advancedSearchAPIMessage = "";
this.errorMessage = "";
},
advancedSearchValidate(obj) {
//check if all inputs are empty
Expand Down

0 comments on commit a0a3a9b

Please sign in to comment.