From 65d5475b667d37ef597e1f2d200a6acd86a776bf Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Tue, 25 Feb 2020 19:03:16 +0530
Subject: [PATCH] changes in api and ui

---
 src/pages/Dashboard/dashboard.vue | 19 ++++++++++++++++++-
 src/pages/Exam/examSchedule.vue   | 26 ++++++++++++++------------
 2 files changed, 32 insertions(+), 13 deletions(-)

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 @@
                                 <v-list-tile-title class="mt-2">
                                   <p class="subheading font-color">Expences</p>
                                 </v-list-tile-title>
-                                <v-list-tile-title>Rs 3000</v-list-tile-title>
+                                <v-list-tile-title>Rs. {{ expenseData.sum }}</v-list-tile-title>
                               </v-list-tile-content>
                             </v-list-tile>
                           </template>
@@ -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 @@
                     </v-flex>
                     <v-flex xs7 class="ml-3">
                       <v-select
-                        :rules="examNameRules"
+                        :rules="examRules"
                         :items="examList"
-                        v-model="editedItem.examName"
+                        v-model="editedItem.examId"
                         label="Select your Exam Name"
                         item-text="examName"
-                        item-value="examName"
+                        item-value="_id"
                       ></v-select>
                     </v-flex>
                   </v-layout>
@@ -233,7 +233,7 @@
                     </h5>
                   </v-flex>
                   <v-flex sm6 xs8>
-                    <h5 class="my-1">{{ editedItem.examName }}</h5>
+                    <h5 class="my-1">{{ editedItem.examId}}</h5>
                   </v-flex>
                 </v-layout>
                 <v-layout>
@@ -367,7 +367,7 @@
       <template slot="items" slot-scope="props">
         <tr class="tr">
           <td class="td td-row">{{ props.index + 1}}</td>
-          <td class="td td-row text-xs-center">{{ props.item.examName}}</td>
+          <td class="td td-row text-xs-center">{{ props.item.examId.examName}}</td>
           <td class="td td-row text-xs-center">{{ props.item.classId.classNum}}</td>
           <td class="td td-row text-xs-center">{{ props.item.sectionId.name }}</td>
           <td class="td td-row text-xs-center">{{ props.item.subjectName }}</td>
@@ -400,7 +400,7 @@
                 <img
                   slot="activator"
                   style="cursor:pointer; width:20px; height:20px; "
-                  @click="deleteItem(props.item)"
+                  @click="deleteSchedule(props.item)"
                   src="/static/icon/delete.png"
                 />
                 <span>Delete</span>
@@ -422,7 +422,7 @@
       <v-card flat class="card-style pa-2" dark>
         <v-layout>
           <v-flex xs12>
-            <label class="title text-xs-center">Add Class</label>
+            <label class="title text-xs-center">Add Exam</label>
             <v-icon size="24" class="right" @click="addExamScheduleDialog = false">cancel</v-icon>
           </v-flex>
         </v-layout>
@@ -436,11 +436,11 @@
                 <v-flex xs7 sm7 md6 class="ml-3">
                   <v-select
                     label="Select your Exam Name"
-                    :rules="examNameRules"
+                    :rules="examRules"
                     :items="examList"
-                    v-model="addSchedule.examName"
+                    v-model="addSchedule.examId"
                     item-text="examName"
-                    item-value="examName"
+                    item-value="_id"
                   ></v-select>
                 </v-flex>
               </v-layout>
@@ -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;
-- 
2.0.0