diff --git a/src/pages/Academic/assignment.vue b/src/pages/Academic/assignment.vue index 0722645..cb37f50 100644 --- a/src/pages/Academic/assignment.vue +++ b/src/pages/Academic/assignment.vue @@ -10,7 +10,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -88,7 +88,7 @@ item-value="_id" v-model="editedItem.sectionId" :rules="sectionRules" - @change="getClassSubject(addAssignment.classId)" + @change="getClassSubject(editedItem.classId)" required > @@ -204,7 +204,7 @@ {{ props.item.finalMarks }} {{ props.item.type }} - + + Delete - + --> Edit - + diff --git a/src/pages/Exam/examAttendence.vue b/src/pages/Exam/examAttendence.vue index 97a6562..049d872 100644 --- a/src/pages/Exam/examAttendence.vue +++ b/src/pages/Exam/examAttendence.vue @@ -22,7 +22,7 @@ { diff --git a/src/pages/Exam/examSchedule.vue b/src/pages/Exam/examSchedule.vue index 18649fd..ddf8214 100644 --- a/src/pages/Exam/examSchedule.vue +++ b/src/pages/Exam/examSchedule.vue @@ -323,7 +323,19 @@ :items="classList" item-text="classNum" item-value="_id" - @change="getSchedulesList()" + @change="getSections(getScheduleData.classId)" + required + > + + + @@ -752,7 +764,10 @@ export default { this.showLoader = true; http() .get("/getSchedulesList", { - params: { classId: this.getScheduleData.classId }, + params: { + classId: this.getScheduleData.classId, + sectionId: this.getScheduleData.sectionId + }, headers: { Authorization: "Bearer " + this.token } }) .then(response => { @@ -765,6 +780,7 @@ export default { this.showLoader = false; this.loadingSearch = false; this.snackbar = true; + this.color = "error"; this.text = error.response.data.message; if (error.response.status === 401) { this.$router.replace({ path: "/" }); @@ -779,7 +795,10 @@ export default { this.editedItem = Object.assign({}, item); this.editedItem.examId = this.editedItem.examId._id; this.editedItem.classId = this.editedItem.classId._id; - this.editedItem.sectionId = this.editedItem.sectionId._id; + this.editedItem.sectionId = + this.editedItem.sectionId === null + ? (this.editedItem.sectionId = this.editedItem.sectionId = "") + : this.editedItem.sectionId._id; this.editedItem.date = this.editedItem.date != undefined ? (this.editedItem.date = this.editedItem.date.substring(0, 10)) @@ -791,7 +810,10 @@ export default { this.editedItem = Object.assign({}, item); this.editedItem.examId = this.editedItem.examId.examName; this.editedItem.classId = this.editedItem.classId.classNum; - this.editedItem.sectionId = this.editedItem.sectionId.name; + this.editedItem.sectionId = + this.editedItem.sectionId === null + ? (this.editedItem.sectionId = this.editedItem.sectionId = "") + : this.editedItem.sectionId.name; this.profileExamScheduleDialog = true; }, deleteSchedule(item) { @@ -861,8 +883,9 @@ export default { }) .catch(error => { this.snackbar = true; - this.text = error.response.data.message; - this.color = "red"; + this.text = error.response.data.messages; + this.color = "error"; + this.loading = false; }); }, getClass() { diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue index a76614e..e1a3ca6 100644 --- a/src/pages/Mark/viewMark.vue +++ b/src/pages/Mark/viewMark.vue @@ -19,7 +19,7 @@ > - + @@ -268,7 +268,7 @@ - + @@ -518,6 +518,14 @@
+ {{ text }} @@ -548,7 +556,17 @@ export default { selectMarkList: "Mark", selectMark: ["Mark", "Grade"], MarkData: "", - userData: {} + userData: {}, + showData: false, + + //SNACKBAR + snackbar: false, + color: "", + y: "top", + x: "right", + mode: "", + timeout: 10000, + text: "" }), mounted() { this.token = this.$store.state.token; @@ -565,6 +583,15 @@ export default { }) .then(response => { this.markData = response.data.data; + // console.log("====this.markData===", this.markData); + if (this.markData.length === 0) { + this.showLoader = false; + this.snackbar = true; + this.text = "Data not found!"; + this.color = "error"; + return; + } + this.showData = true; let newData = response.data.data; // console.log("newData", newData); for (var i = 0; i < newData.length; i++) { diff --git a/src/pages/Section/section.vue b/src/pages/Section/section.vue index 6446b69..d3fca62 100644 --- a/src/pages/Section/section.vue +++ b/src/pages/Section/section.vue @@ -211,7 +211,7 @@ /> Edit - + diff --git a/src/pages/meetingEvent/meetingEvent.vue b/src/pages/meetingEvent/meetingEvent.vue index b011292..8f8a895 100644 --- a/src/pages/meetingEvent/meetingEvent.vue +++ b/src/pages/meetingEvent/meetingEvent.vue @@ -681,8 +681,12 @@ export default { this.$refs.form.reset(); }, save() { + console.log('=======this.editedItem=====', this.editedItem); + if (this.editedItem.courseId) { + this.editedItem.courseId = this.editedItem.courseId._id; + } delete this.editedItem.classId; - this.editedItem.courseId = this.editedItem.courseId._id; + this.editedItem.startTime = moment(this.editedItem.startTime, "hh:mm").format("LT"); http() .put("/updateMeetingEvent", this.editedItem)