From aa63ee55a2bc948af8654aa305d85ba26ab0868a Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Fri, 10 Jan 2020 12:06:22 +0530
Subject: [PATCH] fixed validation and loader in time table

---
 src/pages/TimeTable/timeTable.vue | 86 +++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/pages/TimeTable/timeTable.vue b/src/pages/TimeTable/timeTable.vue
index 5b187fd..83ef814 100644
--- a/src/pages/TimeTable/timeTable.vue
+++ b/src/pages/TimeTable/timeTable.vue
@@ -120,7 +120,7 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card flat>
-              <v-form>
+              <v-form ref="formAddDay" v-model="validAddDay" lazy-validation>
                 <v-container fluid>
                   <v-flex xs12 sm12 class="py-3">
                     <v-layout>
@@ -133,6 +133,7 @@
                           :items="addOneDay"
                           label="Select Day"
                           v-model="schedule.selectDay"
+                          :rules="selecDayRule"
                         ></v-select>
                       </v-flex>
                     </v-layout>
@@ -427,7 +428,7 @@
               ></v-select>
             </v-layout>
             <v-spacer></v-spacer>
-            <v-btn @click="findTimeTable()" round dark :loading="loading" class="left">Find</v-btn>
+            <v-btn @click="findTimeTable()" round dark :loading="loadingFindData" class="left">Find</v-btn>
           </v-card-actions>
           <v-layout class="hidden-xl-only hidden-lg-only hidden-md-only">
             <v-flex xs4 sm2 class="mt-4 ml-2">
@@ -521,7 +522,6 @@
                       />
                       <span>Add</span>
                     </v-tooltip>
-                    <!-- <v-icon color="black" >add_circle_outline</v-icon> -->
                   </span>
                 </td>
               </tr>
@@ -619,6 +619,7 @@
                           item-text="classNum"
                           item-value="_id"
                           @change="getSections(timeTable.select)"
+                          :rules="classRules"
                           required
                         ></v-select>
                       </v-flex>
@@ -637,6 +638,7 @@
                           v-model="timeTable.selectSection"
                           item-text="name"
                           item-value="_id"
+                          :rules="sectionRules"
                           required
                         ></v-select>
                       </v-flex>
@@ -655,6 +657,7 @@
                           v-model="timeTable.selectTeacher"
                           item-text="name"
                           item-value="_id"
+                          :rules="teacherRules"
                           required
                         ></v-select>
                       </v-flex>
@@ -670,6 +673,7 @@
                           :items="addOneDay"
                           label="Select Day"
                           v-model="timeTable.selectDay"
+                          :rules="dayRules"
                           item-text="name"
                           item-value="_id"
                           required
@@ -718,6 +722,7 @@
                             v-model="timeTable.timeIn"
                             label="Select your timeIn"
                             append-icon="access_time"
+                            :rules="timeInRules"
                           ></v-text-field>
                           <v-time-picker
                             v-model="timeTable.timeIn"
@@ -751,6 +756,7 @@
                             v-model="timeTable.timeOut"
                             label="Select your Time Out"
                             append-icon="access_time"
+                            :rules="timeOutRules"
                           ></v-text-field>
                           <v-time-picker
                             v-model="timeTable.timeOut"
@@ -805,8 +811,10 @@ export default {
     dialogSchedule: false,
     dialog1: false,
     valid: true,
+    validAddDay: true,
     isActive: true,
     newActive: false,
+    loadingFindData: false,
     addclass: [],
     addSection: [],
     addTeachers: [],
@@ -823,6 +831,12 @@ export default {
     timeOutRules: [v => !!v || "Time Out is required"],
     lectureRules: [v => !!v || "Lecture No is required"],
     subjectNameRules: [v => !!v || "Subject Name is required"],
+    classRules: [v => !!v || "Class Name is required"],
+    sectionRules: [v => !!v || "Section Name is required"],
+    sectionRules: [v => !!v || "Section Name is required"],
+    teacherRules: [v => !!v || "Teacher Name is required"],
+    selecDayRule: [v => !!v || "Day is required"],
+    dayRules: [v => !!v || "Day is required"],
     getParticulerLecture: "",
     headers: [
       {
@@ -916,6 +930,7 @@ export default {
   }),
   methods: {
     findTimeTable() {
+      this.loadingFindData = true;
       http()
         .get("/getParticularClassTimeTable", {
           params: {
@@ -925,12 +940,13 @@ export default {
         })
         .then(response => {
           this.desserts = response.data.data;
+          this.loadingFindData = false;
         })
         .catch(error => {
-          if ((this.snackbar = true)) {
-            this.text = error.response.data.message;
-            this.text = error.response.data.statusText;
-          }
+          this.loadingFindData = false;
+          this.snackbar = true;
+          this.text = error.response.data.message;
+          this.text = error.response.data.statusText;
         });
     },
     getSections(_id) {
@@ -953,11 +969,14 @@ export default {
     getTimeTable(item) {
       this.showLoader = true;
       this.getParticulerLecture = item._id;
+      this.getTimeTableDayData();
+    },
+    getTimeTableDayData() {
       var token = this.$store.state.token;
       http()
         .get(
           "/getParticularTimeTable",
-          { params: { timeTableId: item._id } },
+          { params: { timeTableId: this.getParticulerLecture } },
           {
             headers: { Authorization: "Bearer " + token }
           }
@@ -1020,11 +1039,11 @@ export default {
       this.dialog = true;
     },
     updateTimeTable(timeToUpdate, classToUpdate) {
-      console.log(
-        "timeToUpdate, classToUpdate",
-        timeToUpdate._id,
-        classToUpdate.schedule
-      );
+      // console.log(
+      //   "timeToUpdate, classToUpdate",
+      //   timeToUpdate._id,
+      //   classToUpdate.schedule
+      // );
       for (let i = 0; i < classToUpdate.schedule.length; i++) {
         this.updateLecturesId.scheduleId = classToUpdate.schedule[i]._id;
       }
@@ -1135,10 +1154,6 @@ export default {
     },
     close() {
       this.dialog = false;
-      setTimeout(() => {
-        this.editedItem = Object.assign({}, this.defaultItem);
-        this.editedIndex = -1;
-      }, 300);
     },
     close1() {
       this.dialog1 = false;
@@ -1252,26 +1267,27 @@ export default {
       this.dialogSchedule = true;
     },
     submitSchedule() {
-      let scheduleDayData = {
-        timeTableId: this.scheduleDayId,
-        day: this.schedule.selectDay
-      };
-      http()
-        .post("/addSchedule", scheduleDayData)
-        .then(response => {
-          if ((this.snackbar = true)) {
+      if (this.$refs.formAddDay.validate()) {
+        let scheduleDayData = {
+          timeTableId: this.scheduleDayId,
+          day: this.schedule.selectDay
+        };
+        http()
+          .post("/addSchedule", scheduleDayData)
+          .then(response => {
+            this.snackbar = true;
             this.text = "New Schedule Day added successfully";
-          }
-          this.dialogSchedule = true;
-          this.loading = false;
-        })
-        .catch(error => {
-          // console.log(error);
-          if ((this.snackbar = true)) {
+            this.dialogSchedule = false;
+            this.loading = false;
+            this.getTimeTableDayData();
+          })
+          .catch(error => {
+            // console.log(error);
+            this.snackbar = true;
             this.text = error.response.data.message;
-          }
-          this.loading = false;
-        });
+            this.loading = false;
+          });
+      }
     }
   },
   mounted() {
-- 
2.0.0