From 2f9211c744c71f2b3e11f3b9cc282e4cb30b68b4 Mon Sep 17 00:00:00 2001 From: Shikha Mishra Date: Fri, 14 Aug 2020 18:17:01 +0530 Subject: [PATCH] done one round of testing and solved bugs --- src/pages/Administrator/academicYear.vue | 1 - src/pages/Attendence/teacherAttendence.vue | 2 +- src/pages/Authentication/Login.vue | 2 +- src/pages/Library/eBook.vue | 2 +- src/pages/Library/member.vue | 4 ++-- src/pages/Teachers/teachers.vue | 4 +++- src/pages/TimeTable/timeTable.vue | 9 +++++++++ 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/pages/Administrator/academicYear.vue b/src/pages/Administrator/academicYear.vue index 0206ae7..0d68760 100644 --- a/src/pages/Administrator/academicYear.vue +++ b/src/pages/Administrator/academicYear.vue @@ -566,7 +566,6 @@ export default { }, closeAddAcademicYearModel() { this.addAcademicYearDialog = false; - this.getAcademicYearList = []; this.addAcademicYear = []; }, submit() { diff --git a/src/pages/Attendence/teacherAttendence.vue b/src/pages/Attendence/teacherAttendence.vue index f38c517..1b9912f 100644 --- a/src/pages/Attendence/teacherAttendence.vue +++ b/src/pages/Attendence/teacherAttendence.vue @@ -274,7 +274,7 @@ export default { }, addTeacherAttendenceDialog: function (val) { if (!val) { - this.teachersData = []; + // this.teachersData = []; this.date = null; this.menu = false; } diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue index b73f7aa..4583e42 100644 --- a/src/pages/Authentication/Login.vue +++ b/src/pages/Authentication/Login.vue @@ -107,7 +107,7 @@ export default { remember: false, valid: false, userLogincredentials: {}, - nameRules: [(v) => !!v || "Username is required"], + nameRules: [(v) => !!v || "Field is required"], password: "", email: "", rules: { diff --git a/src/pages/Library/eBook.vue b/src/pages/Library/eBook.vue index 0177a0d..b724f88 100644 --- a/src/pages/Library/eBook.vue +++ b/src/pages/Library/eBook.vue @@ -682,7 +682,7 @@ export default { }, closeAddEBookModel() { this.addEBookDialog = false; - this.eBookData = []; + // this.eBookData = []; this.addEBooks = []; this.imageName = ""; this.fileName = ""; diff --git a/src/pages/Library/member.vue b/src/pages/Library/member.vue index 984e00e..74e2f1d 100644 --- a/src/pages/Library/member.vue +++ b/src/pages/Library/member.vue @@ -15,7 +15,7 @@ - Student Profile + View Student Profile close @@ -424,7 +424,7 @@ - + cancel diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue index 313b9cf..4803369 100644 --- a/src/pages/Teachers/teachers.vue +++ b/src/pages/Teachers/teachers.vue @@ -1052,7 +1052,9 @@ export default { }, addTeacherDialog: function (val) { if (!val) { - this.addTeachers = []; + this.addTeachers = { + role: "TEACHER", + }; this.imageName = ""; this.imageFile = ""; this.imageUrl = ""; diff --git a/src/pages/TimeTable/timeTable.vue b/src/pages/TimeTable/timeTable.vue index 8b37cfe..2b3abef 100644 --- a/src/pages/TimeTable/timeTable.vue +++ b/src/pages/TimeTable/timeTable.vue @@ -1037,6 +1037,7 @@ export default { menu5: false, menu6: false, scheduleDayId: "", + showData: false, }), watch: { addTimeTableDialog: function (val) { @@ -1057,6 +1058,14 @@ export default { }) .then((response) => { this.desserts = response.data.data; + if (this.desserts.length === 0) { + this.showLoader = false; + this.snackbar = true; + this.text = "Data not found!"; + this.color = "error"; + return; + } + this.showData = true; this.loadingFindData = false; }) .catch((error) => { -- 2.0.0