From c8fc8e42e916000a9966539a8e5732346554c976 Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Tue, 18 Feb 2020 18:59:23 +0530
Subject: [PATCH] solved issues

---
 src/api/menu.js                 |  2 +-
 src/pages/Exam/exam.vue         |  8 ++++----
 src/pages/Students/students.vue |  9 +++++----
 src/pages/Subjects/subjects.vue | 11 +++++++++--
 src/pages/Teachers/teachers.vue |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/api/menu.js b/src/api/menu.js
index dae3986..7149656 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -89,7 +89,7 @@ const adminMenu = [
         items: [
             { name: 'AcademicYear', title: 'Academic Year', component: 'Academic Year', action: '', },
             // { name: 'systemAdmin', title: 'System Admin', component: 'systemAdmin', action: '', },
-            { name: 'resetPassword', title: 'Reset Password', component: 'Reset Password', action: '', },
+            { name: 'resetPassword', title: 'Change Password', component: 'Change Password', action: '', },
             { name: 'Role', title: 'Role', component: 'Role', action: '', },
             { name: 'BulkImport', title: 'Bulk Import', component: 'Bulk Import', action: '', },
 
diff --git a/src/pages/Exam/exam.vue b/src/pages/Exam/exam.vue
index 0cf7712..44070f0 100644
--- a/src/pages/Exam/exam.vue
+++ b/src/pages/Exam/exam.vue
@@ -294,7 +294,6 @@
                 <v-flex xs8 sm7 class="ml-3">
                   <v-text-field
                     placeholder="fill your Note"
-                    :rules="noteRules"
                     v-model="addExam.note"
                   ></v-text-field>
                 </v-flex>
@@ -363,7 +362,6 @@ export default {
     authorRules: [v => !!v || "Author Name is required"],
     subjectCodeRules: [v => !!v || "Subject Code is required"],
     authorRules: [v => !!v || "Author is required"],
-    noteRules: [v => !!v || "Note is required"],
     examDateRules: [v => !!v || "Date is required"],
     headers: [
       {
@@ -438,7 +436,7 @@ export default {
       this.editedItem = Object.assign({}, item);
       this.profileExamDialog = true;
     },
-    deleteExam(item) {
+    deleteItem(item) {
       let Exam = {
         examId: item._id
       };
@@ -455,7 +453,9 @@ export default {
           this.getExamList();
         })
         .catch(error => {
-          // console.log(error);
+          this.snackbar = true;
+          this.text = error.response.data.message;
+          this.color = "error";
         });
     },
     close() {
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index e7e0999..4373a2f 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -517,7 +517,7 @@
                     </b>
                   </v-flex>
                   <v-flex sm8 xs6>
-                    <h5 class="my-1">{{ dates(editedItem.dob) }}</h5>
+                    <h5 class="my-1">{{ editedItem.dob }}</h5>
                   </v-flex>
                 </v-layout>
               </v-flex>
@@ -945,7 +945,7 @@
           <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.establishmentYear }}</td>
-          <td class="text-xs-center td td-row">{{ props.item.mobile}}</td>
+          <!-- <td class="text-xs-center td td-row">{{ props.item.mobile}}</td> -->
           <td class="text-xs-center td td-row">
             <v-switch
               class="pl-3"
@@ -1650,6 +1650,7 @@
                                 <v-text-field
                                   v-model="addStudents.rollNo"
                                   placeholder="Fill your Roll Number"
+                                  :rules="rollNo"
                                   required
                                 ></v-text-field>
                               </v-flex>
@@ -1976,7 +1977,7 @@ export default {
         sortable: false,
         align: "center"
       },
-      { text: "Mobile No", value: "mobile", sortable: false, align: "center" },
+      // { text: "Mobile No", value: "mobile", sortable: false, align: "center" },
       {
         text: "Status",
         value: "status",
@@ -2112,7 +2113,7 @@ export default {
       this.$refs.editDataImage.click();
     },
     dates: function(date) {
-      return moment(date).format("MMMM DD, YYYY");
+      return moment(date).format("MMM DD, YYYY");
     },
     onFilePicked(e) {
       // console.log(e)
diff --git a/src/pages/Subjects/subjects.vue b/src/pages/Subjects/subjects.vue
index 546507a..c59d554 100644
--- a/src/pages/Subjects/subjects.vue
+++ b/src/pages/Subjects/subjects.vue
@@ -58,7 +58,7 @@
     <!-- ****** VIEW PROFIL NOTICE BOARD ******  -->
 
     <v-dialog v-model="viewSubjectDialog" max-width="600px">
-      <v-toolbar color="v-toolbar">
+      <v-toolbar flat class="card-style pa-3" dark>
         <v-spacer></v-spacer>
         <v-toolbar-title>
           <h3>Subject</h3>
@@ -332,12 +332,17 @@ export default {
       this.$refs.image.click();
     },
     editItem(item) {
+      this.editedIndex = this.subjectList.subjects;
       this.editedItem = Object.assign({}, item);
       this.dialog = true;
+      this.editSubjectDialog = true;
     },
     profile(item) {
+      this.editedIndex = this.subjectList.subjects;
       this.editedItem = Object.assign({}, item);
       this.dialog1 = true;
+      this.viewSubjectDialog = true;
+
     },
     deleteItem(item) {
       let deleteSubject = {
@@ -357,7 +362,9 @@ export default {
           this.text = "Successfully delete Existing Subject";
         })
         .catch(error => {
-          // console.log(error);
+          this.snackbar = true;
+          this.text = error.response.data.message;
+          this.color = "error";
         });
     },
     close() {
diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue
index 8138f25..ce8becb 100644
--- a/src/pages/Teachers/teachers.vue
+++ b/src/pages/Teachers/teachers.vue
@@ -6,7 +6,7 @@
         <v-card-text>
           <v-layout>
             <v-flex xs12>
-              <label class="title text-xs-center">Edit Teacher</label>
+              <label class="title text-xs-center">Edit Teacher Details</label>
               <v-icon size="24" class="right" @click="editTeacherDialog = false">cancel</v-icon>
             </v-flex>
           </v-layout>
-- 
2.0.0