From b039d39fb840c9c5ef7bb7bcf248f64ff4d51ccc Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Fri, 7 Aug 2020 22:00:53 +0530
Subject: [PATCH] Hide Edit functionality in subject screen,  Improve add and
 show functionality in syllabus screen, Hide Delete functionality in class
 screen, Improve add and show functionality in exam Attendence screen, Improve
 get exam schedule functionality in exam schedule screen, Fix issue while
 viewing marks in view mark screen, Hide Delete functionality in sectioin
 screen, Improve updateMeetingEvent api in meeting event screen, Improve add
 and show functionality in assignment screen

---
 src/pages/Academic/assignment.vue       | 13 ++++++------
 src/pages/Academic/subject.vue          | 10 +++++-----
 src/pages/Academic/syllabus.vue         |  5 +++--
 src/pages/Class/addclass.vue            |  4 ++--
 src/pages/Exam/examAttendence.vue       | 21 ++++++++++----------
 src/pages/Exam/examSchedule.vue         | 35 +++++++++++++++++++++++++++------
 src/pages/Mark/viewMark.vue             | 33 ++++++++++++++++++++++++++++---
 src/pages/Section/section.vue           |  4 ++--
 src/pages/meetingEvent/meetingEvent.vue |  6 +++++-
 9 files changed, 94 insertions(+), 37 deletions(-)

diff --git a/src/pages/Academic/assignment.vue b/src/pages/Academic/assignment.vue
index 0722645..cb37f50 100644
--- a/src/pages/Academic/assignment.vue
+++ b/src/pages/Academic/assignment.vue
@@ -10,7 +10,7 @@
           </v-flex>
         </v-layout>
         <v-container fluid>
-          <ref="formEditAssignment" v-model="validEditAssignment" lazy-validation>
+          <v-form ref="formEditAssignment" v-model="validEditAssignment" lazy-validation>
             <v-layout>
               <v-flex xs4 class="pt-4 subheading">
                 <label class="right">Title:</label>
@@ -36,7 +36,7 @@
               <v-flex xs4 class="pt-4 subheading">
                 <label class="right">Deadline:</label>
               </v-flex>
-              <v-flex xs8 class="pt-4 subheading">
+              <v-flex xs8 class="ml-3">
                 <v-menu
                   ref="menu1"
                   :close-on-content-click="false"
@@ -72,7 +72,7 @@
                   item-value="_id"
                   :rules="classRules"
                   v-model="editedItem.classId"
-                  @change="getSections(addAssignment.classId)"
+                  @change="getSections(editedItem.classId)"
                   required
                 ></v-select>
               </v-flex>
@@ -88,7 +88,7 @@
                   item-value="_id"
                   v-model="editedItem.sectionId"
                   :rules="sectionRules"
-                  @change="getClassSubject(addAssignment.classId)"
+                  @change="getClassSubject(editedItem.classId)"
                   required
                 ></v-select>
               </v-flex>
@@ -204,7 +204,7 @@
         <v-select
           :items="classList"
           placeholder="Select Your Class"
-          v-model="addAssignment.classId"
+          v-model="showAssignment.classId"
           item-text="classNum"
           item-value="_id"
           name="Select Class"
@@ -593,6 +593,7 @@ export default {
       fileType: ""
     },
     addAssignment: {},
+    showAssignment: {},
 
     imageData: {},
     imageName: "",
@@ -720,7 +721,7 @@ export default {
         .get(
           "/getAssignmentList",
           {
-            params: { classId: this.addAssignment.classId }
+            params: { classId: this.showAssignment.classId }
           },
           {
             headers: { Authorization: "Bearer " + this.token }
diff --git a/src/pages/Academic/subject.vue b/src/pages/Academic/subject.vue
index 1096ba7..69e7a49 100644
--- a/src/pages/Academic/subject.vue
+++ b/src/pages/Academic/subject.vue
@@ -306,9 +306,9 @@
           <td class="text-xs-center td td-row">{{ props.item.finalMarks }}</td>
           <td class="text-xs-center td td-row">{{ props.item.type }}</td>
 
-          <td class="text-xs-center td td-row">
+          <!-- <td class="text-xs-center td td-row">
             <span>
-              <!-- <v-tooltip top>
+              <v-tooltip top>
                 <img
                   slot="activator"
                   style="cursor:pointer; width:25px; height:25px; "
@@ -317,7 +317,7 @@
                   src="/static/icon/view.png"
                 />
                 <span>View</span>
-              </v-tooltip>-->
+              </v-tooltip>
               <v-tooltip top>
                 <img
                   slot="activator"
@@ -339,7 +339,7 @@
                 <span>Delete</span>
               </v-tooltip>
             </span>
-          </td>
+          </td> -->
         </tr>
       </template>
       <v-alert
@@ -604,7 +604,7 @@ export default {
         sortable: false,
         align: "center"
       },
-      { text: "Action", value: "", sortable: false, align: "center" }
+      // { text: "Action", value: "", sortable: false, align: "center" }
     ],
     subjectList: [],
     classList: [],
diff --git a/src/pages/Academic/syllabus.vue b/src/pages/Academic/syllabus.vue
index 1fdc9db..70014c6 100644
--- a/src/pages/Academic/syllabus.vue
+++ b/src/pages/Academic/syllabus.vue
@@ -145,7 +145,7 @@
         <v-select
           :items="classList"
           label="Select Class"
-          v-model="addSyllabus.classId"
+          v-model="showSyllabus.classId"
           item-text="classNum"
           item-value="_id"
           name="Select Class"
@@ -449,6 +449,7 @@ export default {
     addSection: [],
     editedIndex: -1,
     addSyllabus: {},
+    showSyllabus: {},
 
     editedItem: {
       subjectName: ""
@@ -651,7 +652,7 @@ export default {
       http()
         .get(
           "/getSyallabusList",
-          { params: { classId: this.addSyllabus.classId } },
+          { params: { classId: this.showSyllabus.classId } },
           {
             headers: { Authorization: "Bearer " + this.token }
           }
diff --git a/src/pages/Class/addclass.vue b/src/pages/Class/addclass.vue
index 9552852..eb15a97 100644
--- a/src/pages/Class/addclass.vue
+++ b/src/pages/Class/addclass.vue
@@ -119,7 +119,7 @@
                 />
                 <span>Edit</span>
               </v-tooltip>
-              <v-tooltip top>
+              <!-- <v-tooltip top>
                 <img
                   slot="activator"
                   style="cursor:pointer; width:20px; height:20px; "
@@ -127,7 +127,7 @@
                   src="/static/icon/delete.png"
                 />
                 <span>Delete</span>
-              </v-tooltip>
+              </v-tooltip> -->
             </span>
           </td>
         </tr>
diff --git a/src/pages/Exam/examAttendence.vue b/src/pages/Exam/examAttendence.vue
index 97a6562..049d872 100644
--- a/src/pages/Exam/examAttendence.vue
+++ b/src/pages/Exam/examAttendence.vue
@@ -22,7 +22,7 @@
       <v-spacer></v-spacer>
       <v-flex xs8 sm3 md2 class="mr-3">
         <v-select
-          v-model="addAttendence.examId"
+          v-model="getAttendence.examId"
           label="Select Exam"
           :rules="examRules"
           :items="examList"
@@ -33,31 +33,31 @@
       </v-flex>
       <v-flex xs8 sm3 md2 class="mr-3">
         <v-select
-          v-model="addAttendence.classId"
+          v-model="getAttendence.classId"
           label="Select your class"
           type="text"
           :items="classList"
           item-text="classNum"
           item-value="_id"
-          @change="getSections(addAttendence.classId)"
+          @change="getSections(getAttendence.classId)"
           required
         ></v-select>
       </v-flex>
       <v-flex xs8 sm3 md2 class="mr-3">
         <v-select
-          v-model="addAttendence.sectionId"
+          v-model="getAttendence.sectionId"
           label="Select your section"
           type="text"
           :items="addSection"
           item-text="name"
           item-value="_id"
-          @change="getClassSubject(addAttendence.classId)"
+          @change="getClassSubject(getAttendence.classId)"
           required
         ></v-select>
       </v-flex>
       <v-flex xs8 sm3 md2 class="mr-3">
         <v-select
-          v-model="addAttendence.subjectId"
+          v-model="getAttendence.subjectId"
           label="Select Subject"
           :rules="subjectRules"
           :items="subjectList.subjects"
@@ -378,6 +378,7 @@ export default {
     subjectList: [],
     subjects: [],
     addAttendence: {},
+    getAttendence: {},
     editedItem: {
       sectionId: {
         name: ""
@@ -562,10 +563,10 @@ export default {
       http()
         .get("/getExamAttendenceList", {
           params: {
-            examId: this.addAttendence.examId,
-            classId: this.addAttendence.classId,
-            sectionId: this.addAttendence.sectionId,
-            subjectId: this.addAttendence.subjectId
+            examId: this.getAttendence.examId,
+            classId: this.getAttendence.classId,
+            sectionId: this.getAttendence.sectionId,
+            subjectId: this.getAttendence.subjectId
           }
         })
         .then(response => {
diff --git a/src/pages/Exam/examSchedule.vue b/src/pages/Exam/examSchedule.vue
index 18649fd..ddf8214 100644
--- a/src/pages/Exam/examSchedule.vue
+++ b/src/pages/Exam/examSchedule.vue
@@ -323,7 +323,19 @@
           :items="classList"
           item-text="classNum"
           item-value="_id"
-          @change="getSchedulesList()"
+          @change="getSections(getScheduleData.classId)"
+          required
+        ></v-select>
+      </v-flex>
+      <v-flex xs8 sm3 md2 class="mr-3">
+        <v-select
+          v-model="getScheduleData.sectionId"
+          label="Select your section"
+          type="text"
+          :items="addSection"
+          item-text="name"
+          item-value="_id"
+          @change="getSchedulesList(getScheduleData.classId,getScheduleData.sectionId)"
           required
         ></v-select>
       </v-flex>
@@ -752,7 +764,10 @@ export default {
       this.showLoader = true;
       http()
         .get("/getSchedulesList", {
-          params: { classId: this.getScheduleData.classId },
+          params: {
+            classId: this.getScheduleData.classId,
+            sectionId: this.getScheduleData.sectionId
+          },
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
@@ -765,6 +780,7 @@ export default {
           this.showLoader = false;
           this.loadingSearch = false;
           this.snackbar = true;
+          this.color = "error";
           this.text = error.response.data.message;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -779,7 +795,10 @@ export default {
       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.sectionId =
+        this.editedItem.sectionId === null
+          ? (this.editedItem.sectionId = this.editedItem.sectionId = "")
+          : this.editedItem.sectionId._id;
       this.editedItem.date =
         this.editedItem.date != undefined
           ? (this.editedItem.date = this.editedItem.date.substring(0, 10))
@@ -791,7 +810,10 @@ export default {
       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.editedItem.sectionId =
+        this.editedItem.sectionId === null
+          ? (this.editedItem.sectionId = this.editedItem.sectionId = "")
+          : this.editedItem.sectionId.name;
       this.profileExamScheduleDialog = true;
     },
     deleteSchedule(item) {
@@ -861,8 +883,9 @@ export default {
         })
         .catch(error => {
           this.snackbar = true;
-          this.text = error.response.data.message;
-          this.color = "red";
+          this.text = error.response.data.messages;
+          this.color = "error";
+          this.loading = false;
         });
     },
     getClass() {
diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue
index a76614e..e1a3ca6 100644
--- a/src/pages/Mark/viewMark.vue
+++ b/src/pages/Mark/viewMark.vue
@@ -19,7 +19,7 @@
           ></v-select>
         </v-flex>
       </v-layout>
-      <v-flex xs12 sm12>
+      <v-flex xs12 sm12 v-if="showData">
         <!-- <v-layout wrap> -->
         <!-- ****** TABLE DATA MARK  ****** -->
         <v-flex xs12 sm12 md12>
@@ -268,7 +268,7 @@
         </v-flex>
       </v-flex>
       <!-- print Me -->
-      <v-flex xs12 sm12 id="printMe" v-show="hideViewMark">
+      <v-flex xs12 sm12 id="printMe" v-show="hideViewMark" v-if="showData">
         <!-- <v-layout wrap> -->
         <!-- ****** TABLE DATA MARK  ****** -->
         <v-flex xs12 sm12 md12>
@@ -518,6 +518,14 @@
     <div class="loader" v-if="showLoader">
       <v-progress-circular indeterminate color="white"></v-progress-circular>
     </div>
+    <v-snackbar
+      :timeout="timeout"
+      :top="y === 'top'"
+      :right="x === 'right'"
+      :vertical="mode === 'vertical'"
+      v-model="snackbar"
+      :color="color"
+    >{{ text }}</v-snackbar>
   </v-app>
 </template>
 
@@ -548,7 +556,17 @@ export default {
     selectMarkList: "Mark",
     selectMark: ["Mark", "Grade"],
     MarkData: "",
-    userData: {}
+    userData: {},
+    showData: false,
+
+    //SNACKBAR
+    snackbar: false,
+    color: "",
+    y: "top",
+    x: "right",
+    mode: "",
+    timeout: 10000,
+    text: ""
   }),
   mounted() {
     this.token = this.$store.state.token;
@@ -565,6 +583,15 @@ export default {
         })
         .then(response => {
           this.markData = response.data.data;
+          // console.log("====this.markData===", this.markData);
+          if (this.markData.length === 0) {
+            this.showLoader = false;
+            this.snackbar = true;
+            this.text = "Data not found!";
+            this.color = "error";
+            return;
+          }
+          this.showData = true;
           let newData = response.data.data;
           // console.log("newData", newData);
           for (var i = 0; i < newData.length; i++) {
diff --git a/src/pages/Section/section.vue b/src/pages/Section/section.vue
index 6446b69..d3fca62 100644
--- a/src/pages/Section/section.vue
+++ b/src/pages/Section/section.vue
@@ -211,7 +211,7 @@
                 />
                 <span>Edit</span>
               </v-tooltip>
-              <v-tooltip top>
+              <!-- <v-tooltip top>
                 <img
                   slot="activator"
                   style="cursor:pointer; width:20px; height:20px; "
@@ -220,7 +220,7 @@
                   class="mr-3"
                 />
                 <span>Delete</span>
-              </v-tooltip>
+              </v-tooltip> -->
             </span>
           </td>
         </tr>
diff --git a/src/pages/meetingEvent/meetingEvent.vue b/src/pages/meetingEvent/meetingEvent.vue
index b011292..8f8a895 100644
--- a/src/pages/meetingEvent/meetingEvent.vue
+++ b/src/pages/meetingEvent/meetingEvent.vue
@@ -681,8 +681,12 @@ export default {
       this.$refs.form.reset();
     },
     save() {
+      console.log('=======this.editedItem=====', this.editedItem);
+      if (this.editedItem.courseId) {
+        this.editedItem.courseId = this.editedItem.courseId._id;
+      }
       delete this.editedItem.classId;
-      this.editedItem.courseId = this.editedItem.courseId._id;
+      
       this.editedItem.startTime = moment(this.editedItem.startTime, "hh:mm").format("LT");
       http()
         .put("/updateMeetingEvent", this.editedItem)
-- 
2.0.0