From 25205ccca8eb128374c75d99af940c04acf5ab0c Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Wed, 12 Feb 2020 16:33:38 +0530
Subject: [PATCH] show school logo and name modification in some pages and done
 task of global payment

---
 src/Services/http.js                     |  11 +-
 src/components/pageHeader/AppToolbar.vue |   6 +-
 src/pages/Account/globalPayment.vue      | 103 +++++++-----
 src/pages/Account/invoice.vue            |  15 +-
 src/pages/Account/viewInvoice.vue        | 270 ++++++++++++++++++-------------
 src/pages/Dashboard/dashboard.vue        |  34 +++-
 src/pages/Mark/viewMark.vue              |  50 +++---
 src/pages/Report/progressCardReport.vue  |  80 ++++-----
 src/pages/Report/studentReport.vue       |  18 ++-
 src/pages/School/school.vue              |   2 +-
 10 files changed, 320 insertions(+), 269 deletions(-)

diff --git a/src/Services/http.js b/src/Services/http.js
index 75e8168..d383d1f 100644
--- a/src/Services/http.js
+++ b/src/Services/http.js
@@ -4,13 +4,18 @@ import store from '@/store/store'
 const baseDomain = "http://15.206.52.174:8001/v1";
 
 const baseURL = `${baseDomain}`;
-
+var token = ""
+if (store.state.role === "ADMIN") {
+    token = `${store.state.token}`
+} else if (store.state.schoolRole === "SUPERADMIN") {
+    token = `${store.state.schoolToken}`
+}
 export default () => {
     return axios.create({
-        // baseURL: 'http://192.168.0.105:3002/v1',
+        // baseURL: 'http://192.168.0.127:3002/v1',
         baseURL,
         headers: {
-            Authorization: `Bearer ${store.state.token}`
+            Authorization: `Bearer ${token}`
         }
     })
 }
\ No newline at end of file
diff --git a/src/components/pageHeader/AppToolbar.vue b/src/components/pageHeader/AppToolbar.vue
index 6b07487..0176108 100644
--- a/src/components/pageHeader/AppToolbar.vue
+++ b/src/components/pageHeader/AppToolbar.vue
@@ -106,7 +106,11 @@ export default {
     },
     getUserData() {
       http()
-        .get("/getParticularUserDetail")
+        .get("/getParticularUserDetail", {
+           headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
+        })
         .then(response => {
           this.userData = response.data.data;
         })
diff --git a/src/pages/Account/globalPayment.vue b/src/pages/Account/globalPayment.vue
index 31ad73a..cb28f8a 100644
--- a/src/pages/Account/globalPayment.vue
+++ b/src/pages/Account/globalPayment.vue
@@ -94,10 +94,7 @@
                     style="margin: auto;display:block;margin-bottom:10px !important"
                   >
                     <img src="/static/icon/user.png" v-if="!invoiceData.studentId.profilePicUrl" />
-                    <img
-                      :src="invoiceData.studentId.profilePicUrl"
-                      v-else-if="invoiceData.studentId.profilePicUrl"
-                    />
+                    <img :src="invoiceData.studentId.profilePicUrl" v-else-if="invoiceData.studentId.profilePicUrl" />
                   </v-avatar>
                 </v-flex>
               </v-layout>
@@ -134,7 +131,7 @@
             </v-card>
           </v-flex>
           <v-flex xs12 sm12 md8 v-show="showInvoiceTable">
-            <v-card>
+            <v-card class="transparent">
               <v-data-table
                 :headers="headers"
                 :items="studentInvoiceData"
@@ -142,27 +139,28 @@
                 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.totalDiscount }}</td>
-                  <td id="td" class="text-xs-center">{{ props.item.totalSubTotal }}</td>
-                  <td id="td" class="text-xs-center">{{ props.item.paymentStatus}}</td>
-                  <td id="td" class="text-xs-center">{{ dates(props.item.date) }}</td>
-                  <td class="text-xs-center">
-                    <router-link
-                      :to="{ name:'View Invoice',params: { viewInvoiceId:props.item._id } }"
-                    >
-                      <v-tooltip top>
-                        <img
-                          slot="activator"
-                          style="cursor:pointer; width:25px; height:18px; "
-                          @click="profile(props.item)"
-                          src="/static/icon/eye1.png"
-                        />
-                        <span>View</span>
-                      </v-tooltip>
-                    </router-link>
-                  </td>
+                  <tr class="tr">
+                    <td class="td td-row text-xs-center">{{ props.item.invoiceNumber }}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.totalAmount }}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.totalDiscount }}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.totalSubTotal }}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.paymentStatus}}</td>
+                    <td class="td td-row text-xs-center">{{ dates(props.item.date) }}</td>
+                    <td class="text-xs-center td td-row">
+                      <router-link
+                        :to="{ name:'View Invoice',params: { viewInvoiceId:props.item._id } }"
+                      >
+                        <v-tooltip top>
+                          <img
+                            slot="activator"
+                            style="cursor:pointer; width:25px; height:18px; "
+                            src="/static/icon/eye1.png"
+                          />
+                          <span>View</span>
+                        </v-tooltip>
+                      </router-link>
+                    </td>
+                  </tr>
                 </template>
                 <v-alert
                   slot="no-results"
@@ -175,25 +173,36 @@
           </v-flex>
         </v-layout>
       </v-flex>
-      <!-- &nbsp -->
+      
       <v-flex xs12>
         <v-layout wrap>
-          <v-flex xs12 sm12 md8 v-show="showInvoiceTable">
-            <v-card>
+          <v-flex xs12 sm12 md12 v-show="showInvoiceTable">
+            <v-card class="transparent">
               <v-data-table
                 :headers="header"
                 :items="studentInvoiceData"
                 :search="search"
                 hide-actions
-                >
-                <template slot="items" slot-scope="props" >
-                  <!-- <span v-for="feetype in props.item.feeType"> -->
-                    <!-- <td style="width:40px">{{ index + 1 }}</td> -->
-                    <td id="td" class="text-xs-center" v-for="feetype in props.item.feeType">{{ feetype.feeTypeName}}</td>
-                    <td id="td" class="text-xs-center" v-for="feetype in props.item.feeType">{{ feetype.amount }}</td>
-                    <td id="td" class="text-xs-center" v-for="feetype in props.item.feeType">{{ props.item.totalSubTotal  - props.item.totalPaidAmount }}</td>
-                    <td id="td" class="text-xs-center" v-for="feetype in props.item.feeType">{{ feetype.paidAmount }}</td>
-                  <!-- </span> -->
+              >
+                <template slot="items" slot-scope="props">
+                  <tr class="tr" v-for="feetype in props.item.feeType">
+                    <td class="td td-row">{{ props.index + 1}}</td>
+                    <td
+                     class="td td-row text-xs-center"
+                    >{{ feetype.feeTypeName}}</td>
+                    <td
+                      class="td td-row text-xs-center"
+                    >{{ feetype.amount }}</td>
+                    <td
+                      class="td td-row text-xs-center"
+                    >{{ props.item.totalSubTotal - props.item.totalPaidAmount }}</td>
+                    <td
+                      class="td td-row text-xs-center"
+                    >{{ feetype.paidAmount }}</td>
+                    <td 
+                      class="td td-row text-xs-center" 
+                    ><input type="text" maxlength="20"></td>
+                  </tr>
                 </template>
                 <v-alert
                   slot="no-results"
@@ -282,11 +291,11 @@ export default {
     ],
 
     header: [
-      // {
-      //   text: "#",
-      //   align: "center",
-      //   sortable: false
-      // },
+      {
+        text: "#",
+        // align: "center",
+        sortable: false
+      },
       {
         text: "Fees Name",
         align: "center",
@@ -309,6 +318,12 @@ export default {
         align: "center",
         sortable: false,
         value: "paidAmount"
+      },
+      {
+        text: "Weaver",
+        align: "center",
+        sortable: false,
+        value: "paidAmount"
       }
     ],
     studentData: [],
@@ -377,7 +392,7 @@ export default {
         })
         .then(response => {
           this.studentInvoiceData = response.data.data;
-          console.log("this.studentInvoiceData", this.studentInvoiceData);
+          // console.log("this.studentInvoiceData", this.studentInvoiceData);
           this.showLoader = false;
         })
         .catch(err => {
diff --git a/src/pages/Account/invoice.vue b/src/pages/Account/invoice.vue
index 1fb0333..c305bef 100644
--- a/src/pages/Account/invoice.vue
+++ b/src/pages/Account/invoice.vue
@@ -114,7 +114,7 @@
           >{{ props.item.totalPaidAmount ? props.item.totalPaidAmount : 0}}</td>
           <td
             class="text-xs-center td td-row"
-          >{{ props.item.totalPaidAmount ? props.item.totalSubTotal - props.item.totalPaidAmount : props.item.totalSubTotal }}</td>
+          >{{ props.item.totalPaidAmount ? props.item.totalSubTotal  - props.item.totalPaidAmount  : props.item.totalSubTotal  }}</td>
           <td class="text-xs-center td td-row" v-if="props.item.paymentStatus === 'NOT_PAID'">
             <span
               class="red lighten-1 py-1 px-2 white--text paymentStatus"
@@ -590,7 +590,7 @@ export default {
           feeTypeId = this.feeTypes[i]._id;
         }
       }
-      if (this.$refs.form.validate()) {
+      // if (this.$refs.form.validate()) {
         let invoiceData = {
           classId: this.invoiceData.classNum,
           students: this.invoiceData.students,
@@ -601,11 +601,12 @@ export default {
           totalAmount: this.feeType.amount,
           totalDiscount: this.feeType.discount,
           totalSubTotal: this.feeType.subTotal,
-          // totalPaidAmount: this.feeType.paidAmount
+          totalPaidAmount: this.feeType.paidAmount
         };
-        if (invoiceData.paymentStatus == "NOT_PAID") {
-          delete invoiceData.totalPaidAmount;
-        }
+        console.log("invoiceData",invoiceData)
+        // if (invoiceData.paymentStatus == "NOT_PAID") {
+        //   delete invoiceData.totalPaidAmount;
+        // }
         http()
           .post("/createInvoice", invoiceData)
           .then(response => {
@@ -633,7 +634,7 @@ export default {
             this.color = "error";
             this.loading = false;
           });
-      }
+      // }
     },
     clear() {
       this.$refs.form.reset();
diff --git a/src/pages/Account/viewInvoice.vue b/src/pages/Account/viewInvoice.vue
index c1d5247..06c55bc 100644
--- a/src/pages/Account/viewInvoice.vue
+++ b/src/pages/Account/viewInvoice.vue
@@ -2,124 +2,139 @@
   <v-app id="pages-dasboard">
     <!-- ****** Edit INVOICE ****** -->
     <v-container fluid grid-list-md>
-      <v-card>
+      <v-layout>
+        <v-flex xs12 sm8 md10>
+          <v-btn class="open-dialog-button mt-3" round dark @click="printInvoice()">
+            Print
+            <v-icon size="18" right dark>print</v-icon>
+          </v-btn>
+        </v-flex>
+      </v-layout>
+      <v-flex xs12 sm12 id="printMe">
         <v-layout wrap>
-          <v-flex 12>
-            <br />
-            <v-layout wrap>
-              <v-flex xs12 sm6>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>invoice:</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm11 xs8>
-                    <h5 class="my-1">#{{ invoiceParticularData.invoiceNumber }}</h5>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>Name:</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm11 xs8>
-                    <h5 class="my-1">{{ invoiceParticularData.studentId.name }}</h5>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>Class:</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm11 xs8>
-                    <h5 class="my-1">{{ invoiceParticularData.classId.classNum }}</h5>
-                  </v-flex>
-                </v-layout>
-              </v-flex>
-              <v-flex xs12 sm6>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>Roll No:</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm6 xs8>
-                    <h5 class="my-1">{{ invoiceParticularData.studentId.rollNo }}</h5>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>email:</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm6 xs8>
-                    <h5 class="my-1 linkCover">{{ invoiceParticularData.studentId.email }}</h5>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 sm2>
-                    <h5 class="right my-1">
-                      <b>Status :</b>
-                    </h5>
-                  </v-flex>
-                  <v-flex sm6 xs8>
-                    <h5 class="my-1">{{ invoiceParticularData.paymentStatus }}</h5>
+          <!-- ****** TABLE DATA MARK  ****** -->
+          <v-flex xs12 sm12 md12>
+            <v-card>
+                <v-layout wrap>
+                  <v-flex 12>
+                    <br />
+                    <v-layout>
+                      <v-flex xs12 sm12 md12 class="text-xs-center">
+                        <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
+                        <p class="title">{{ userData.name }}</p>
+                        <p>{{ userData.address }}</p>
+                      </v-flex>
+
+                      <v-flex xs12 sm12 md12 class="text-xs-center">
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>invoice:</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm11 xs8>
+                            <h5 class="my-1">#{{ invoiceParticularData.invoiceNumber }}</h5>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>Name:</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm11 xs8>
+                            <h5 class="my-1">{{ invoiceParticularData.studentId.name }}</h5>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>Class:</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm11 xs8>
+                            <h5 class="my-1">{{ invoiceParticularData.classId.classNum }}</h5>
+                          </v-flex>
+                        </v-layout>
+                        <!-- <v-flex xs12 sm6> -->
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>Roll No:</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm6 xs8>
+                            <h5 class="my-1">{{ invoiceParticularData.studentId.rollNo }}</h5>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>email:</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm6 xs8>
+                            <h5 class="my-1 linkCover">{{ invoiceParticularData.studentId.email }}</h5>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout>
+                          <v-flex xs4 sm2>
+                            <h5 class="right my-1">
+                              <b>Status :</b>
+                            </h5>
+                          </v-flex>
+                          <v-flex sm6 xs8>
+                            <h5 class="my-1">{{ invoiceParticularData.paymentStatus }}</h5>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                    </v-layout>
                   </v-flex>
                 </v-layout>
-              </v-flex>
-            </v-layout>
+              <table class="feeTypeTable tableRsponsive">
+                <tr class="info white--text">
+                  <th>#</th>
+                  <th>Fee Type</th>
+                  <th>Amount</th>
+                  <th>Discount</th>
+                  <th>Subtotal</th>
+                </tr>
+                <tr
+                  v-for="(feeType, index) in feeTypeData"
+                  :key="index"
+                  v-on:keyup="getAmmountDetails(feeType)"
+                >
+                  <td style="width:40px">{{ index + 1 }}</td>
+                  <td style="width:120px">{{ feeType.feeTypeName }}</td>
+                  <td style="width:120px">{{ feeType.amount }}</td>
+                  <td style="width:120px">{{ feeType.amount-feeType.subTotal }}</td>
+                  <td style="width:120px">{{ feeType.subTotal }}</td>
+                </tr>
+                <!-- <tfoot>
+                  <tr>
+                    <td colspan="4">
+                      <span class="right subheding">Total Amount (RS) :</span>
+                    </td>
+                    <td>{{ feeType.subTotal }}</td>
+                  </tr>
+                  <tr>
+                    <td colspan="4">
+                      <span class="right subheding">Paid (RS) :</span>
+                    </td>
+                    <td>{{ feeType.totalPaidAmount ? feeType.totalPaidAmount : 0 }}</td>
+                  </tr>
+                  <tr>
+                    <td colspan="4">
+                      <span class="right subheding">Balance (RS) :</span>
+                    </td>
+                    <td>{{ feeType.totalPaidAmount ? feeType.subTotal - feeType.totalPaidAmount : feeType.subTotal }}</td>
+                  </tr>
+                </tfoot>-->
+              </table>
+            </v-card>
           </v-flex>
         </v-layout>
-      </v-card>
-      <table class="feeTypeTable tableRsponsive">
-        <tr class="info white--text">
-          <th>#</th>
-          <th>Fee Type</th>
-          <th>Amount</th>
-          <th>Discount</th>
-          <th>Subtotal</th>
-        </tr>
-        <tr
-          v-for="(feeType, index) in feeTypeData"
-          :key="index"
-          v-on:keyup="getAmmountDetails(feeType)"
-        >
-          <td style="width:40px">{{ index + 1 }}</td>
-          <td style="width:120px">{{ feeType.feeTypeName }}</td>
-          <td style="width:120px">{{ feeType.amount }}</td>
-          <td style="width:120px">{{ feeType.amount-feeType.subTotal }}</td>
-          <td style="width:120px">{{ feeType.subTotal }}</td>
-        </tr>
-        <tfoot>
-          <tr>
-            <td colspan="4">
-              <span class="right subheding">Total Amount (RS) :</span>
-            </td>
-            <td>{{ feeType.subTotal }}</td>
-          </tr>
-          <tr>
-            <td colspan="4">
-              <span class="right subheding">Paid (RS) :</span>
-            </td>
-            <td>{{ feeType.totalPaidAmount ? feeType.totalPaidAmount : 0 }}</td>
-          </tr>
-          <tr>
-            <td colspan="4">
-              <span class="right subheding">Balance (RS) :</span>
-            </td>
-            <td>{{ feeType.totalPaidAmount ? feeType.subTotal - feeType.totalPaidAmount : feeType.subTotal }}</td>
-          </tr>
-        </tfoot>
-      </table>
-      <!-- </v-card> -->
-      <!-- </v-flex> -->
-      <!-- </v-layout> -->
-      <!-- </v-container> -->
-      <!-- </v-flex> -->
+      </v-flex>
     </v-container>
     <div class="loader" v-if="showLoader">
       <v-progress-circular indeterminate color="white"></v-progress-circular>
@@ -135,6 +150,7 @@ export default {
   data: () => ({
     showLoader: false,
     feeTypes: [],
+    filterData: [],
     invoiceData: {},
     feeType: {
       amount: "",
@@ -145,7 +161,8 @@ export default {
     },
     feeTypeData: [],
     token: "",
-    invoiceParticularData: {}
+    invoiceParticularData: {},
+    userData: {}
   }),
 
   methods: {
@@ -206,12 +223,32 @@ export default {
       feeType.paidAmount =
         Number(feeType.paidAmount) + Number(this.feeTypeData[i].paidAmount);
       this.feeType.paidAmount = feeType.paidAmount.toFixed(2);
+    },
+    printInvoice() {
+      // Pass the element id here
+      this.$htmlToPaper("printMe");
+    },
+    getUserData() {
+      http()
+        .get("/getParticularUserDetail")
+        .then(response => {
+          this.userData = response.data.data;
+        })
+        .catch(error => {
+          // if (error.response.status === 401) {
+          //   this.$router.replace({ path: "/" });
+          //   this.$store.dispatch("setToken", null);
+          //   this.$store.dispatch("Id", null);
+          // }
+        });
     }
   },
   mounted() {
     this.token = this.$store.state.token;
     this.getInvoiceList();
     this.getfeeType();
+    this.getUserData();
+
   },
   created() {
     this.$root.$on("app:search", search => {
@@ -238,6 +275,11 @@ table {
   border-collapse: collapse;
   border: 1px solid #e2e7eb;
 }
+.open-dialog-button {
+  background: #827bfa !important;
+  border-color: #827bfa !important;
+  text-transform: none !important;
+}
 
 th,
 td {
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 9ce7d8a..f066625 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -462,8 +462,9 @@ export default {
     getStudents() {
       http()
         .get("/getStudentsList", {
-            headers: { Authorization: "Bearer " + token }
-
+           headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
         })
         .then(response => {
           this.students = response.data.data;
@@ -481,7 +482,11 @@ export default {
     },
     getParents() {
       http()
-        .get("/getParentsList")
+        .get("/getParentsList", {
+          headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
+        })
         .then(response => {
           this.parents = response.data.data;
           this.showLoader = false;
@@ -499,8 +504,9 @@ export default {
     getTeachers() {
       http()
         .get("/getTeachersList", {
-          headers: { Authorization: "Bearer " + token }
-
+          headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
         })
         .then(response => {
           this.teachers = response.data.data;
@@ -518,7 +524,11 @@ export default {
     },
     getClasses() {
       http()
-        .get("/getClassesList")
+        .get("/getClassesList", {
+          headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
+        })
         .then(response => {
           this.classes = response.data.data;
           this.showLoader = false;
@@ -536,7 +546,11 @@ export default {
     getNoticeData() {
       this.showLoader = true;
       http()
-        .get("/getEventsList")
+        .get("/getEventsList", {
+          headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
+        })
         .then(response => {
           this.noticeData = response.data.data;
           this.showLoader = false;
@@ -553,7 +567,11 @@ export default {
     getUserData() {
       // this.showLoader = true;
       http()
-        .get("/getParticularUserDetail")
+        .get("/getParticularUserDetail", {
+          headers: {
+            Authorization: "Bearer " + this.$store.state.token
+          }
+        })
         .then(response => {
           this.userData = response.data.data;
           this.showLoader = false;
diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue
index 564da5a..7e5a994 100644
--- a/src/pages/Mark/viewMark.vue
+++ b/src/pages/Mark/viewMark.vue
@@ -29,37 +29,13 @@
               flat
               style="border: 1px solid lightgrey;margin-bottom:14px;padding:20px"
             >
-              <!-- <v-layout>
-                <v-flex xs12>
-                  <v-btn class="add-button right" round dark @click="printStudentReport()">
-                    Print
-                    <v-icon right dark>print</v-icon>
-                  </v-btn>
-                </v-flex>
-              </v-layout> -->
               <v-layout>
-                <v-flex xs12 class="text-xs-center">
+                <v-flex xs12 sm12 md12 class="text-xs-center">
                   <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
                   <p class="title">{{ userData.name }}</p>
                   <p>{{ userData.address }}</p>
                 </v-flex>
-              </v-layout>
-              <v-layout style="padding-top:10px" v-if="index === 0">
-                <v-flex xs5>
-                  <p
-                    style="font-size:20px;margin:0px;margin-bottom:4px;"
-                  >{{ value[0].studentId.name }}</p>
-                  <p
-                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                  >Class : {{ value[0].classId.classNum }}</p>
-                  <p
-                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                  >Roll NO : {{ value[0].studentId.rollNo }}</p>
-                  <p
-                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                  >Section : {{ value[0].sectionId.name }}</p>
-                </v-flex>
-                <v-flex xs2>
+                <v-flex xs12 sm12 md12 class="text-xs-center">
                   <v-avatar size="100">
                     <img
                       :src="value[0].studentId.profilePicUrl"
@@ -72,6 +48,18 @@
                       width="100px"
                     />
                   </v-avatar>
+                  <p
+                    style="font-size:20px;margin:0px;margin-bottom:4px;"
+                  >{{ value[0].studentId.name }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Class : {{ value[0].classId.classNum }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Roll NO : {{ value[0].studentId.rollNo }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Section : {{ value[0].sectionId.name }}</p>
                 </v-flex>
               </v-layout>
               <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
@@ -244,11 +232,11 @@ export default {
           this.userData = response.data.data;
         })
         .catch(error => {
-          if (error.response.status === 401) {
-            this.$router.replace({ path: "/" });
-            this.$store.dispatch("setToken", null);
-            this.$store.dispatch("Id", null);
-          }
+          // if (error.response.status === 401) {
+          //   this.$router.replace({ path: "/" });
+          //   this.$store.dispatch("setToken", null);
+          //   this.$store.dispatch("Id", null);
+          // }
         });
     },
     selectMarkData(select) {
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index 6841574..cc689e9 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -87,26 +87,7 @@
               </v-btn>
             </v-flex>
           </v-layout>
-          <v-layout>
-            <v-flex xs12 class="text-xs-center">
-              <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
-              <p class="title">{{ userData.name }}</p>
-              <p>{{ userData.address }}</p>
-            </v-flex>
-          </v-layout>
-          <!-- </v-card>
-      </v-flex>
-          </v-layout>-->
           <v-container grid-list-md v-show="showReport">
-            <!-- {{ filterData }} -->
-            <!-- <v-layout>
-        <v-flex xs12 sm12 v-if="filterData != {}">
-          <v-btn class="add-button right" round dark @click="printProgressReport()">
-            Print
-            <v-icon right dark>print</v-icon>
-          </v-btn>
-        </v-flex>
-            </v-layout>-->
             <v-flex xs12 sm12 id="printMe">
               <v-layout wrap>
                 <!-- ****** TABLE DATA MARK  ****** -->
@@ -117,34 +98,29 @@
                     flat
                     style="border: 1px solid lightgrey;margin-bottom:14px;padding:20px"
                   >
-                    <v-layout style="padding-top:10px" v-if="index === 0">
-                      <v-flex xs5>
-                        <p
-                          style="font-size:20px;margin:0px;margin-bottom:4px;"
-                        >{{ value[0].studentId.name }}</p>
-                        <p
-                          style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                        >Class : {{ value[0].classId.classNum }}</p>
-                        <p
-                          style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                        >Roll NO : {{ value[0].studentId.rollNo }}</p>
-                        <p
-                          style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                        >Section : {{ value[0].sectionId.name }}</p>
+                    <v-layout>
+                      <v-flex xs12 sm12 md12 class="text-xs-center">
+                          <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
+                          <p class="title">{{ userData.name }}</p>
+                          <p>{{ userData.address }}</p>
                       </v-flex>
-                      <v-flex xs2>
-                        <v-avatar size="100">
-                          <img
-                            :src="value[0].studentId.profilePicUrl"
-                            v-if="value[0].studentId.profilePicUrl"
-                            width="100px"
-                          />
-                          <img
-                            src="/static/icon/user.png"
-                            v-else-if="!value[0].studentId.profilePicUrl"
-                            width="100px"
-                          />
-                        </v-avatar>
+                      <v-flex xs12 sm12 md12 class="text-xs-center">
+                          <v-avatar size="100">
+                            <img :src="value[0].studentId.profilePicUrl" v-if="value[0].studentId.profilePicUrl" width="100px" />
+                            <img src="/static/icon/user.png" v-else-if="!value[0].studentId.profilePicUrl" width="100px" />
+                          </v-avatar>
+                          <p
+                            style="font-size:20px;margin:0px;margin-bottom:4px;"
+                          >{{ value[0].studentId.name }}</p>
+                          <p
+                            style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                          >Class : {{ value[0].classId.classNum }}</p>
+                          <p
+                            style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                          >Roll NO : {{ value[0].studentId.rollNo }}</p>
+                          <p
+                            style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                          >Section : {{ value[0].sectionId.name }}</p>
                       </v-flex>
                     </v-layout>
                     <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
@@ -156,7 +132,7 @@
                         width: 100% !important;
                         overflow: hidden; 
                         display: block;"
-                          >
+                    >
                       <thead style="border: 1px solid lightgrey !important;">
                         <tr style="border: 1px solid lightgrey !important;padding:4px;">
                           <td
@@ -402,11 +378,11 @@ export default {
           this.userData = response.data.data;
         })
         .catch(error => {
-          if (error.response.status === 401) {
-            this.$router.replace({ path: "/" });
-            this.$store.dispatch("setToken", null);
-            this.$store.dispatch("Id", null);
-          }
+          // if (error.response.status === 401) {
+          //   this.$router.replace({ path: "/" });
+          //   this.$store.dispatch("setToken", null);
+          //   this.$store.dispatch("Id", null);
+          // }
         });
     }
   }
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index f1a7d83..c8cd8f4 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -185,18 +185,20 @@
         <v-card class="transparent elevation-0">
           <v-layout>
             <v-flex xs12>
-              <v-btn class="add-button right" round  dark @click="printStudentReport()">
+              <v-btn class="open-dialog-button right" round dark @click="printStudentReport()">
                 Print
                 <v-icon right dark>print</v-icon>
               </v-btn>
             </v-flex>
           </v-layout>
           <v-layout>
-            <v-flex xs12 class="text-xs-center">
+            <v-flex xs12 sm12 md12 class="text-xs-center">
               <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
               <p class="title">{{ userData.name }}</p>
               <p>{{ userData.address }}</p>
             </v-flex>
+            <v-flex xs12 sm12 md12 class="text-xs-center">
+            </v-flex>
           </v-layout>
           <v-data-table
             :headers="headers"
@@ -266,7 +268,7 @@
                 >{{ studentReport.name }}</td>
                 <!-- <td
                   style="border: 1px solid lightgrey !important;padding: 6px;"
-                >{{ studentReport.rollNo }}</td> -->
+                >{{ studentReport.rollNo }}</td>-->
                 <td
                   style="border: 1px solid lightgrey !important;padding: 6px;"
                 >{{ studentReport.email }}</td>
@@ -558,11 +560,11 @@ export default {
           this.userData = response.data.data;
         })
         .catch(error => {
-          if (error.response.status === 401) {
-            this.$router.replace({ path: "/" });
-            this.$store.dispatch("setToken", null);
-            this.$store.dispatch("Id", null);
-          }
+          // if (error.response.status === 401) {
+          //   this.$router.replace({ path: "/" });
+          //   this.$store.dispatch("setToken", null);
+          //   this.$store.dispatch("Id", null);
+          // }
         });
     }
   },
diff --git a/src/pages/School/school.vue b/src/pages/School/school.vue
index e5f3ba4..4f394f5 100644
--- a/src/pages/School/school.vue
+++ b/src/pages/School/school.vue
@@ -834,7 +834,7 @@ export default {
       this.showLoader = true;
       http()
         .get("/getSchoolList", {
-          headers: { Authorization: "Bearer " + this.schoolToken }
+          headers: { Authorization: "Bearer " + this.$store.state.token }
         })
         .then(response => {
           this.schoolList = response.data.data;
-- 
2.0.0