From 57263a890483bb3f459905e9349c28f655ec195d Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Mon, 27 Apr 2020 17:58:16 +0530
Subject: [PATCH] hide subject from sidenav and integrated update routine api

---
 src/api/menu.js                |  13 ++-
 src/pages/Academic/routine.vue | 222 +++++++++++++++--------------------------
 2 files changed, 84 insertions(+), 151 deletions(-)

diff --git a/src/api/menu.js b/src/api/menu.js
index 36aeb49..b18e108 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -18,11 +18,11 @@ const adminMenu = [
         name: 'Section',
         icon: '/static/icon/section.png',
     },
-    {
-        title: 'Subjects',
-        name: 'Subject',
-        icon: '/static/icon/subject.png',
-    },
+    // {
+    //     title: 'Subjects',
+    //     name: 'Subject',
+    //     icon: '/static/icon/subject.png',
+    // },
     {
         title: 'Parents',
         // group: 'apps',
@@ -254,8 +254,7 @@ const schoolMenu = [
     }
 ];
 
-const teacherMenu = [
-    {
+const teacherMenu = [{
         title: 'Dashboard',
         name: 'School',
         icon: '/static/icon/dashboard.png',
diff --git a/src/pages/Academic/routine.vue b/src/pages/Academic/routine.vue
index 09a8b2a..789b5ce 100644
--- a/src/pages/Academic/routine.vue
+++ b/src/pages/Academic/routine.vue
@@ -12,47 +12,18 @@
         <v-container fluid>
           <v-form ref="formEditRoutine" v-model="validEditRoutine" lazy-validation>
             <v-layout>
-              <v-flex xs4 sm4 class="pt-4 subheading">
-                <label class="right">School Year :</label>
-              </v-flex>
-              <v-flex xs8 sm8 class="ml-3">
-                <v-text-field v-model="editedItem.schoolYear" label="Select Year"></v-text-field>
-              </v-flex>
-            </v-layout>
-            <v-layout>
-              <v-flex xs4 sm4 class="pt-4 subheading">
+              <v-flex xs3 sm4 class="pt-4 subheading">
                 <label class="right">Class :</label>
               </v-flex>
-              <v-flex xs8 sm8 class="ml-3">
+              <v-flex xs8 sm8 class="ml-2">
                 <v-select
                   :items="classList"
-                  label="Select Class"
+                  label="Select your Class"
+                  v-model="editedItem.classId"
                   item-text="classNum"
                   item-value="_id"
-                  v-model="editedItem.classId"
-                  name="Select Class"
                   :rules="classRules"
-                  @change="getSections(addRoutine.classId)"
-                  class="pl-2"
-                  required
-                ></v-select>
-              </v-flex>
-            </v-layout>
-            <v-layout>
-              <v-flex xs4 sm4 class="pt-4 subheading">
-                <label class="right">Section :</label>
-              </v-flex>
-              <v-flex xs8 sm8 class="ml-3">
-                <v-select
-                  :items="addSection"
-                  label="Select Section"
-                  item-text="name"
-                  item-value="_id"
-                  v-model="editedItem.sectionId"
-                  name="Select Section"
-                  :rules="sectionRules"
                   @change="getClassSubject(addRoutine.classId)"
-                  class="px-2"
                   required
                 ></v-select>
               </v-flex>
@@ -74,21 +45,6 @@
               </v-flex>
             </v-layout>
             <v-layout>
-              <v-flex xs3 sm4 class="pt-4 subheading">
-                <label class="right">Day :</label>
-              </v-flex>
-              <v-flex xs8 sm8 class="ml-2">
-                <v-select
-                  :items="day"
-                  label="Select your day"
-                  v-model="editedItem.day"
-                  item-text="text"
-                  :rules="dayRules"
-                  required
-                ></v-select>
-              </v-flex>
-            </v-layout>
-            <v-layout>
               <v-flex xs4 sm4 class="pt-4 subheading">
                 <label class="right">Teacher Name :</label>
               </v-flex>
@@ -106,16 +62,15 @@
               </v-flex>
             </v-layout>
             <v-layout>
-              <v-flex xs4 sm4 class="pt-4 subheading">
+              <v-flex xs5 sm4 class="pt-4 subheading">
                 <label class="right">Starting time:</label>
               </v-flex>
-              <v-flex xs8 sm8 class="ml-3">
+              <v-flex xs7 sm6 class="ml-3">
                 <v-menu
-                  ref="menuA"
+                  ref="menuC"
                   :close-on-content-click="false"
-                  v-model="menuB"
+                  v-model="menu4"
                   :nudge-right="40"
-                  :return-value.sync="addRoutine.startingTime"
                   lazy
                   transition="scale-transition"
                   offset-y
@@ -126,29 +81,24 @@
                   <v-text-field
                     slot="activator"
                     v-model="editedItem.startingTime"
-                    label="Select your starting time"
+                    placeholder="Select your starting time"
                     append-icon="access_time"
-                    :rules="timeInRules"
                     readonly
                   ></v-text-field>
-                  <v-time-picker
-                    v-model="editedItem.startingTime"
-                    @change="$refs.menuA.save(addRoutine.startingTime)"
-                  ></v-time-picker>
+                  <v-time-picker v-model="editedItem.startingTime" @change="menu4= false"></v-time-picker>
                 </v-menu>
               </v-flex>
             </v-layout>
             <v-layout>
-              <v-flex xs4 sm4 class="pt-4 subheading">
+              <v-flex xs5 sm4 class="pt-4 subheading">
                 <label class="right">Ending Time:</label>
               </v-flex>
-              <v-flex xs8 sm8 class="ml-3">
+              <v-flex xs7 sm6 class="ml-3">
                 <v-menu
-                  ref="menu"
+                  ref="menuB"
                   :close-on-content-click="false"
-                  v-model="menu1"
+                  v-model="menu3"
                   :nudge-right="40"
-                  :return-value.sync="addRoutine.endingTime"
                   lazy
                   transition="scale-transition"
                   offset-y
@@ -159,15 +109,11 @@
                   <v-text-field
                     slot="activator"
                     v-model="editedItem.endingTime"
-                    label="Select your end time"
+                    placeholder="Select your end time"
                     append-icon="access_time"
-                    :rules="timeOutRules"
                     readonly
                   ></v-text-field>
-                  <v-time-picker
-                    v-model="editedItem.endingTime"
-                    @change="$refs.menu.save(addRoutine.endingTime)"
-                  ></v-time-picker>
+                  <v-time-picker v-model="editedItem.endingTime" @change="menu3 = false"></v-time-picker>
                 </v-menu>
               </v-flex>
             </v-layout>
@@ -367,12 +313,6 @@
                             <template slot="items" slot-scope="props">
                               <tr class="tr">
                                 <td>{{ props.item.day }}</td>
-                                <!-- <td class="text-center"> -->
-                                  <!-- <br /> -->
-                                  <!-- {{ props.item.classId.classNum }}
-                                  <br />
-                                  {{ props.item.sectionId.name }} -->
-                                <!-- </td> -->
                                 <td class="text-center" v-for="list in props.item.lectureRoutine">
                                   {{ props.item.classId.classNum }}
                                   <br />
@@ -384,7 +324,7 @@
                                   <br />
                                   {{ list.subjectName }}
                                   <br />
-                                  {{ list.teacherId .name}}
+                                  {{ list.teacherId.name}}
                                   <br />
                                   <span>
                                     <v-tooltip top>
@@ -392,7 +332,7 @@
                                         slot="activator"
                                         style="cursor:pointer; width:20px; height:18px; "
                                         class="mr-3"
-                                        @click="editItem()"
+                                        @click="editItem(list, props.item)"
                                         src="/static/icon/edit.png"
                                       />
                                       <span>Edit</span>
@@ -541,14 +481,14 @@
                   </v-flex>
                 </v-layout>
                 <v-layout>
-                  <v-flex xs4 sm4 class="pt-4 subheading">
+                  <v-flex xs4 class="pt-4 subheading">
                     <label class="right">Starting time:</label>
                   </v-flex>
-                  <v-flex xs8 sm8 class="ml-3">
+                  <v-flex xs8 sm6 class="ml-3">
                     <v-menu
                       ref="menuA"
                       :close-on-content-click="false"
-                      v-model="menuB"
+                      v-model="menu2"
                       :nudge-right="40"
                       :return-value.sync="addRoutine.startingTime"
                       lazy
@@ -574,10 +514,10 @@
                   </v-flex>
                 </v-layout>
                 <v-layout>
-                  <v-flex xs4 sm4 class="pt-4 subheading">
+                  <v-flex xs4 class="pt-4 subheading">
                     <label class="right">Ending Time:</label>
                   </v-flex>
-                  <v-flex xs8 sm8 class="ml-3">
+                  <v-flex xs8 sm6 class="ml-3">
                     <v-menu
                       ref="menu"
                       :close-on-content-click="false"
@@ -700,8 +640,9 @@ export default {
     token: "",
 
     menu1: false,
-    menuB: false,
     menu2: false,
+    menu4: false,
+    menu3: false,
 
     schoolRules: [v => !!v || "School Year is required"],
     classRules: [v => !!v || " Class Name is required"],
@@ -729,24 +670,15 @@ export default {
     startingTime: "",
     editedItem: {}
 
-    // editedItem: {
-    //   schoolYear: "",
-    //   day: "",
-    //   teacherId: "",
-    //   classId: "",
-    //   sectionId: "",
-    //   startingTime: "",
-    //   endingTime: "",
-    //   room: "",
-    //   period: "",
-    //   subjectName: ""
-    // }
   }),
   methods: {
-    editItem(item) {
+    editItem(item, routineData) {
+      console.log("routineData", routineData)
+      console.log("item", item)
       this.editedIndex = this.routineList;
       this.editedItem = Object.assign({}, item);
-      // this.editedItem.subjectName = item.lectureRoutine.subjectName;
+      this.editedItem.lectureRoutineId = item._id;
+      this.editedItem.routineId = routineData._id;
       this.dialog = true;
       this.editRoutineDialog = true;
     },
@@ -818,52 +750,54 @@ export default {
     },
 
     update() {
-      // if (this.$refs.formEditRoutine.validate()) {
-      //   let editSubject = {
-      //     classId: this.editedItem.classId,
-      //     subjectId: this.editedItem._id,
-      //     teacherId: this.editedItem.teacherId,
-      //     type: this.editedItem.type,
-      //     passMarks: this.editedItem.passMarks,
-      //     finalMarks: this.editedItem.finalMarks,
-      //     subjectAuthor: this.editedItem.subjectAuthor,
-      //     subjectCode: this.editedItem.subjectCode,
-      //     subjectName: this.editedItem.subjectName
-      //   };
-      //   this.editLoading = true;
-      //   http()
-      //     .put("/updateSubject", editSubject)
-      //     .then(response => {
-      //       this.snackbar = true;
-      //       this.text = "Successfully Edit Existing Subject";
-      //       this.color = "green";
-      //       this.editLoading = false;
-      //       this.editRoutineDialog = false;
-      //       http()
-      //         .get(
-      //           "/getParticularClass",
-      //           { params: { classId: _id } },
-      //           {
-      //             headers: { Authorization: "Bearer " + this.token }
-      //           }
-      //         )
-      //         .then(response => {
-      //           this.subjectList = response.data.data;
-      //           this.snackbar = true;
-      //           this.color = "green";
-      //           this.text = response.data.message;
-      //           this.close();
-      //         })
-      //         .catch(err => {
-      //           console.log("err====>", err);
-      //         });
-      //     })
-      //     .catch(error => {
-      //       this.editLoading = false;
-
-      //       // console.log(error);
-      //     });
-      // }
+      if (this.$refs.formEditRoutine.validate()) {
+        let editRoutine = {
+          routineId: this.editedItem.routineId,
+          lectureRoutineId: this.editedItem.lectureRoutineId,
+          subjectName: this.editedItem.subjectName,
+          teacherId: this.editedItem.teacherId,
+          startingTime: this.editedItem.startingTime,
+          endingTime: this.editedItem.endingTime,
+          room: this.editedItem.room,
+          period: this.editedItem.period
+        };
+        this.editLoading = true;
+        http()
+          .put("/updateRoutine", editRoutine)
+          .then(response => {
+            this.snackbar = true;
+            this.text = "Successfully Edit Existing Routine";
+            this.color = "green";
+            this.editLoading = false;
+            this.editRoutineDialog = false;
+            this.getRoutineList();
+            // http()
+            //   .get(
+            //     "/getRoutineList",
+            //     {
+            //       params: {
+            //         classId: this.addRoutine.classId,
+            //         sectionId: this.addRoutine.sectionId
+            //       }
+            //     },
+            //     {
+            //       headers: { Authorization: "Bearer " + this.token }
+            //     }
+            //   )
+            //   .then(response => {
+            //     this.routineList = response.data.data;
+            //     this.showLoader = false;
+            //     this.showTable = true;
+            //     this.hideTable = false;
+            //   })
+            //   .catch(err => {
+            //     console.log("err====>", err);
+            //   });
+          })
+          .catch(error => {
+            this.editLoading = false;
+          });
+      }
     },
     getClass() {
       http()
-- 
2.0.0