diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue index 8856d6d..2a353b4 100644 --- a/src/pages/Dashboard/dashboard.vue +++ b/src/pages/Dashboard/dashboard.vue @@ -138,7 +138,7 @@ Expences - Rs 3000 + Rs. {{ expenseData.sum }} @@ -338,6 +338,7 @@ export default { teachers: "", classes: "", noticeData: [], + expenseData: [], attrs: [ { key: "today", @@ -447,6 +448,7 @@ export default { this.getClasses(); this.getNoticeData(); this.getUserData(); + this.getExpensesData(); // this.getUsersList(); }, methods: { @@ -604,6 +606,21 @@ export default { // this.$store.dispatch("Id", null); // } }); + }, + getExpensesData() { + http() + .get("/getTotalExpenses", { + headers: { + Authorization: "Bearer " + this.token + } + }) + .then(response => { + this.expenseData = response.data.data; + this.showLoader = false; + }) + .catch(error => { + this.showLoader = false; + }) } } }; diff --git a/src/pages/Exam/examSchedule.vue b/src/pages/Exam/examSchedule.vue index aa12749..834f187 100644 --- a/src/pages/Exam/examSchedule.vue +++ b/src/pages/Exam/examSchedule.vue @@ -20,12 +20,12 @@ @@ -233,7 +233,7 @@ - {{ editedItem.examName }} + {{ editedItem.examId}} @@ -367,7 +367,7 @@ {{ props.index + 1}} - {{ props.item.examName}} + {{ props.item.examId.examName}} {{ props.item.classId.classNum}} {{ props.item.sectionId.name }} {{ props.item.subjectName }} @@ -400,7 +400,7 @@ Delete @@ -422,7 +422,7 @@ - Add Class + Add Exam cancel @@ -436,11 +436,11 @@ @@ -683,7 +683,7 @@ export default { pagination: { rowsPerPage: 10 }, - examNameRules: [v => !!v || "Exam Name is required"], + examRules: [v => !!v || "Exam Name is required"], classRules: [v => !!v || "Class Name is required"], sectionRules: [v => !!v || "section is required"], subjectRules: [v => !!v || "Subject is required"], @@ -700,7 +700,7 @@ export default { }, { text: "Exam Name", - vaue: "examName", + vaue: "examId.examName", sortable: false, align: "center" }, @@ -787,6 +787,7 @@ export default { // console.log("item", item); this.editedIndex = this.ScheduleData.indexOf(item); 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.date = @@ -798,6 +799,7 @@ export default { profile(item) { this.editedIndex = this.ScheduleData.indexOf(item); 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.profileExamScheduleDialog = true;
Expences