From b0f5f6684c54d1e33b9ac01ac5228c77470c3f1a Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Thu, 30 Jul 2020 18:18:24 +0530
Subject: [PATCH] Conditionally show drop-down menu in meeting event page,
 Solved responsive issue on dashboard, Resolved multi selecter issue,Build the
 inner logic to enroll or withdraw and Refactor exixting code in enroll
 student page

---
 src/pages/Course/enrollStudents.vue     | 88 ++++++++++++++++++++++++---------
 src/pages/Dashboard/dashboard.vue       | 22 ++++-----
 src/pages/meetingEvent/meetingEvent.vue | 22 +++++----
 3 files changed, 86 insertions(+), 46 deletions(-)

diff --git a/src/pages/Course/enrollStudents.vue b/src/pages/Course/enrollStudents.vue
index ed509ca..a699556 100644
--- a/src/pages/Course/enrollStudents.vue
+++ b/src/pages/Course/enrollStudents.vue
@@ -50,7 +50,7 @@
       :search="search"
       select-all
       v-model="selected"
-      item-key="name"
+      item-key="_id"
     >
       <template slot="items" slot-scope="props">
         <tr class="tr" :active="props.selected" @click="props.selected = !props.selected">
@@ -261,35 +261,73 @@ export default {
       }
     },
     toggleAll() {
-      if (this.selected.length) this.selected = [];
-      else this.selected = this.studentsData.slice();
-      let selectedStudentsArray = [];
-      for (let i = 0; i < this.selected.length; i++) {
-        selectedStudentsArray.push({ studentId: this.selected[i]._id });
+      let withdraw = false;
+      if (this.selected.length === this.studentsData.length) withdraw = true;
+
+      if (withdraw) {
+        var payload = {
+          courseId: this.getReport.courseId,
+          enrollStudents: []
+        };
+        http()
+          .put("/enrollStudents", payload)
+          .then(response => {
+            this.snackbar = true;
+            this.text = response.data.message;
+            this.selected = [];
+            for (let i = 0; i < this.studentsData.length; i++) {
+              this.studentsData[i].enroll = false;
+            }
+            this.getParticularCourse();
+          })
+          .catch(error => {
+            this.snackbar = true;
+            this.text = error.response.data.message;
+          });
+      } else {
+        let selectedStudentsArray = [];
+        for (let item of this.studentsData) {
+          if(item.enroll === false || !item.enroll) {
+            selectedStudentsArray.push({ studentId: item._id });
+          }
+        }
+
+        var payload = {
+          courseId: this.getReport.courseId,
+          enrollStudents: selectedStudentsArray
+        };
+        http()
+          .put("/enrollStudents", payload)
+          .then(response => {
+            this.snackbar = true;
+            this.text = response.data.message;
+            for (let i = 0; i < this.studentsData.length; i++) {
+              this.studentsData[i].enroll = true;
+            }
+            this.getParticularCourse();
+          })
+          .catch(error => {
+            this.snackbar = true;
+            this.text = error.response.data.message;
+          });
       }
-      // console.log("selectedStudentsArray", selectedStudentsArray);
-      var payload = {
-        courseId: this.getReport.courseId,
-        enrollStudents: selectedStudentsArray
-      };
-      http()
-        .put("/enrollStudents", payload)
-        .then(response => {
-          this.snackbar = true;
-          this.text = response.data.message;
-          this.getParticularCourse();
-        })
-        .catch(error => {
-          this.snackbar = true;
-          this.text = error.response.data.message;
-        });
     },
+
     selectParticularStudent(selected) {
       console.log("selected", selected);
       let selectedStudentsArray = [];
       selectedStudentsArray.push({ studentId: selected._id });
-      // console.log("selected.enroll", selected.enroll);
+
+      let isExists = false;
+      for(let item of this.selected) {
+        if(item._id === selected._id) {
+          isExists = true;
+          break;
+        }
+      }
+
       if (selected.enroll === true) {
+        if (!isExists) this.selected.push(selected);
         var payload = {
           courseId: this.getReport.courseId,
           enrollStudents: selectedStudentsArray
@@ -329,6 +367,7 @@ export default {
       }
     },
     getParticularCourse() {
+      this.selected = [];
       var payload = {
         courseId: this.getReport.courseId
       };
@@ -342,9 +381,10 @@ export default {
             studentId = response.data.data.enrollStudents[i];
             for (let j = 0; j < this.studentsData.length; j++) {
               if (studentId.studentId == this.studentsData[j]._id) {
-                // console.log("studentId._id", studentId._id);
                 this.studentsData[j].enroll = true;
                 this.studentsData[j].enrollId = studentId._id;
+                this.selected.push(this.studentsData[j]);
+                break;
               }
             }
           }
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 76d48d1..5b4328d 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -259,7 +259,7 @@
                     <br />
                     <span class="body-2">{{ props.item.title}}</span>
                   </td>
-                  <td class="noticeDecritpion grey--text mt-2">{{ props.item.description}}</td>
+                  <td class="grey--text mt-2">{{ props.item.description}}</td>
 
                   <td class="text-xs-center">
                     <span>
@@ -307,7 +307,7 @@
                         <br />
                         <span class="body-2">{{ props.item.title}}</span>
                       </td>
-                      <td class="noticeDecritpion grey--text mt-2">{{ props.item.description}}</td>
+                      <td class="grey--text mt-2">{{ props.item.description}}</td>
 
                       <td class="text-xs-center">
                         <span>
@@ -843,11 +843,11 @@ export default {
         .catch(error => {
           // console.log("err====>", err);
           this.showLoader = false;
-          // if (error.response.status === 401) {
-          //   this.$router.replace({ path: "/" });
-          //   this.$store.dispatch("setToken", null);
-          //   this.$store.dispatch("Id", null);
-          // }
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+          }
         });
     },
     getParents() {
@@ -1091,12 +1091,8 @@ export default {
   async created() {
     if (this.$store.state.role === "ADMIN") {
       this.token = this.$store.state.token;
-      await this.getFeesAndCollectionsData();
-      await this.getExpensesData();
     } else if (this.$store.state.schoolRole === "SUPERADMIN") {
       this.token = this.$store.state.schoolToken;
-      await this.getFeesAndCollectionsData();
-      await this.getExpensesData();
     } else if (this.$store.state.role === "TEACHER") {
       this.token = this.$store.state.token;
     } else if (this.$store.state.role === "ACCOUNTANT") {
@@ -1116,8 +1112,8 @@ export default {
     await this.getClasses();
     await this.getNoticeData();
     await this.getUserData();
-    
-    
+    await this.getFeesAndCollectionsData();
+    await this.getExpensesData();
 
     /* get Latest events list for student login*/
     if (this.$store.state.role == "PARENT") {
diff --git a/src/pages/meetingEvent/meetingEvent.vue b/src/pages/meetingEvent/meetingEvent.vue
index 466f853..b011292 100644
--- a/src/pages/meetingEvent/meetingEvent.vue
+++ b/src/pages/meetingEvent/meetingEvent.vue
@@ -165,6 +165,16 @@
                     <h5 class="my-1">{{ editedItem.typeOfEvent }}</h5>
                   </v-flex>
                 </v-layout>
+                <v-layout v-if="editedItem.courseId">
+                  <v-flex xs4 sm6>
+                    <h5 class="right my-1">
+                      <b>Course Name:</b>
+                    </h5>
+                  </v-flex>
+                  <v-flex sm6 xs8>
+                    <h5 class="my-1">{{ editedItem.courseId.courseName }}</h5>
+                  </v-flex>
+                </v-layout>
                 <v-layout v-if="editedItem.classId">
                   <v-flex xs4 sm6>
                     <h5 class="right my-1">
@@ -389,12 +399,12 @@
                     label="Select Type Of Event"
                     v-model="meetEvent.typeOfEvent"
                     :rules="typeOfEventRules"
-                    @change="getSelectOption(meetEvent.typeOfEvent)"
+                    
                   ></v-select>
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 v-show="classShow">
+            <v-flex xs12 v-show="meetEvent.typeOfEvent">
               <v-layout>
                 <v-flex xs4 class="pt-4 subheading">
                   <label class="right">Class:</label>
@@ -411,7 +421,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 v-show="courseShow">
+            <v-flex xs12 v-show="meetEvent.typeOfEvent === 'Course'">
               <v-layout>
                 <v-flex xs4 class="pt-4 subheading">
                   <label class="right">Courses:</label>
@@ -546,8 +556,6 @@ export default {
     editedItem: {},
     menu1: false,
     menu2: false,
-    classShow: false,
-    courseShow: false,
     loginId: ""
   }),
   methods: {
@@ -615,10 +623,6 @@ export default {
           this.loading = false;
         });
     },
-    getSelectOption(type) {
-        this.classShow = true;
-        this.courseShow = true;
-    },
     getAllClass() {
       http()
         .get("/getClassesList")
-- 
2.0.0