From 7014df603e9e53bfcf01d624be2f5b7603068636 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <smshikhamishra25@gmail.com>
Date: Thu, 27 Aug 2020 18:57:23 +0530
Subject: [PATCH] Improve placeholder name while changing passowrd, Clear
 preavious data while selecting class from drop-down in student attendence,
 exam schedule, marks, students, routine, time table,global payment, progress
 card report and id card report and Student data was not showing at some times
 issue solved

---
 src/pages/Academic/routine.vue             |  1 +
 src/pages/Account/globalPayment.vue        |  2 +-
 src/pages/Administrator/resetPassword.vue  | 40 +++++++++++++++---------------
 src/pages/Attendence/studentAttendence.vue |  1 +
 src/pages/Dashboard/LiveOnlineClass.vue    |  7 +++++-
 src/pages/Exam/examSchedule.vue            |  8 +++++-
 src/pages/Mark/mark.vue                    |  1 +
 src/pages/Report/idCard.vue                |  1 +
 src/pages/Report/progressCardReport.vue    |  6 ++++-
 src/pages/Students/students.vue            | 10 +++++---
 src/pages/TimeTable/timeTable.vue          |  1 +
 11 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/src/pages/Academic/routine.vue b/src/pages/Academic/routine.vue
index 6302ba7..ad67de1 100644
--- a/src/pages/Academic/routine.vue
+++ b/src/pages/Academic/routine.vue
@@ -853,6 +853,7 @@ export default {
     getSections(_id) {
       var token = this.$store.state.token;
       this.showLoader = true;
+      this.routineList = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Account/globalPayment.vue b/src/pages/Account/globalPayment.vue
index 855721d..53cd409 100644
--- a/src/pages/Account/globalPayment.vue
+++ b/src/pages/Account/globalPayment.vue
@@ -54,7 +54,6 @@
                       v-model="selectStudents.selectId"
                       item-text="name"
                       item-value="_id"
-                      :rules="studentRules"
                       required
                     ></v-select>
                   </v-flex>
@@ -333,6 +332,7 @@ export default {
     getSection() {
       var token = this.$store.state.token;
       this.showLoader = true;
+      this.studentInvoiceData = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Administrator/resetPassword.vue b/src/pages/Administrator/resetPassword.vue
index 649c767..427fa34 100644
--- a/src/pages/Administrator/resetPassword.vue
+++ b/src/pages/Administrator/resetPassword.vue
@@ -28,7 +28,7 @@
                     item-text="email"
                     item-value="email"
                     v-model="resetPassword.email"
-                  ></v-select> -->
+                  ></v-select>-->
                   <v-text-field
                     :append-icon="e1 ? 'visibility_off' : 'visibility'"
                     :append-icon-cb="() => (e1 = !e1)"
@@ -61,7 +61,7 @@
                     v-validate="{ required: false, is: resetPassword.newPassword }"
                     data-vv-name="password2"
                     data-vv-as="password"
-                    label="Renter New Password"
+                    label="Re-enter New Password"
                   ></v-text-field>
                 </v-form>
               </v-flex>
@@ -115,16 +115,16 @@ export default {
       text: "Password Changed",
       newPassword: "",
       oldPassword: "",
-      userRule: [v => !!v || "User is required"],
-      userNameRule: [v => !!v || "User Name is required"],
-      oldPasswordRule: [v => !!v || "Old Password is required"],
-      newPasswordRule: [v => !!v || "New Password is required"],
-      rePasswordRule: [v => !!v || "Re-Password is required"]
+      userRule: [(v) => !!v || "User is required"],
+      userNameRule: [(v) => !!v || "User Name is required"],
+      oldPasswordRule: [(v) => !!v || "Old Password is required"],
+      newPasswordRule: [(v) => !!v || "New Password is required"],
+      rePasswordRule: [(v) => !!v || "Re-Password is required"],
     };
   },
   mounted() {
     this.token = this.$store.state.token;
-    if (this.$store.state.role != "PARENT"){
+    if (this.$store.state.role != "PARENT") {
       this.getRole();
     }
   },
@@ -138,16 +138,16 @@ export default {
         this.resetPassword.newPassword = this.resetPassword.newPassword;
         http()
           .put("/change-password", this.resetPassword, {
-            headers: { Authorization: "Bearer " + this.token }
+            headers: { Authorization: "Bearer " + this.token },
           })
-          .then(response => {
+          .then((response) => {
             this.loading = false;
             this.snackbar = true;
             this.text = "Successfully Restet password !!";
             this.color = "green";
             this.clear();
           })
-          .catch(error => {
+          .catch((error) => {
             // console.log("err====>",err);
             this.snackbar = true;
             this.text = "User Not Found or Incorrect currentPassword";
@@ -160,9 +160,9 @@ export default {
       this.showLoader = true;
       http()
         .get("/getRolesList", {
-          headers: { Authorization: "Bearer " + this.token }
+          headers: { Authorization: "Bearer " + this.token },
         })
-        .then(response => {
+        .then((response) => {
           for (let i = 0; i < response.data.data.length; i++) {
             if (
               response.data.data[i].name != "SUPERADMIN" &&
@@ -173,7 +173,7 @@ export default {
             }
           }
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -190,14 +190,14 @@ export default {
       http()
         .get("/getUserWithRole", {
           params: {
-            name: roles
+            name: roles,
           },
-          headers: { Authorization: "Bearer " + this.token }
+          headers: { Authorization: "Bearer " + this.token },
         })
-        .then(response => {
+        .then((response) => {
           this.getUsersName = response.data.data;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -205,8 +205,8 @@ export default {
             this.$store.dispatch("Id", null);
           }
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
diff --git a/src/pages/Attendence/studentAttendence.vue b/src/pages/Attendence/studentAttendence.vue
index fb7f797..82413cc 100644
--- a/src/pages/Attendence/studentAttendence.vue
+++ b/src/pages/Attendence/studentAttendence.vue
@@ -394,6 +394,7 @@ export default {
     },
     getSection(_id) {
       this.showLoader = true;
+      this.studentsData = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Dashboard/LiveOnlineClass.vue b/src/pages/Dashboard/LiveOnlineClass.vue
index b60f832..8894415 100644
--- a/src/pages/Dashboard/LiveOnlineClass.vue
+++ b/src/pages/Dashboard/LiveOnlineClass.vue
@@ -151,6 +151,7 @@ export default {
 
       // JITSI CONTAINER
       liveLink: "",
+      livePassword: "",
       token: "",
       selectStudents: {},
       classRules: [(v) => !!v || " Class Name is required"],
@@ -237,7 +238,7 @@ export default {
           //   console.log("Local User Joined");
           this.showLoader = false;
           _this.api.executeCommand("displayName", _this.username);
-          _this.api.executeCommand("password",  _this.roomPassword);
+          _this.api.executeCommand("password", _this.roomPassword);
         });
 
         _this.api.on("readyToClose", () => {
@@ -309,6 +310,7 @@ export default {
     },
     async studentClasses() {
       this.liveLink = "";
+      this.livePassword = "";
       this.room = "";
       this.username = "";
       this.roomPassword = "";
@@ -334,11 +336,14 @@ export default {
         this.studentBtn = "";
       } else {
         this.liveLink = response.data.data[0].link;
+        this.livePassword = response.data.data[0].password;
         var room = response.data.data[0].roomName;
         var username = this.currentUser;
         var roomPassword = response.data.data[0].password;
         var this_ = this;
         // console.log(this.room, this.roomPassword, this.username);
+        // console.log("live session link", this.liveLink);
+        // console.log("live session password", this.livePassword);
 
         if (username != "" || room != "") {
           if (window.JitsiMeetExternalAPI) {
diff --git a/src/pages/Exam/examSchedule.vue b/src/pages/Exam/examSchedule.vue
index 4384244..38b641c 100644
--- a/src/pages/Exam/examSchedule.vue
+++ b/src/pages/Exam/examSchedule.vue
@@ -418,7 +418,12 @@
     </v-data-table>
 
     <!-- ****** ADD  Exam Schedule ****** -->
-    <v-dialog v-model="addExamScheduleDialog" max-width="600" v-if="addExamScheduleDialog" persistent>
+    <v-dialog
+      v-model="addExamScheduleDialog"
+      max-width="600"
+      v-if="addExamScheduleDialog"
+      persistent
+    >
       <v-card flat class="card-style pa-2" dark>
         <v-layout>
           <v-flex xs12>
@@ -946,6 +951,7 @@ export default {
           this.subjects = this.classList[i].subjects;
         }
       }
+      this.ScheduleData = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Mark/mark.vue b/src/pages/Mark/mark.vue
index fd5a090..ac18d5b 100644
--- a/src/pages/Mark/mark.vue
+++ b/src/pages/Mark/mark.vue
@@ -473,6 +473,7 @@ export default {
           this.subjects = this.classList[i].subjects;
         }
       }
+      this.getStudentsList = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Report/idCard.vue b/src/pages/Report/idCard.vue
index c297f5c..3331fc4 100644
--- a/src/pages/Report/idCard.vue
+++ b/src/pages/Report/idCard.vue
@@ -644,6 +644,7 @@ export default {
     },
     getSections(_id) {
       this.showLoader = true;
+      this.getCard = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index 2973b21..7b4770f 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -425,7 +425,7 @@ export default {
     filterData: [],
     getStudentsList: [],
     classRules: [(v) => !!v || "Class is required"],
-    sectionRules: [(v) => !!v || "Class is required"],
+    sectionRules: [(v) => !!v || "Section is required"],
     studentRules: [(v) => !!v || "Student is required"],
     getReport: {},
     classList: [],
@@ -466,6 +466,10 @@ export default {
     },
     getSections(_id) {
       this.showLoader = true;
+      this.cardData = [];
+      this.schoolData = [];
+      this.showReport = false;
+      this.filterData = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index bffcbd6..d45d946 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -855,7 +855,6 @@
                   item-text="name"
                   item-value="_id"
                   name="Select Section"
-                  :rules="sectionRules"
                   required
                 ></v-select>
               </v-layout>
@@ -960,8 +959,12 @@
           </td>
           <td class="text-xs-center td td-row">{{ props.item.name}}</td>
           <td class="text-xs-center td td-row">{{ props.item.gender }}</td>
-          <td class="text-xs-center td td-row">{{ props.item.parentId.fatherName }}</td>
-          <td class="text-xs-center td td-row">{{ props.item.parentId.motherName }}</td>
+          <td
+            class="text-xs-center td td-row"
+          >{{ props.item.parentId ? props.item.parentId.fatherName: '-' }}</td>
+          <td
+            class="text-xs-center td td-row"
+          >{{ props.item.parentId ? props.item.parentId.motherName: '-' }}</td>
           <td class="text-xs-center td td-row">{{ props.item.establishmentYear }}</td>
           <!-- <td class="text-xs-center td td-row">{{ props.item.mobile}}</td> -->
           <td class="text-xs-center td td-row">
@@ -2111,6 +2114,7 @@ export default {
     getSections(_id) {
       var token = this.$store.state.token;
       this.showLoader = true;
+      this.studentsData = [];
       http()
         .get(
           "/getSectionsList",
diff --git a/src/pages/TimeTable/timeTable.vue b/src/pages/TimeTable/timeTable.vue
index b1b78da..ad48ab8 100644
--- a/src/pages/TimeTable/timeTable.vue
+++ b/src/pages/TimeTable/timeTable.vue
@@ -1077,6 +1077,7 @@ export default {
     },
     getSections(_id) {
       var token = this.$store.state.token;
+      this.desserts = [];
       http()
         .get(
           "/getSectionsList",
-- 
2.0.0