From 0721aca93505fe4576a52ff0b3cb6084b21726a8 Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Mon, 30 Dec 2019 17:17:26 +0530
Subject: [PATCH] solve bugs in subject and create student

---
 src/pages/Account/globalPayment.vue   |  4 +-
 src/pages/NoticeBoard/noticeBoard.vue |  2 +-
 src/pages/Students/students.vue       | 90 ++++++++++++++---------------------
 src/pages/Subjects/subjects.vue       | 35 +++++++-------
 4 files changed, 57 insertions(+), 74 deletions(-)

diff --git a/src/pages/Account/globalPayment.vue b/src/pages/Account/globalPayment.vue
index 4381960..d94e661 100644
--- a/src/pages/Account/globalPayment.vue
+++ b/src/pages/Account/globalPayment.vue
@@ -142,8 +142,8 @@
                 hide-actions
               >
                 <template slot="items" slot-scope="props">
-                  <td id="td" class="text-xs-center">{{ props.item.invoiceNumber}}</td>
-                  <td id="td" class="text-xs-center">{{ props.item.totalAmount}}</td>
+                  <td id="td" class="text-xs-center">{{ props.item.invoiceNumber }}</td>
+                  <td id="td" class="text-xs-center">{{ props.item.totalAmount }}</td>
                   <td id="td" class="text-xs-center">{{ props.item.totalDiscount }}</td>
                   <td id="td" class="text-xs-center">{{ props.item.totalSubTotal }}</td>
                   <td id="td" class="text-xs-center">{{ props.item.paymentStatus}}</td>
diff --git a/src/pages/NoticeBoard/noticeBoard.vue b/src/pages/NoticeBoard/noticeBoard.vue
index bc82db1..0e2fd69 100644
--- a/src/pages/NoticeBoard/noticeBoard.vue
+++ b/src/pages/NoticeBoard/noticeBoard.vue
@@ -129,7 +129,7 @@
 
         <!-- ****** VIEW PROFIL NOTICE BOARD ******  -->
 
-        <v-dialog v-model="dialog1" max-width="640px" scrollable>
+        <v-dialog v-model="dialog1" max-width="940px" scrollable>
           <v-card>
             <v-toolbar color="grey lighten-2" flat>
               <v-spacer></v-spacer>
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index 239f293..b17f604 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -132,7 +132,8 @@
                     <v-flex xs12 sm4>
                       <v-layout>
                         <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Email ID:</label>
+                          <label class="right hidden-xs-only hidden-sm-only">Email Id:</label>
+                          <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Email:</label>
                         </v-flex>
                         <v-flex xs8 class="ml-3">
                           <v-text-field
@@ -217,15 +218,15 @@
                     <v-flex xs12 sm4>
                       <v-layout>
                         <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Allergies:</label>
+                          <label class="right">Gender:</label>
                         </v-flex>
                         <v-flex xs8 class="ml-3">
-                          <v-text-field
-                            v-model="editedItem.allergies"
-                            placeholder="fill your Allergies"
-                            name="pincode"
+                          <v-select
+                            :items="gender"
+                            v-model="editedItem.gender"
+                            placeholder="Select Gender"
                             required
-                          ></v-text-field>
+                          ></v-select>
                         </v-flex>
                       </v-layout>
                     </v-flex>
@@ -365,21 +366,6 @@
                     <v-flex xs12 sm4>
                       <v-layout>
                         <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Gender:</label>
-                        </v-flex>
-                        <v-flex xs8 class="ml-3">
-                          <v-select
-                            :items="gender"
-                            v-model="editedItem.gender"
-                            placeholder="Select Gender"
-                            required
-                          ></v-select>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                    <v-flex xs12 sm4>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
                           <label class="right hidden-xs-only hidden-sm-only">Roll Number:</label>
                           <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Roll No:</label>
                         </v-flex>
@@ -393,9 +379,7 @@
                         </v-flex>
                       </v-layout>
                     </v-flex>
-                  </v-layout>
-                  <v-layout class="hidden-xs-only hidden-sm-only">
-                    <v-flex xs12 sm4>
+                    <v-flex xs12 sm4 class="hidden-xs-only hidden-sm-only">
                       <v-layout>
                         <v-flex xs4 sm4 class="pt-4 subheading">
                           <label class="right hidden-xs-only hidden-sm-only">Permanent Address:</label>
@@ -412,6 +396,8 @@
                         </v-flex>
                       </v-layout>
                     </v-flex>
+                  </v-layout>
+                  <v-layout class="hidden-xs-only hidden-sm-only">
                     <v-flex xs12 sm4>
                       <v-layout>
                         <v-flex xs4 class="pt-4 subheading">
@@ -572,7 +558,7 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                  <v-flex xs12 sm6>
+                  <!-- <v-flex xs12 sm6>
                     <v-layout>
                       <v-flex xs6 sm4>
                         <b>
@@ -585,6 +571,20 @@
                         <h5 class="my-1">{{ editedItem.allergies }}</h5>
                       </v-flex>
                     </v-layout>
+                  </v-flex>-->
+                   <v-flex xs12 sm6>
+                    <v-layout>
+                      <v-flex xs6 sm4>
+                        <b>
+                          <h5 class="right my-1">
+                            <b>Roll No. :</b>
+                          </h5>
+                        </b>
+                      </v-flex>
+                      <v-flex sm6 xs6>
+                        <h5 class="my-1">{{ editedItem.rollNo }}</h5>
+                      </v-flex>
+                    </v-layout>
                   </v-flex>
                 </v-layout>
                 <v-layout wrap>
@@ -697,7 +697,7 @@
                       <v-flex xs6 sm4>
                         <b>
                           <h5 class="right my-1">
-                            <b>Fahter Name:</b>
+                            <b>FahterName:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -713,7 +713,7 @@
                       <v-flex xs6 sm6>
                         <b>
                           <h5 class="right my-1">
-                            <b>Mother Name:</b>
+                            <b>MotherName:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -727,7 +727,7 @@
                       <v-flex xs6 sm6>
                         <b>
                           <h5 class="right my-1">
-                            <b>Father Cell No:</b>
+                            <b>FatherCellNo:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -743,7 +743,7 @@
                       <v-flex xs6 sm6>
                         <b>
                           <h5 class="right my-1">
-                            <b>Mother Cell No:</b>
+                            <b>MotherCellNo:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -757,7 +757,7 @@
                       <v-flex xs6 sm6>
                         <b>
                           <h5 class="my-1 right">
-                            <b>Academic Year:</b>
+                            <b>AcademicYear:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -773,7 +773,7 @@
                       <v-flex xs6 sm6>
                         <b>
                           <h5 class="my-1 right">
-                            <b>Medical Notes:</b>
+                            <b>MedicalNotes:</b>
                           </h5>
                         </b>
                       </v-flex>
@@ -782,23 +782,7 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                  <v-flex xs12 sm6>
-                    <v-layout>
-                      <v-flex xs6 sm6>
-                        <b>
-                          <h5 class="right my-1">
-                            <b>Roll No. :</b>
-                          </h5>
-                        </b>
-                      </v-flex>
-                      <v-flex sm6 xs6>
-                        <h5 class="my-1">{{ editedItem.rollNo }}</h5>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                </v-layout>
-                <v-layout wrap class="hidden-xs-only">
-                  <v-flex xs12 sm5>
+                  <v-flex xs12 sm5 class="hidden-xs-only">
                     <v-layout wrap>
                       <v-flex sm6>
                         <b>
@@ -812,7 +796,7 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                  <v-flex sm6>
+                  <v-flex sm6 class="hidden-xs-only">
                     <v-layout wrap>
                       <v-flex sm6>
                         <b>
@@ -830,7 +814,7 @@
                 <v-layout wrap class="hidden-sm-only hidden-md-only hidden-lg-only hidden-xl-only">
                   <v-flex xs12 sm5>
                     <v-layout wrap>
-                      <v-flex xs8 sm6>
+                      <v-flex xs12 sm6>
                         <b>
                           <h5 class="my-1">
                             <b>present Address:-</b>
@@ -844,7 +828,7 @@
                   </v-flex>
                   <v-flex xs12 sm6>
                     <v-layout wrap>
-                      <v-flex xs9 sm6>
+                      <v-flex xs12 sm6>
                         <b>
                           <h5 class="my-1">
                             <b>Permanent Address:-</b>
@@ -2204,7 +2188,6 @@ export default {
           classId: this.addStudents.select,
           sectionId: this.addStudents.selectSection,
           bloodGroup: this.addStudents.bloodGroup,
-          allergies: this.addStudents.allergies,
           medicalNotes: this.addStudents.medicalNotes,
           height: this.addStudents.height,
           weight: this.addStudents.weight,
@@ -2257,7 +2240,6 @@ export default {
         classId: this.editedItem.select,
         sectionId: this.editedItem.selectSection,
         bloodGroup: this.editedItem.bloodGroup,
-        allergies: this.editedItem.allergies,
         medicalNotes: this.editedItem.medicalNotes,
         height: this.editedItem.height,
         weight: this.editedItem.weight,
diff --git a/src/pages/Subjects/subjects.vue b/src/pages/Subjects/subjects.vue
index ba91073..acdf332 100644
--- a/src/pages/Subjects/subjects.vue
+++ b/src/pages/Subjects/subjects.vue
@@ -135,12 +135,12 @@
                 <v-select
                   :items="classList"
                   label="Select Class"
-                  v-model="addSubject.selectName"
+                  v-model="selectClassId"
                   item-text="classNum"
                   item-value="_id"
                   name="Select Class"
                   :rules="nameRules"
-                  @change="getClassSubject(addSubject.selectName)"
+                  @change="getClassSubject"
                   class="px-4"
                   required
                 ></v-select>
@@ -212,7 +212,7 @@
             :right="x === 'right'"
             :vertical="mode === 'vertical'"
             v-model="snackbar"
-            color="success"
+            :color="color"
           >{{ text }}</v-snackbar>
           <v-flex xs12 sm8 offset-sm2 class="top">
             <v-card flat>
@@ -288,6 +288,7 @@ export default {
     mode: "",
     timeout: 3000,
     text: "",
+    color: "",
     showLoader: false,
     loading: false,
     date: null,
@@ -324,6 +325,7 @@ export default {
     editedIndex: -1,
     addSubject: {},
     selectClassId: "",
+    selectClassId: "",
     editedItem: {
       subjectName: ""
     }
@@ -335,7 +337,6 @@ export default {
 
     editItem(item) {
       this.editedItem = Object.assign({}, item);
-      console.log("this.editedItem._id", this.editedItem._id);
       this.dialog = true;
     },
     profile(item) {
@@ -344,7 +345,7 @@ export default {
     },
     deleteItem(item) {
       let deleteSubject = {
-        classId: this.addSubject.selectName,
+        classId: this.selectClassId,
         subjectId: item._id
       };
       http()
@@ -355,10 +356,9 @@ export default {
           }
         )
         .then(response => {
-          if ((this.snackbar = true)) {
-            this.text = "Successfully delete Existing Subject";
-          }
-          this.getEventList();
+          this.getClassSubject();
+          this.snackbar = true;
+          this.text = "Successfully delete Existing Subject";
         })
         .catch(error => {
           // console.log(error);
@@ -392,16 +392,17 @@ export default {
         http()
           .post("/addSubject", this.addSubject)
           .then(response => {
-            if ((this.snackbar = true)) {
-              this.text = "New Subject added successfully";
-            }
+            this.getClassSubject();
+            this.snackbar = true;
+            this.text = "New Subject added successfully";
             this.clear();
+            this.color = "green";
           })
           .catch(error => {
             // console.log(error);
-            if ((this.snackbar = true)) {
-              this.text = error.response.data.message;
-            }
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "error";
           });
       }
     },
@@ -442,8 +443,8 @@ export default {
         });
       this.close();
     },
-    getClassSubject(id) {
-      this.selectClassId = id;
+    getClassSubject() {
+      this.selectClassId = this.selectClassId;
       http()
         .get(
           "/getParticularClass",
-- 
2.0.0