From 495e4037c6307dfe060ab9b653dfe72357d999ee Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Thu, 21 Nov 2019 17:02:14 +0530
Subject: [PATCH] update

---
 src/api/menu.js                            |   2 +-
 src/pages/Account/expense.vue              | 282 ++++++++++++++-------------
 src/pages/Account/income.vue               |  48 +++--
 src/pages/Administrator/academicYear.vue   |  48 +++--
 src/pages/Administrator/role.vue           |  32 +--
 src/pages/Administrator/systemAdmin.vue    |  50 +++--
 src/pages/Attendence/studentAttendence.vue |  28 ++-
 src/pages/Class/addclass.vue               |  96 +++++----
 src/pages/Event/event.vue                  | 184 +++++++++---------
 src/pages/Exam/exam.vue                    |  50 +++--
 src/pages/Exam/examSchedule.vue            |  50 +++--
 src/pages/Exam/grade.vue                   |  64 +++---
 src/pages/Gallery/gallery.vue              |  50 +++--
 src/pages/Holiday/holiday.vue              |  73 ++++---
 src/pages/Library/books.vue                |  50 +++--
 src/pages/Library/eBook.vue                |  52 +++--
 src/pages/Library/issue.vue                |  51 +++--
 src/pages/Library/member.vue               | 142 ++++++++------
 src/pages/Mark/mark.vue                    |  18 +-
 src/pages/Mark/promotion.vue               |  60 ++++--
 src/pages/Mark/viewMark.vue                |  19 +-
 src/pages/News/news.vue                    |  50 +++--
 src/pages/NoticeBoard/noticeBoard.vue      |  48 +++--
 src/pages/Notification/notification.vue    |  52 +++--
 src/pages/Parent/parents.vue               |  58 +++---
 src/pages/Report/markSheetReport.vue       | 301 -----------------------------
 src/pages/Report/progressCardReport.vue    | 299 ++++++++++++++++++++++++++++
 src/pages/Report/studentReport.vue         |  76 ++++----
 src/pages/Section/section.vue              |  52 +++--
 src/pages/Students/students.vue            | 270 ++++----------------------
 src/pages/Subjects/subjects.vue            | 130 +++++++------
 src/pages/Teachers/teachers.vue            | 263 ++++---------------------
 src/pages/TimeTable/timeTable.vue          |  60 +++---
 src/pages/User/user.vue                    |  48 +++--
 src/pages/socialMedia/socialMedia.vue      |  48 +++--
 src/router/paths.js                        |   6 +-
 36 files changed, 1579 insertions(+), 1631 deletions(-)
 delete mode 100644 src/pages/Report/markSheetReport.vue
 create mode 100644 src/pages/Report/progressCardReport.vue

diff --git a/src/api/menu.js b/src/api/menu.js
index 7662fe6..0b6daf4 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -133,7 +133,7 @@ const Menu = [
         icon: '/static/schoolIcons/reports.png',
         items: [
             { name: 'studentReport', title: 'Student Report', component: 'studentReport', action: '', },
-            { name: 'markSheetReport', title: 'Mark Sheet Report', component: 'markSheetReport', action: '', }
+            { name: 'progressCardReport', title: 'Progress Card Report', component: 'progressCardReport', action: '', }
         ]
     },
     {
diff --git a/src/pages/Account/expense.vue b/src/pages/Account/expense.vue
index 1193dba..e1b81d0 100644
--- a/src/pages/Account/expense.vue
+++ b/src/pages/Account/expense.vue
@@ -34,136 +34,136 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card-text style="height: 600px;">
-                <v-layout>
-                  <v-flex
-                    xs12
-                    class="text-xs-center text-sm-center text-md-center text-lg-center my-4 mr-4"
-                  >
-                    <v-avatar size="160px">
-                      <img src="/static/icon/user.png" v-if="!editedItem.fileUrl && !imageUrl" />
-                      <img :src="editedItem.fileUrl" v-else-if="editedItem.fileUrl && !imageUrl" />
-                      <img
-                        v-if="imageUrl"
-                        :src="imageUrl"
-                        height="150"
-                        style="border-radius:50%; width:200px"
-                      />
-                    </v-avatar>
-                    <input
-                      type="file"
-                      style="display:none"
-                      ref="image"
-                      accept="image/*"
-                      @change="onFilePicked"
+              <v-layout>
+                <v-flex
+                  xs12
+                  class="text-xs-center text-sm-center text-md-center text-lg-center my-4 mr-4"
+                >
+                  <v-avatar size="160px">
+                    <img src="/static/icon/user.png" v-if="!editedItem.fileUrl && !imageUrl" />
+                    <img :src="editedItem.fileUrl" v-else-if="editedItem.fileUrl && !imageUrl" />
+                    <img
+                      v-if="imageUrl"
+                      :src="imageUrl"
+                      height="150"
+                      style="border-radius:50%; width:200px"
                     />
-                  </v-flex>
-                </v-layout>
-                <v-layout wrap>
-                  <v-flex xs12 sm12>
-                    <v-layout>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Name:</label>
-                      </v-flex>
-                      <v-flex xs6 class="ml-3">
+                  </v-avatar>
+                  <input
+                    type="file"
+                    style="display:none"
+                    ref="image"
+                    accept="image/*"
+                    @change="onFilePicked"
+                  />
+                </v-flex>
+              </v-layout>
+              <v-layout wrap>
+                <v-flex xs12 sm12>
+                  <v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Name:</label>
+                    </v-flex>
+                    <v-flex xs6 class="ml-3">
+                      <v-text-field
+                        v-model="editedItem.name"
+                        placeholder="fill your full Name"
+                        name="name"
+                        type="text"
+                        required
+                      ></v-text-field>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
+              </v-layout>
+              <v-layout wrap>
+                <v-flex xs12>
+                  <v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Date:</label>
+                    </v-flex>
+                    <v-flex xs6 class="ml-3">
+                      <v-menu
+                        ref="menu"
+                        :close-on-content-click="false"
+                        v-model="menu3"
+                        :nudge-right="40"
+                        lazy
+                        transition="scale-transition"
+                        offset-y
+                        full-width
+                        min-width="290px"
+                      >
                         <v-text-field
-                          v-model="editedItem.name"
-                          placeholder="fill your full Name"
-                          name="name"
-                          type="text"
-                          required
+                          slot="activator"
+                          v-model="editedItem.date"
+                          placeholder="Select date"
                         ></v-text-field>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                </v-layout>
+                        <v-date-picker
+                          ref="picker"
+                          v-model="editedItem.date"
+                          @input="$refs.menu.save(editedItem.date)"
+                        ></v-date-picker>
+                      </v-menu>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
                 <v-layout wrap>
-                  <v-flex xs12>
+                  <v-flex xs12 sm12>
                     <v-layout>
                       <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Date:</label>
+                        <label class="right">Amount:</label>
                       </v-flex>
                       <v-flex xs6 class="ml-3">
-                        <v-menu
-                          ref="menu"
-                          :close-on-content-click="false"
-                          v-model="menu3"
-                          :nudge-right="40"
-                          lazy
-                          transition="scale-transition"
-                          offset-y
-                          full-width
-                          min-width="290px"
-                        >
-                          <v-text-field
-                            slot="activator"
-                            v-model="editedItem.date"
-                            placeholder="Select date"
-                          ></v-text-field>
-                          <v-date-picker
-                            ref="picker"
-                            v-model="editedItem.date"
-                            @input="$refs.menu.save(editedItem.date)"
-                          ></v-date-picker>
-                        </v-menu>
+                        <v-text-field v-model="editedItem.amount" required></v-text-field>
                       </v-flex>
                     </v-layout>
                   </v-flex>
+                </v-layout>
+                <v-flex xs12>
                   <v-layout wrap>
-                    <v-flex xs12 sm12>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Amount:</label>
-                        </v-flex>
-                        <v-flex xs6 class="ml-3">
-                          <v-text-field v-model="editedItem.amount" required></v-text-field>
-                        </v-flex>
-                      </v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right hidden-xs-only hidden-sm-only">Uplaod Image:</label>
+                      <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod:</label>
+                    </v-flex>
+                    <v-flex xs6 class="ml-3">
+                      <v-text-field
+                        label="Select Image"
+                        @click="pickFile"
+                        v-model="imageName"
+                        append-icon="attach_file"
+                      ></v-text-field>
                     </v-flex>
                   </v-layout>
-                  <v-flex xs12>
-                    <v-layout wrap>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right hidden-xs-only hidden-sm-only">Uplaod Image:</label>
-                        <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod:</label>
-                      </v-flex>
-                      <v-flex xs6 class="ml-3">
-                        <v-text-field
-                          label="Select Image"
-                          @click="pickFile"
-                          v-model="imageName"
-                          append-icon="attach_file"
-                        ></v-text-field>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                  <v-flex xs12>
-                    <v-layout>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Note:</label>
-                      </v-flex>
-                      <v-flex xs6 class="ml-3">
-                        <v-textarea
-                          name="input-7-1"
-                          v-model="editedItem.note"
-                          placeholder="fill your Note"
-                          type="text"
-                          :rules="noteRules"
-                          multi-line
-                          required
-                        ></v-textarea>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs12 sm12>
-                    <v-card-actions>
-                      <v-btn round dark @click.native="close">Cancel</v-btn>
-                      <v-spacer></v-spacer>
-                      <v-btn round dark :loading="loading" @click="save">Save</v-btn>
-                    </v-card-actions>
-                  </v-flex>
-                </v-layout>
+                </v-flex>
+                <v-flex xs12>
+                  <v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Note:</label>
+                    </v-flex>
+                    <v-flex xs6 class="ml-3">
+                      <v-textarea
+                        name="input-7-1"
+                        v-model="editedItem.note"
+                        placeholder="fill your Note"
+                        type="text"
+                        :rules="noteRules"
+                        multi-line
+                        required
+                      ></v-textarea>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
+              </v-layout>
+              <v-layout>
+                <v-flex xs12 sm12>
+                  <v-card-actions>
+                    <v-btn round dark @click.native="close">Cancel</v-btn>
+                    <v-spacer></v-spacer>
+                    <v-btn round dark :loading="loading" @click="save">Save</v-btn>
+                  </v-card-actions>
+                </v-flex>
+              </v-layout>
             </v-card-text>
           </v-card>
         </v-dialog>
@@ -268,24 +268,36 @@
             <td id="td" class="text-xs-center">{{ props.item.note }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -443,7 +455,7 @@
                       </v-flex>
                     </v-layout>
                   </v-layout>
-                   <v-layout>
+                  <v-layout>
                     <v-flex xs12 sm6 offset-sm3>
                       <v-layout>
                         <v-flex xs6>
diff --git a/src/pages/Account/income.vue b/src/pages/Account/income.vue
index eada6d3..f676d8a 100644
--- a/src/pages/Account/income.vue
+++ b/src/pages/Account/income.vue
@@ -268,24 +268,36 @@
             <td id="td" class="text-xs-center">{{ props.item.note }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Administrator/academicYear.vue b/src/pages/Administrator/academicYear.vue
index 4d189c2..862f4d6 100644
--- a/src/pages/Administrator/academicYear.vue
+++ b/src/pages/Administrator/academicYear.vue
@@ -224,24 +224,36 @@
             <td id="td" class="text-xs-center">{{ dates(props.item.endingDate)}}</td>
             <td id="td" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Administrator/role.vue b/src/pages/Administrator/role.vue
index c1546dd..70985df 100644
--- a/src/pages/Administrator/role.vue
+++ b/src/pages/Administrator/role.vue
@@ -78,18 +78,26 @@
             <td id="tabeleData" class="text-xs-center">{{ props.item.name}}</td>
             <td id="tabeleData" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Administrator/systemAdmin.vue b/src/pages/Administrator/systemAdmin.vue
index c7962d4..ea3104a 100644
--- a/src/pages/Administrator/systemAdmin.vue
+++ b/src/pages/Administrator/systemAdmin.vue
@@ -516,24 +516,36 @@
             <!-- <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td> -->
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -854,7 +866,7 @@
                     </v-flex> -->
                   </v-layout>
                   <v-layout class="mx-2">
-                    <v-flex xs12 sm12>
+                    <v-flex xs12 sm12 offset-sm1>
                       <v-layout>
                         <v-flex xs6>
                           <v-btn @click="clear" round dark>clear</v-btn>
diff --git a/src/pages/Attendence/studentAttendence.vue b/src/pages/Attendence/studentAttendence.vue
index 3e5f43c..c4eb4ac 100644
--- a/src/pages/Attendence/studentAttendence.vue
+++ b/src/pages/Attendence/studentAttendence.vue
@@ -59,18 +59,26 @@
         <td id="td" class="text-xs-center">{{ props.item.email }}</td>
         <td class="text-xs-center">
           <router-link :to="{ name:'ViewStudentsAttendence',params: { id:props.item._id } }">
+            <v-tooltip top>
+              <img
+                slot="activator"
+                style="cursor:pointer; width:20px; height:18px; "
+                class="mr-5"
+                src="/static/icon/edit1.png"
+              />
+              <span>Edit</span>
+            </v-tooltip>
+          </router-link>
+          <v-tooltip top>
             <img
-              style="cursor:pointer; width:20px; height:18px; "
-              class="mr-5"
-              src="/static/icon/edit1.png"
+              slot="activator"
+              style="cursor:pointer; width:20px; height:20px; "
+              class="mr5"
+              @click="deleteItem(props.item)"
+              src="/static/icon/delete1.png"
             />
-          </router-link>
-          <img
-            style="cursor:pointer;width:20px; height:20px; "
-            class="mr-5"
-            @click="deleteItem(props.item)"
-            src="/static/icon/delete1.png"
-          />
+            <span>Delete</span>
+          </v-tooltip>
           <!-- </span> -->
         </td>
       </template>
diff --git a/src/pages/Class/addclass.vue b/src/pages/Class/addclass.vue
index af3c22c..054ecc7 100644
--- a/src/pages/Class/addclass.vue
+++ b/src/pages/Class/addclass.vue
@@ -37,30 +37,30 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card>
-                <v-container fluid>
-                  <v-layout justify-center>
-                    <v-flex xs12 sm9>
-                        <v-layout style="position:relative;">
-                          <v-flex xs3 lg2 class="pt-4 subheading">
-                            <label class="right">Class:</label>
-                          </v-flex>
-                          <v-flex xs9 class="ml-2">
-                            <v-autocomplete
-                              v-model="editedItem.classNum"
-                              :label="editedItem.classNum"
-                              :items="classList"
-                              :rules="nameRules"
-                            ></v-autocomplete>
-                          </v-flex>
-                        </v-layout>
-                        <v-card-actions>
-                          <v-btn round dark @click.native="close">Cancel</v-btn>
-                          <v-spacer></v-spacer>
-                          <v-btn round dark @click="save">Save</v-btn>
-                        </v-card-actions>
-                    </v-flex>
-                  </v-layout>
-                </v-container>
+              <v-container fluid>
+                <v-layout justify-center>
+                  <v-flex xs12 sm9>
+                    <v-layout style="position:relative;">
+                      <v-flex xs3 lg2 class="pt-4 subheading">
+                        <label class="right">Class:</label>
+                      </v-flex>
+                      <v-flex xs9 class="ml-2">
+                        <v-autocomplete
+                          v-model="editedItem.classNum"
+                          :label="editedItem.classNum"
+                          :items="classList"
+                          :rules="nameRules"
+                        ></v-autocomplete>
+                      </v-flex>
+                    </v-layout>
+                    <v-card-actions>
+                      <v-btn round dark @click.native="close">Cancel</v-btn>
+                      <v-spacer></v-spacer>
+                      <v-btn round dark @click="save">Save</v-btn>
+                    </v-card-actions>
+                  </v-flex>
+                </v-layout>
+              </v-container>
             </v-card>
           </v-flex>
         </v-dialog>
@@ -118,24 +118,36 @@
             <td class="text-xs-center">{{ props.item.classNum}}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:20px; "
-                  class="mr5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Event/event.vue b/src/pages/Event/event.vue
index 8914e68..020c5d3 100644
--- a/src/pages/Event/event.vue
+++ b/src/pages/Event/event.vue
@@ -38,79 +38,79 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card flat>
-                <v-container fluid>
-                  <v-flex xs12 sm12>
-                    <v-layout>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Title:</label>
-                      </v-flex>
-                      <v-flex xs8 sm5 class="ml-3">
-                        <v-text-field
-                          v-model="editedItem.title"
-                          placeholder="fill your Title"
-                          name="name"
-                          type="text"
-                        ></v-text-field>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                  <v-flex xs12 sm12>
-                    <v-layout>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Date:</label>
-                      </v-flex>
-                      <v-flex xs8 sm5 class="ml-3">
-                        <v-menu
-                          ref="menu"
-                          :close-on-content-click="false"
-                          v-model="menu"
-                          :nudge-right="40"
-                          lazy
-                          transition="scale-transition"
-                          offset-y
-                          full-width
-                          min-width="290px"
-                        >
-                          <v-text-field
-                            slot="activator"
-                            :rules="dateRules"
-                            v-model="editedItem.dateOfEvent"
-                            placeholder="Select date"
-                          ></v-text-field>
-                          <v-date-picker
-                            color="info"
-                            ref="picker"
-                            v-model="editedItem.dateOfEvent"
-                            @input="$refs.menu.save(editedItem.dateOfEvent)"
-                          ></v-date-picker>
-                        </v-menu>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                  <v-flex xs12 sm12>
-                    <v-layout>
-                      <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">Description:</label>
-                      </v-flex>
-                      <v-flex xs8 sm5 class="ml-3">
+              <v-container fluid>
+                <v-flex xs12 sm12>
+                  <v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Title:</label>
+                    </v-flex>
+                    <v-flex xs8 sm5 class="ml-3">
+                      <v-text-field
+                        v-model="editedItem.title"
+                        placeholder="fill your Title"
+                        name="name"
+                        type="text"
+                      ></v-text-field>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
+                <v-flex xs12 sm12>
+                  <v-layout>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Date:</label>
+                    </v-flex>
+                    <v-flex xs8 sm5 class="ml-3">
+                      <v-menu
+                        ref="menu"
+                        :close-on-content-click="false"
+                        v-model="menu"
+                        :nudge-right="40"
+                        lazy
+                        transition="scale-transition"
+                        offset-y
+                        full-width
+                        min-width="290px"
+                      >
                         <v-text-field
-                          placeholder="fill your Description"
-                          v-model="editedItem.description"
-                          type="text"
+                          slot="activator"
+                          :rules="dateRules"
+                          v-model="editedItem.dateOfEvent"
+                          placeholder="Select date"
                         ></v-text-field>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
+                        <v-date-picker
+                          color="info"
+                          ref="picker"
+                          v-model="editedItem.dateOfEvent"
+                          @input="$refs.menu.save(editedItem.dateOfEvent)"
+                        ></v-date-picker>
+                      </v-menu>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
+                <v-flex xs12 sm12>
                   <v-layout>
-                    <v-flex xs12 sm10 offset-sm1>
-                      <v-card-actions>
-                        <v-btn round dark @click.native="close">Cancel</v-btn>
-                        <v-spacer></v-spacer>
-                        <v-btn round dark @click="save">Save</v-btn>
-                      </v-card-actions>
+                    <v-flex xs4 class="pt-4 subheading">
+                      <label class="right">Description:</label>
+                    </v-flex>
+                    <v-flex xs8 sm5 class="ml-3">
+                      <v-text-field
+                        placeholder="fill your Description"
+                        v-model="editedItem.description"
+                        type="text"
+                      ></v-text-field>
                     </v-flex>
                   </v-layout>
-                </v-container>
+                </v-flex>
+                <v-layout>
+                  <v-flex xs12 sm10 offset-sm1>
+                    <v-card-actions>
+                      <v-btn round dark @click.native="close">Cancel</v-btn>
+                      <v-spacer></v-spacer>
+                      <v-btn round dark @click="save">Save</v-btn>
+                    </v-card-actions>
+                  </v-flex>
+                </v-layout>
+              </v-container>
             </v-card>
           </v-flex>
         </v-dialog>
@@ -192,24 +192,36 @@
 
             <td id="td" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Exam/exam.vue b/src/pages/Exam/exam.vue
index fd65fc6..be45f60 100644
--- a/src/pages/Exam/exam.vue
+++ b/src/pages/Exam/exam.vue
@@ -193,24 +193,36 @@
             <td id="td" class="text-xs-center">{{ props.item.note}}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteExam(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -307,7 +319,7 @@
                     <v-flex xs12 sm6 offset-sm3>
                       <v-card-actions>
                         <v-btn @click="clear" round dark>clear</v-btn>
-                          <v-spacer class="hidden-xs-only"></v-spacer>
+                        <v-spacer class="hidden-xs-only"></v-spacer>
                         <v-btn @click="submit" round dark :loading="loading">Add</v-btn>
                       </v-card-actions>
                     </v-flex>
diff --git a/src/pages/Exam/examSchedule.vue b/src/pages/Exam/examSchedule.vue
index 81cb3ca..0218d5c 100644
--- a/src/pages/Exam/examSchedule.vue
+++ b/src/pages/Exam/examSchedule.vue
@@ -393,24 +393,36 @@
             <td id="td" class="text-xs-center">{{ props.item.room }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteSchedule(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -519,7 +531,7 @@
                       <v-flex xs5 class="pt-4 subheading">
                         <label class="right">Date:</label>
                       </v-flex>
-                      <v-flex xs7 sm4  class="ml-3">
+                      <v-flex xs7 sm4 class="ml-3">
                         <v-menu
                           ref="menu2"
                           :close-on-content-click="false"
diff --git a/src/pages/Exam/grade.vue b/src/pages/Exam/grade.vue
index 84a5694..7e076a1 100644
--- a/src/pages/Exam/grade.vue
+++ b/src/pages/Exam/grade.vue
@@ -210,6 +210,7 @@
         >{{ text }}</v-snackbar>
 
         <!-- ****** EXISTING GRADE TABLE****** -->
+
         <v-card></v-card>
         <v-data-table
           :headers="headers"
@@ -227,24 +228,36 @@
             <td id="td" class="text-xs-center">{{ props.item.note }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteGrade(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -292,7 +305,7 @@
                       <v-flex xs5 class="pt-4 subheading">
                         <label class="right">Grade Point:</label>
                       </v-flex>
-                      <v-flex xs7 sm4  class="ml-3">
+                      <v-flex xs7 sm4 class="ml-3">
                         <v-text-field
                           placeholder="fill your Grade Point"
                           v-model="addGrade.gradePoint"
@@ -306,7 +319,7 @@
                       <v-flex xs5 class="pt-4 subheading">
                         <label class="right">Mark From:</label>
                       </v-flex>
-                      <v-flex xs7 sm4  class="ml-3">
+                      <v-flex xs7 sm4 class="ml-3">
                         <v-text-field
                           placeholder="fill your Mark From"
                           :rules="markFromRules"
@@ -320,7 +333,7 @@
                       <v-flex xs5 class="pt-4 subheading">
                         <label class="right">Mark Upto:</label>
                       </v-flex>
-                      <v-flex xs7 sm4  class="ml-3">
+                      <v-flex xs7 sm4 class="ml-3">
                         <v-text-field
                           placeholder="fill your Mark Upto"
                           :rules="markUptoRules"
@@ -334,7 +347,7 @@
                       <v-flex xs5 class="pt-4 subheading">
                         <label class="right">Note:</label>
                       </v-flex>
-                      <v-flex xs7 sm4  class="ml-3">
+                      <v-flex xs7 sm4 class="ml-3">
                         <v-text-field
                           placeholder="fill your Note"
                           :rules="noteRules"
@@ -348,7 +361,7 @@
                     <v-flex xs12 sm7 offset-sm3>
                       <v-card-actions>
                         <v-btn @click="clear" round dark>clear</v-btn>
-                        <v-spacer  class="hidden-xs-only"></v-spacer>
+                        <v-spacer class="hidden-xs-only"></v-spacer>
                         <v-btn @click="submit" round dark :loading="loading">Add</v-btn>
                       </v-card-actions>
                     </v-flex>
@@ -393,14 +406,11 @@ export default {
     valid: true,
     isActive: true,
     newActive: false,
-    // addclass: [],
-    // addSection: [],
-    // AddUsercredentials: {},
     pagination: {
       rowsPerPage: 15
     },
     gradeNameRules: [v => !!v || "Grade Name is required"],
-    gradePointRules: [v => !!v || "Grade Pointis required"],
+    gradePointRules: [v => !!v || "Grade Point required"],
     markFromRules: [v => !!v || "Mark From is required"],
     markUptoRules: [v => !!v || "Mark Upto is required"],
     authorRules: [v => !!v || "Author is required"],
diff --git a/src/pages/Gallery/gallery.vue b/src/pages/Gallery/gallery.vue
index 9e4afdf..c5cf077 100644
--- a/src/pages/Gallery/gallery.vue
+++ b/src/pages/Gallery/gallery.vue
@@ -311,25 +311,37 @@
             <td id="td" class="text-xs-center">{{ props.item.description}}</td>
 
             <td id="td" class="text-xs-center">
-              <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+               <span>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Holiday/holiday.vue b/src/pages/Holiday/holiday.vue
index 0df8aac..2ebf459 100644
--- a/src/pages/Holiday/holiday.vue
+++ b/src/pages/Holiday/holiday.vue
@@ -17,7 +17,7 @@
         class="subheading"
       >Add New Holiday</v-tab>
 
-      <!-- ****** EDITS  Holiday DETAILS ****** -->
+      <!-- ****** EDIT HOLIDAY DATA ****** -->
 
       <v-tab-item>
         <v-snackbar
@@ -105,7 +105,7 @@
 
         <!-- ****** PROFILE VIEW Holiday DEATILS ******  -->
 
-        <v-dialog v-model="dialog1" max-width="700px">
+        <v-dialog v-model="dialog1" max-width="500px">
           <v-toolbar class="v-toolbar">
             <v-spacer></v-spacer>
             <v-toolbar-title>
@@ -169,24 +169,36 @@
 
             <td id="td" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -266,17 +278,16 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                    <v-flex xs12 sm7 offset-sm2>
-                      <v-layout>
-                        <v-flex xs6>
-                          <v-btn @click="clear" round class="ml-3" dark>clear</v-btn>
-                        </v-flex>
-                        <v-flex xs6>
-                          <v-btn @click="submit" round dark :loading="loading" class="right">Add</v-btn>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                  </v-layout>
+                  <v-flex xs12 sm7 offset-sm2>
+                    <v-layout>
+                      <v-flex xs6>
+                        <v-btn @click="clear" round class="ml-3" dark>clear</v-btn>
+                      </v-flex>
+                      <v-flex xs6>
+                        <v-btn @click="submit" round dark :loading="loading" class="right">Add</v-btn>
+                      </v-flex>
+                    </v-layout>
+                  </v-flex>
                 </v-container>
               </v-form>
             </v-card>
diff --git a/src/pages/Library/books.vue b/src/pages/Library/books.vue
index c22d7c5..17bdc2c 100644
--- a/src/pages/Library/books.vue
+++ b/src/pages/Library/books.vue
@@ -230,25 +230,37 @@
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
-              </span>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
+              </span> 
             </td>
           </template>
           <v-alert
diff --git a/src/pages/Library/eBook.vue b/src/pages/Library/eBook.vue
index 2abcd0a..d1f7ba0 100644
--- a/src/pages/Library/eBook.vue
+++ b/src/pages/Library/eBook.vue
@@ -240,24 +240,36 @@
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -650,8 +662,8 @@ export default {
     },
     clear() {
       this.$refs.form.reset();
-      this.addEBooks.uploadCover = ""
-      this.files = ""
+      this.addEBooks.uploadCover = "";
+      this.files = "";
     },
     save() {
       this.loadingUpadte = true;
diff --git a/src/pages/Library/issue.vue b/src/pages/Library/issue.vue
index a48e293..83ccbc1 100644
--- a/src/pages/Library/issue.vue
+++ b/src/pages/Library/issue.vue
@@ -306,25 +306,37 @@
               >{{ props.item.bookId.status}}</span>
             </td>
             <td class="text-xs-center">
-              <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="returnBook(props.item)"
-                  src="/static/icon/return.jpg"
-                />
+               <span>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -525,7 +537,6 @@ export default {
     newActive: false,
     addclass: [],
     addSection: [],
-    AddUsercredentials: {},
     pagination: {
       rowsPerPage: 15
     },
diff --git a/src/pages/Library/member.vue b/src/pages/Library/member.vue
index d93ff1c..21a79c2 100644
--- a/src/pages/Library/member.vue
+++ b/src/pages/Library/member.vue
@@ -425,53 +425,53 @@
       </v-toolbar>
       <v-card>
         <v-card-text>
-            <v-layout wrap justify-center>
-              <v-flex xs12 sm12 md10>
-                <v-form ref="form" v-model="valid" lazy-validation>
-                  <v-layout>
-                    <v-flex xs4 class="pt-4 subheading">
-                      <label class="right pr-3">Library Id:</label>
-                    </v-flex>
-                    <v-flex xs8>
-                      <v-text-field
-                        v-model="addBook.libraryId"
-                        :rules="libraryIdRules"
-                        type="number"
-                        placeholder="fill your Library ID"
-                      ></v-text-field>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout>
-                    <v-flex xs4 class="pt-4 subheading">
-                      <label class="right pr-3">Library Fee:</label>
-                    </v-flex>
-                    <v-flex xs8>
-                      <v-text-field
-                        v-model="addBook.libraryFee"
-                        type="number"
-                        :rules="libraryFeeRules"
-                        placeholder="fill your Library Fee"
-                      ></v-text-field>
-                    </v-flex>
-                  </v-layout>
-                  <v-card-actions>
-                    <v-btn round dark @click.native="addLibrary = false">Cancel</v-btn>
-                    <v-spacer></v-spacer>
-                    <v-btn round dark @click="submit" :loading="loading">Add Member</v-btn>
-                  </v-card-actions>
-                </v-form>
-              </v-flex>
-            </v-layout>
+          <v-layout wrap justify-center>
+            <v-flex xs12 sm12 md10>
+              <v-form ref="form" v-model="valid" lazy-validation>
+                <v-layout>
+                  <v-flex xs4 class="pt-4 subheading">
+                    <label class="right pr-3">Library Id:</label>
+                  </v-flex>
+                  <v-flex xs8>
+                    <v-text-field
+                      v-model="addBook.libraryId"
+                      :rules="libraryIdRules"
+                      type="number"
+                      placeholder="fill your Library ID"
+                    ></v-text-field>
+                  </v-flex>
+                </v-layout>
+                <v-layout>
+                  <v-flex xs4 class="pt-4 subheading">
+                    <label class="right pr-3">Library Fee:</label>
+                  </v-flex>
+                  <v-flex xs8>
+                    <v-text-field
+                      v-model="addBook.libraryFee"
+                      type="number"
+                      :rules="libraryFeeRules"
+                      placeholder="fill your Library Fee"
+                    ></v-text-field>
+                  </v-flex>
+                </v-layout>
+                <v-card-actions>
+                  <v-btn round dark @click.native="addLibrary = false">Cancel</v-btn>
+                  <v-spacer></v-spacer>
+                  <v-btn round dark @click="submit" :loading="loading">Add Member</v-btn>
+                </v-card-actions>
+              </v-form>
+            </v-flex>
+          </v-layout>
         </v-card-text>
       </v-card>
     </v-dialog>
     <!-- ****** EXISTING MEMBER TABLE ****** -->
     <v-card flat>
-          <h4
-            class="text-xs-center pt-4 ml-2 hidden-lg-only hidden-xl-only hidden-md-only"
-          >Library Member</h4>
+      <h4
+        class="text-xs-center pt-4 ml-2 hidden-lg-only hidden-xl-only hidden-md-only"
+      >Library Member</h4>
       <v-card-actions>
-          <h3 class="right mt-2 ml-2 hidden-sm-only hidden-xs-only">Library Member</h3>
+        <h3 class="right mt-2 ml-2 hidden-sm-only hidden-xs-only">Library Member</h3>
         <v-spacer></v-spacer>
         <v-flex xs12 sm4 md2>
           <v-select
@@ -508,31 +508,47 @@
         <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
         <td id="td" class="text-xs-center">{{ props.item.email }}</td>
         <td class="text-xs-center">
-          <img
-            v-if="!props.item.libraryId"
-            style="cursor:pointer; width:25px; height:18px; "
-            @click="addLibraryData(props.item)"
-            src="/static/icon/add.png"
-          />
-          <span v-if="props.item.libraryId">
+          <v-tooltip top>
             <img
+              slot="activator"
+              v-if="!props.item.libraryId"
               style="cursor:pointer; width:25px; height:18px; "
-              class="mr-5"
-              @click="profile(props.item)"
-              src="/static/icon/eye1.png"
-            />
-            <img
-              style="cursor:pointer; width:20px; height:18px; "
-              class="mr-5"
-              @click="editItem(props.item)"
-              src="/static/icon/edit1.png"
-            />
-            <img
-              style="cursor:pointer;width:20px; height:20px; "
-              class="mr-5"
-              @click="deleteItem(props.item)"
-              src="/static/icon/delete1.png"
+              @click="addLibraryData(props.item)"
+              src="/static/icon/add.png"
             />
+            <span>Add</span>
+          </v-tooltip>
+          <span v-if="props.item.libraryId">
+            <v-tooltip top>
+              <img
+                slot="activator"
+                style="cursor:pointer; width:25px; height:18px; "
+                class="mr5"
+                @click="profile(props.item)"
+                src="/static/icon/eye1.png"
+              />
+              <span>View</span>
+            </v-tooltip>
+            <v-tooltip top>
+              <img
+                slot="activator"
+                style="cursor:pointer; width:20px; height:18px; "
+                class="mr5"
+                @click="editItem(props.item)"
+                src="/static/icon/edit1.png"
+              />
+              <span>Edit</span>
+            </v-tooltip>
+            <v-tooltip top>
+              <img
+                slot="activator"
+                style="cursor:pointer; width:20px; height:20px; "
+                class="mr5"
+                @click="deleteItem(props.item)"
+                src="/static/icon/delete1.png"
+              />
+              <span>Delete</span>
+            </v-tooltip>
           </span>
         </td>
       </template>
diff --git a/src/pages/Mark/mark.vue b/src/pages/Mark/mark.vue
index 5c1f53b..d6b31ae 100644
--- a/src/pages/Mark/mark.vue
+++ b/src/pages/Mark/mark.vue
@@ -317,11 +317,15 @@
                   src="/static/icon/eye1.png"
                 />-->
                 <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
-                  <img
-                    style="cursor:pointer; width:20px; height:18px; "
-                    class="mr-5"
-                    src="/static/icon/edit1.png"
-                  />
+                  <v-tooltip top>
+                    <img
+                      slot="activator"
+                      style="cursor:pointer; width:20px; height:18px; "
+                      class="mr-5"
+                      src="/static/icon/edit1.png"
+                    />
+                    <span>Edit</span>
+                  </v-tooltip>  
                 </router-link>
                 <!-- <img
                   style="cursor:pointer;width:20px; height:20px; "
@@ -462,7 +466,7 @@
                     class="text-xs-center markTable"
                     v-for="marks in props.item.marksObtained"
                   >
-                    <v-text-field  v-model="marks.marksScored"></v-text-field>
+                    <v-text-field v-model="marks.marksScored"></v-text-field>
                   </td>
                 </template>
                 <v-alert
@@ -939,6 +943,6 @@ export default {
   color: black !important;
 }
 .markTable {
-    max-width: 80px !important;
+  max-width: 80px !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/Mark/promotion.vue b/src/pages/Mark/promotion.vue
index 75b5801..aca4b53 100644
--- a/src/pages/Mark/promotion.vue
+++ b/src/pages/Mark/promotion.vue
@@ -1,28 +1,41 @@
 <template>
   <v-app id="login">
     <v-container fluid>
+      <v-layout>
+        <v-card-actions>
+          <v-layout>
+            <h3 class="right">Promotion</h3>
+          </v-layout>
+          <v-spacer></v-spacer>
+        </v-card-actions>
+      </v-layout>
       <v-card class="px-3 grey lighten-2" flat>
         <v-flex xs12>
           <v-layout wrap>
             <v-flex xs12 sm12 md3>
-              <!-- <v-layout> -->
               <v-flex md12 class="mt-4 body-1">
                 <label>Academic Year :</label>
               </v-flex>
               <v-flex md10>
                 <v-select :items="acedemicYear" label="Select Academic Year"></v-select>
               </v-flex>
-              <!-- </v-layout> -->
             </v-flex>
             <v-flex xs12 sm12 md3>
-              <!-- <v-layout> -->
               <v-flex md12 class="mt-4 body-1">
                 <label class>Class :</label>
               </v-flex>
               <v-flex md10 class="ml-2">
-                <v-select :items="acedemicYear" label="Select Academic Year"></v-select>
+                <v-select
+                  v-model="promtion.classId"
+                  label="Select your class"
+                  type="text"
+                  :rules="classRules"
+                  :items="classList"
+                  item-text="classNum"
+                  item-value="_id"
+                  required
+                ></v-select>
               </v-flex>
-              <!-- </v-layout> -->
             </v-flex>
             <v-flex xs12 sm12 md3>
               <v-flex md12 class="mt-4 body-1">
@@ -43,13 +56,12 @@
           </v-layout>
         </v-flex>
       </v-card>
-      <v-container class="pb-0 pt-5">
+      <v-container class="pb-0">
         <v-card class="px-3 grey lighten-2" flat>
           <v-flex xs12>
             <v-layout>
               <v-flex xs12 sm12 md12>
                 <v-layout>
-                  <!-- <p>{{ radios || 'null' }}</p> -->
                   <v-radio-group v-model="radios" :mandatory="false">
                     <v-layout>
                       <v-flex xs12 sm12 md6>
@@ -82,7 +94,6 @@
                       <label>Exam</label>
                     </v-flex>
                     <v-flex sm12 xs12 md7>
-                      <!-- <p>{{ selected }}</p> -->
                       <v-checkbox v-model="selected" label="FIRST TERMINAL" value="John"></v-checkbox>
                       <v-checkbox
                         v-model="selected"
@@ -90,7 +101,7 @@
                         value="Jacob"
                         class="mt-0"
                       ></v-checkbox>
-                      <v-checkbox v-model="selected" label="Test07" value="Jacob" class="mt-0"></v-checkbox>
+                      <v-checkbox v-model="selected" label="Test07" value="Jacobs" class="mt-0"></v-checkbox>
                     </v-flex>
                   </v-layout>
                 </v-card>
@@ -106,7 +117,6 @@
                       <label>Mark Percentage</label>
                     </v-flex>
                     <v-flex xs12 sm12 md7>
-                      <!-- <p>{{ selected }}</p> -->
                       <v-checkbox v-model="selected" label="Exam " value="John"></v-checkbox>
                       <v-checkbox v-model="selected" label="ASSIGNMENT" value="Jacob" class="mt-0"></v-checkbox>
                     </v-flex>
@@ -141,7 +151,10 @@
                 <label>MATHEMATICS Pass Mark :</label>
               </v-flex>
               <v-flex md10>
-                <v-text-field v-model="passmark.mathematics" placeholder="fill Mathematics Pass Mark"></v-text-field>
+                <v-text-field
+                  v-model="passmark.mathematics"
+                  placeholder="fill Mathematics Pass Mark"
+                ></v-text-field>
               </v-flex>
             </v-flex>
             <!-- <v-flex xs12 sm12 md3>
@@ -165,18 +178,41 @@
 </template>
 
 <script>
+import http from "@/Services/http.js";
+
 export default {
   data() {
     return {
       radios: "radio-1",
       acedemicYear: [],
+      classList: [],
+      promtion: {},
       passmark: {
         hindi: "40",
         english: "40",
         mathematics: "40"
       },
-      selected: ["John"]
+      selected: ["John", "Jacob", "Jacobs"],
+      token: ""
     };
+  },
+  mounted() {
+    this.token = this.$store.state.token;
+    this.getClass();
+  },
+  methods: {
+    getClass() {
+      http()
+        .get("/getClassesList", {
+          headers: { Authorization: "Bearer " + this.token }
+        })
+        .then(response => {
+          this.classList = response.data.data;
+        })
+        .catch(err => {
+          // console.log("err====>", err);
+        });
+    }
   }
 };
 </script>
\ No newline at end of file
diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue
index 7d24a6a..e2a7e21 100644
--- a/src/pages/Mark/viewMark.vue
+++ b/src/pages/Mark/viewMark.vue
@@ -1,6 +1,7 @@
 <template>
   <v-app id="pages-dasboard">
-    <!-- ****** Edit multiple INVOICE ****** -->
+    <!-- ****** PROFILE MARK  ****** -->
+
     <v-container fluid grid-list-md>
       <v-flex xs12 sm12>
         <v-container fluid>
@@ -79,6 +80,9 @@
                 </v-card-text>
               </v-card>
             </v-flex>
+
+            <!-- ****** TABLE DATA MARK  ****** -->
+
             <v-flex xs12 sm12 md9 class="mt-4">
               <v-card>
                 <v-toolbar dark class="fixcolors" flat>
@@ -121,11 +125,11 @@
                   </tr>
                   <!-- </tr> -->
                   <tr v-for="(mark,i) in markData" :key="i">
-                    <td>{{mark.classId.subjects[0].subjectName}}</td>
+                    <td>{{ mark.classId.subjects[0].subjectName }}</td>
                     <td
                       v-for="(markDistribution,i) in markParticularDistributionData"
                       :key="i"
-                    >{{ markDistribution }}</td> 
+                    >{{ markDistribution }}</td>
                     <!-- <td>
                       10	
                     </td>
@@ -202,13 +206,12 @@ export default {
                 k++
               ) {
                 this.markParticularDistributionData.push(
-                  this.markData[i].studentsMarks[j].marksObtained[k]
-                    .marksScored
+                  this.markData[i].studentsMarks[j].marksObtained[k].marksScored
                 );
                 this.markParticularDistributionData.push(
-                   this.markData[i].studentsMarks[j].marksObtained[k]
-                    .markDistributionId.markValue,
-                  );
+                  this.markData[i].studentsMarks[j].marksObtained[k]
+                    .markDistributionId.markValue
+                );
                 console.log(
                   "this.markParticularDistributionData",
                   this.markParticularDistributionData
diff --git a/src/pages/News/news.vue b/src/pages/News/news.vue
index 7df7f19..8710725 100644
--- a/src/pages/News/news.vue
+++ b/src/pages/News/news.vue
@@ -229,25 +229,37 @@
             <td id="td" class="text-xs-center">{{ props.item.description}}</td>
 
             <td class="text-xs-center">
-              <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+               <span>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/NoticeBoard/noticeBoard.vue b/src/pages/NoticeBoard/noticeBoard.vue
index b28ae2d..c47c3a4 100644
--- a/src/pages/NoticeBoard/noticeBoard.vue
+++ b/src/pages/NoticeBoard/noticeBoard.vue
@@ -205,24 +205,36 @@
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Notification/notification.vue b/src/pages/Notification/notification.vue
index 7ca1c14..19a2c0e 100644
--- a/src/pages/Notification/notification.vue
+++ b/src/pages/Notification/notification.vue
@@ -82,7 +82,7 @@
 
         <!-- ****** PROFILE VIEW NOTIFICATION DEATILS ******  -->
 
-        <v-dialog v-model="dialog1" max-width="600px">
+        <v-dialog v-model="dialog1" max-width="500px">
           <v-toolbar color="v-toolbar">
             <v-spacer></v-spacer>
             <v-toolbar-title>
@@ -146,24 +146,36 @@
 
             <td id="td" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -224,7 +236,7 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                   <v-layout>
+                  <v-layout>
                     <v-flex xs12 sm9 offset-sm2>
                       <v-layout>
                         <v-flex xs6>
diff --git a/src/pages/Parent/parents.vue b/src/pages/Parent/parents.vue
index ffb9db7..68ca314 100644
--- a/src/pages/Parent/parents.vue
+++ b/src/pages/Parent/parents.vue
@@ -260,18 +260,26 @@
             <td id="td" class="text-xs-center">{{ props.item.motherCellNo }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -395,17 +403,21 @@
                               </v-flex>
                             </v-layout>
                             <v-flex xs12 sm12>
-                              <v-card-actions>
-                                <v-btn @click="clear" round dark class="ml-4">clear</v-btn>
-                                <v-spacer></v-spacer>
-                                <v-btn
-                                  @click="submitParentDetails"
-                                  round
-                                  dark
-                                  :loading="loading"
-                                  v-show="showParent"
-                                >Add</v-btn>
-                              </v-card-actions>
+                              <v-layout>
+                                <v-flex xs6 sm6 offset-sm1>
+                                  <v-btn @click="clear" round dark class="ml-4">clear</v-btn>
+                                </v-flex>
+                                <v-flex xs6 sm6>
+                                  <v-btn
+                                    class="right"
+                                    @click="submitParentDetails"
+                                    round
+                                    dark
+                                    :loading="loading"
+                                    v-show="showParent"
+                                  >Add</v-btn>
+                                </v-flex>
+                              </v-layout>
                             </v-flex>
                           </v-container>
                         </v-form>
diff --git a/src/pages/Report/markSheetReport.vue b/src/pages/Report/markSheetReport.vue
deleted file mode 100644
index 1fb6093..0000000
--- a/src/pages/Report/markSheetReport.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-  <v-app id="pages-dasboard">
-    <v-snackbar
-      :timeout="timeout"
-      :top="y === 'top'"
-      :right="x === 'right'"
-      :vertical="mode === 'vertical'"
-      v-model="snackbar"
-      color="success"
-    >{{ text }}</v-snackbar>
-
-    <!-- ******  Mark Sheet Report TABLE****** -->
-    <v-card flat>
-      <v-card-actions>
-        <v-layout>
-          <h4 class="right mt-2 ml-2">Mark Sheet Report</h4>
-        </v-layout>
-        <v-spacer></v-spacer>
-      </v-card-actions>
-    </v-card>
-    <v-card flat>
-      <v-flex xs12 sm12 lg12>
-        <v-layout wrap>
-          <v-flex xs12 sm12 lg3>
-            <v-layout>
-              <v-flex xs3 sm6 lg2 class="subheading mt-4">
-                <label class="right">Exam:</label>
-              </v-flex>
-              <v-flex xs12 sm12 lg8 class="ml-2">
-                <v-select
-                  v-model="getMark.exam"
-                  label="Select your Exam"
-                  type="text"
-                  :items="examList"
-                  item-text="classNum"
-                  item-value="_id"
-                  @change="getSections(getMark.classId)"
-                  required
-                ></v-select>
-              </v-flex>
-            </v-layout>
-          </v-flex>
-          <v-flex xs12 sm12 lg3>
-            <v-layout>
-              <v-flex xs3 sm6 lg2 class="subheading mt-4">
-                <label class="right">Class:</label>
-              </v-flex>
-              <v-flex xs12 sm12 lg8 class="ml-2">
-                <v-select
-                  v-model="getMark.classId"
-                  label="Select your class"
-                  type="text"
-                  :items="classList"
-                  item-text="classNum"
-                  item-value="_id"
-                  @change="getSections(getMark.classId)"
-                  required
-                ></v-select>
-              </v-flex>
-            </v-layout>
-          </v-flex>
-          <v-flex xs12 sm12 lg3>
-            <v-layout>
-              <v-flex xs3 sm6 lg2 class="subheading mt-4">
-                <label class="right">Section:</label>
-              </v-flex>
-              <v-flex xs12 sm12 lg8 class="ml-2">
-                <v-select
-                  :items="addSection"
-                  label="Select your Section"
-                  v-model="getMark.sectionId"
-                  item-text="name"
-                  item-value="_id"
-                  name="Select Section"
-                  required
-                ></v-select>
-              </v-flex>
-            </v-layout>
-          </v-flex>
-          <v-flex xs12 sm12 lg3>
-            <v-btn @click="getStudents" round dark :loading="loading" class="right mt-3">Get Report</v-btn>
-          </v-flex>
-        </v-layout>
-      </v-flex>
-    </v-card>
-    <v-data-table
-      :headers="headers"
-      :items="getStudentsList"
-      :pagination.sync="pagination"
-      :search="search"
-    >
-      <template slot="items" slot-scope="props">
-        <td class="text-xs-center">{{ props.index + 1}}</td>
-        <td id="td" class="text-xs-center">
-          <v-avatar>
-            <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
-            <img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
-          </v-avatar>
-        </td>
-        <td id="td" class="text-xs-center">{{ props.item.name}}</td>
-        <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
-        <td id="td" class="text-xs-center">{{ props.item.email }}</td>
-        <td class="text-xs-center">
-          <span>
-            <!-- <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-            />-->
-            <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
-              <img
-                style="cursor:pointer; width:20px; height:18px; "
-                class="mr-5"
-                src="/static/icon/edit1.png"
-              />
-            </router-link>
-            <!-- <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteSchedule(props.item)"
-                  src="/static/icon/delete1.png"
-            />-->
-          </span>
-        </td>
-      </template>
-      <v-alert
-        slot="no-results"
-        :value="true"
-        color="error"
-        icon="warning"
-      >Your search for "{{ search }}" found no results.</v-alert>
-    </v-data-table>
-    <div class="loader" v-if="showLoader">
-      <v-progress-circular indeterminate color="white"></v-progress-circular>
-    </div>
-  </v-app>
-</template>
-
-<script>
-import http from "@/Services/http.js";
-import moment from "moment";
-
-export default {
-  data: () => ({
-    snackbar: false,
-    color: "",
-    y: "top",
-    x: "right",
-    mode: "",
-    timeout: 10000,
-    text: "",
-    loading: false,
-    search: "",
-    showLoader: false,
-    addSection: [],
-    pagination: {
-      rowsPerPage: 15
-    },
-    headers: [
-      {
-        align: "justify-center",
-        text: "No",
-        sortable: false,
-        value: "No"
-      },
-      {
-        text: "Profile Pic",
-        vaue: "profilePicUrl",
-        sortable: false,
-        align: "center"
-      },
-      {
-        text: "Name",
-        vaue: "name",
-        sortable: false,
-        align: "center"
-      },
-      {
-        text: "Roll No.",
-        value: "rollNo",
-        sortable: false,
-        align: "center"
-      },
-      {
-        text: "Email",
-        value: "email",
-        sortable: false,
-        align: "center"
-      },
-      { text: "Action", value: "", sortable: false, align: "center" }
-    ],
-    classList: [],
-    getMark: {},
-    markData: [],
-    examList: [],
-    getStudentsList: [],
-    token: ""
-  }),
-  methods: {
-    getClass() {
-      http()
-        .get("/getClassesList", {
-          headers: { Authorization: "Bearer " + this.token }
-        })
-        .then(response => {
-          this.classList = response.data.data;
-        })
-        .catch(err => {
-          // console.log("err====>", err);
-        });
-    },
-    getSections(_id) {
-      console.log(_id);
-      for (let i = 0; i < this.classList.length; i++) {
-        if (_id == this.classList[i]._id) {
-          this.subjects = this.classList[i].subjects;
-        }
-      }
-      http()
-        .get(
-          "/getSectionsList",
-          { params: { classId: _id } },
-          {
-            headers: { Authorization: "Bearer " + this.token }
-          }
-        )
-        .then(response => {
-          this.addSection = response.data.data;
-        })
-        .catch(err => {
-          // console.log("err====>", err);
-        });
-    },
-    getStudents() {
-      this.showLoader = true;
-      http()
-        .get("/getStudentWithClass", {
-          params: {
-            classId: this.getMark.classId,
-            sectionId: this.getMark.sectionId
-          }
-        })
-        .then(response => {
-          this.getStudentsList = response.data.data;
-          this.showLoader = false;
-          console.log("getSectionsList=====>", response.data.data);
-        })
-        .catch(error => {
-          console.log("err====>", error);
-          this.showLoader = false;
-        });
-    },
-    getExamList() {
-      this.showLoader = true;
-      http()
-        .get("/getExamsList", {
-          headers: { Authorization: "Bearer " + this.token }
-        })
-        .then(response => {
-          this.examList = response.data.data;
-          this.showLoader = false;
-        })
-        .catch(error => {
-          // console.log("err====>", err);
-          this.showLoader = false;
-          this.snackbar = true;
-          this.text = error.response.data.message;
-          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.getExamList();
-    this.getClass();
-  },
-  created() {
-    this.$root.$on("app:search", search => {
-      this.search = search;
-    });
-  },
-  beforeDestroy() {
-    // dont forget to remove the listener
-    this.$root.$off("app:search");
-  }
-};
-</script>
-<style scoped>
-.active {
-  background-color: gray;
-  color: white !important;
-}
-.activebtn {
-  color: black !important;
-}
-</style>s
\ No newline at end of file
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
new file mode 100644
index 0000000..e5d9363
--- /dev/null
+++ b/src/pages/Report/progressCardReport.vue
@@ -0,0 +1,299 @@
+<template>
+  <v-app id="pages-dasboard">
+    <v-snackbar
+      :timeout="timeout"
+      :top="y === 'top'"
+      :right="x === 'right'"
+      :vertical="mode === 'vertical'"
+      v-model="snackbar"
+      color="success"
+    >{{ text }}</v-snackbar>
+
+    <!-- ******  Progress Card Report Table****** -->
+
+    <v-card flat>
+      <v-card-actions>
+        <v-layout>
+          <h4 class="ml-2">Progress Card Report</h4>
+        </v-layout>
+      </v-card-actions>
+    </v-card>
+    <v-card flat>
+      <v-form ref="form" v-model="valid" lazy-validation>
+        <v-flex xs12 sm12 lg12>
+          <v-layout wrap>
+            <v-flex xs12 sm12 lg3>
+              <v-layout>
+                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                  <label class="right">Class:</label>
+                </v-flex>
+                <v-flex xs12 sm12 lg8 class="ml-2">
+                  <v-select
+                    v-model="getReport.classId"
+                    label="Select your class"
+                    type="text"
+                    :items="classList"
+                    item-text="classNum"
+                    item-value="_id"
+                    :rules="classRules"
+                    @change="getSections(getReport.classId)"
+                    required
+                  ></v-select>
+                </v-flex>
+              </v-layout>
+            </v-flex>
+            <v-flex xs12 sm12 lg3>
+              <v-layout>
+                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                  <label class="right">Section:</label>
+                </v-flex>
+                <v-flex xs12 sm12 lg8 class="ml-2">
+                  <v-select
+                    :items="addSection"
+                    label="Select your Section"
+                    v-model="getReport.sectionId"
+                    item-text="name"
+                    item-value="_id"
+                    name="Select Section"
+                    @change="getStudents"
+                    :rules="sectionRules"
+                    required
+                  ></v-select>
+                </v-flex>
+              </v-layout>
+            </v-flex>
+            <v-flex xs12 sm12 lg3>
+              <v-layout>
+                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                  <label class="right">Student:</label>
+                </v-flex>
+                <v-flex xs12 sm12 lg8 class="ml-2">
+                  <v-select
+                    :items="getStudentsList"
+                    label="Select your student"
+                    v-model="getReport.studentId"
+                    item-text="name"
+                    item-value="_id"
+                    :rules="studentRules"
+                    required
+                  ></v-select>
+                </v-flex>
+              </v-layout>
+            </v-flex>
+            <v-flex xs12 sm12 lg3>
+              <v-btn @click="getReport" round dark :loading="loading" class="right mt-3">Get Report</v-btn>
+            </v-flex>
+          </v-layout>
+        </v-flex>
+      </v-form>
+    </v-card>
+    <!-- <v-data-table
+      :headers="headers"
+      :items="getStudentsList"
+      :pagination.sync="pagination"
+      :search="search"
+    >
+      <template slot="items" slot-scope="props">
+        <td class="text-xs-center">{{ props.index + 1}}</td>
+        <td id="td" class="text-xs-center">
+          <v-avatar>
+            <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
+            <img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
+          </v-avatar>
+        </td>
+        <td id="td" class="text-xs-center">{{ props.item.name}}</td>
+        <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
+        <td id="td" class="text-xs-center">{{ props.item.email }}</td>
+        <td class="text-xs-center">
+          <span>
+            <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
+              <img
+                style="cursor:pointer; width:20px; height:18px; "
+                class="mr-5"
+                src="/static/icon/edit1.png"
+              />
+            </router-link>
+          </span>
+        </td>
+      </template>
+      <v-alert
+        slot="no-results"
+        :value="true"
+        color="error"
+        icon="warning"
+      >Your search for "{{ search }}" found no results.</v-alert>
+    </v-data-table>-->
+    <div class="loader" v-if="showLoader">
+      <v-progress-circular indeterminate color="white"></v-progress-circular>
+    </div>
+  </v-app>
+</template>
+
+<script>
+import http from "@/Services/http.js";
+import moment from "moment";
+
+export default {
+  data: () => ({
+    snackbar: false,
+    color: "",
+    y: "top",
+    x: "right",
+    mode: "",
+    timeout: 10000,
+    text: "",
+    loading: false,
+    search: "",
+    showLoader: false,
+    valid: true,
+    addSection: [],
+    classRules: [v => !!v || "Class is required"],
+    sectionRules: [v => !!v || "Class is required"],
+    studentRules: [v => !!v || "Student is required"],
+    pagination: {
+      rowsPerPage: 15
+    },
+    headers: [
+      {
+        align: "justify-center",
+        text: "No",
+        sortable: false,
+        value: "No"
+      },
+      {
+        text: "Profile Pic",
+        vaue: "profilePicUrl",
+        sortable: false,
+        align: "center"
+      },
+      {
+        text: "Name",
+        vaue: "name",
+        sortable: false,
+        align: "center"
+      },
+      {
+        text: "Roll No.",
+        value: "rollNo",
+        sortable: false,
+        align: "center"
+      },
+      {
+        text: "Email",
+        value: "email",
+        sortable: false,
+        align: "center"
+      },
+      { text: "Action", value: "", sortable: false, align: "center" }
+    ],
+    classList: [],
+    getReport: {},
+    markData: [],
+    examList: [],
+    getStudentsList: [],
+    token: ""
+  }),
+  methods: {
+    clear() {
+      this.$refs.form.reset();
+    },
+    getClass() {
+      http()
+        .get("/getClassesList", {
+          headers: { Authorization: "Bearer " + this.token }
+        })
+        .then(response => {
+          this.classList = response.data.data;
+        })
+        .catch(err => {
+          // console.log("err====>", err);
+        });
+    },
+    getSections(_id) {
+      http()
+        .get(
+          "/getSectionsList",
+          { params: { classId: _id } },
+          {
+            headers: { Authorization: "Bearer " + this.token }
+          }
+        )
+        .then(response => {
+          this.addSection = response.data.data;
+        })
+        .catch(err => {
+          // console.log("err====>", err);
+        });
+    },
+    getStudents() {
+      this.showLoader = true;
+      http()
+        .get("/getStudentWithClass", {
+          params: {
+            classId: this.getReport.classId,
+            sectionId: this.getReport.sectionId
+          }
+        })
+        .then(response => {
+          this.getStudentsList = response.data.data;
+          this.showLoader = false;
+          console.log("getSectionsList=====>", response.data.data);
+        })
+        .catch(error => {
+          console.log("err====>", error);
+          this.showLoader = false;
+        });
+    },
+    getReport() {
+      if (this.$refs.form.validate()) {
+        this.showLoader = true;
+        http()
+          .get("/getParticularMark", {
+            params: { studentId: this.getReport.studentId },
+            headers: { Authorization: "Bearer " + this.token }
+          })
+          .then(response => {
+            console.log("response.data.data", response.data.data);
+            // this.examList = response.data.data;
+            this.showLoader = false;
+            this.clear();
+          })
+          .catch(error => {
+            console.log("err====>", error);
+            this.showLoader = false;
+            //       this.snackbar = true;
+            //       this.text = error.response.data.message;
+            //       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.getExamList();
+    this.getClass();
+  },
+  created() {
+    this.$root.$on("app:search", search => {
+      this.search = search;
+    });
+  },
+  beforeDestroy() {
+    // dont forget to remove the listener
+    this.$root.$off("app:search");
+  }
+};
+</script>
+<style scoped>
+.active {
+  background-color: gray;
+  color: white !important;
+}
+.activebtn {
+  color: black !important;
+}
+</style>s
\ No newline at end of file
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index 979e39c..da85029 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -18,16 +18,16 @@
         <v-spacer></v-spacer>
       </v-card-actions>
     </v-card>
-    <v-card flat>
+    <v-card flat  class="elevation-0">
       <v-form ref="form" v-model="valid" lazy-validation>
         <v-flex xs12 sm12 lg12>
           <v-layout wrap>
             <v-flex xs12 sm12 lg4>
               <v-layout>
-                <v-flex xs3 sm6 lg3 class="subheading mt-4">
+                <v-flex xs4 sm4 lg3 class="subheading mt-4">
                   <label class="right">Report For :</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.form"
                     label="Select your report for"
@@ -43,10 +43,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="bloodGroup">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <v-flex xs4 sm4 lg4 class="subheading mt-4">
                   <label class="right">Blood Group :</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.bloodGroup"
                     label="Select your Blood Group "
@@ -59,10 +59,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="genderShow">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <v-flex xs4 sm4 lg4 class="subheading mt-4">
                   <label class="right">Gender:</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.gender"
                     label="Select your gender "
@@ -75,10 +75,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="TransportShow">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <v-flex xs4 sm4 lg4 class="subheading mt-4">
                   <label class="right">Route:</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.route"
                     label="Select your gender "
@@ -91,10 +91,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="HostelShow">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <v-flex xs4 sm4 lg4 class="subheading mt-4">
                   <label class="right">Hostel:</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.route"
                     label="Select your hostel "
@@ -107,10 +107,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="countryShow">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <v-flex xs4 sm4 lg4 class="subheading mt-4">
                   <label class="right">Country :</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.country"
                     label="Select your Country "
@@ -138,10 +138,10 @@
             </v-flex>-->
             <v-flex xs12 sm12 lg4>
               <v-layout>
-                <v-flex xs3 sm6 lg3 class="subheading mt-4">
+                <v-flex xs4 sm4 lg3 class="subheading mt-4">
                   <label class="right">Class:</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="report.classId"
                     label="Select your class"
@@ -158,10 +158,10 @@
             </v-flex>
             <v-flex xs12 sm12 lg4 v-if="sectionShow">
               <v-layout>
-                <v-flex xs3 sm6 lg3 class="subheading mt-4">
+                <v-flex xs4 sm4 lg3 class="subheading mt-4">
                   <label class="right">Section:</label>
                 </v-flex>
-                <v-flex xs12 sm12 lg8 class="ml-2">
+                <v-flex xs7 sm6 lg8 class="ml-2">
                   <v-select
                     :items="addSection"
                     label="Select your Section"
@@ -175,31 +175,36 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 sm12 lg4>
+            <v-flex xs12 sm12 lg4 class="hidden-xs-only hidden-sm-only">
               <v-btn @click="getStudents" round dark :loading="loading" class="mt-3 ml-5">Get Report</v-btn>
             </v-flex>
+            <v-flex xs12 sm12 lg4 class="hidden-lg-only hidden-md-only hidden-xl-only">
+              <v-btn @click="getStudents" round dark :loading="loading" class="mt-3 right">Get Report</v-btn>
+            </v-flex>
           </v-layout>
         </v-flex>
       </v-form>
     </v-card>
     <v-card flat v-if="getStudentsReportList">
-      <v-card-actions>
-        <v-layout>
-          <h5 class="right mt-2 ml-2">Student Report</h5>
-          <!-- <h5 class="right mt-2 ml-2">: {{ getStudentsReportList[0].classId.classNum }}</h5> -->
+      <v-flex xs12>
+        <v-layout v-for="(student,i) in getStudentsReportList" :key="i">
+          <v-flex xs12 sm12 md6>
+            <h5 class="mt-2 ml-2">Student Report</h5>
+            <h5 class="right mt-2 ml-2">: {{ student.classId.classNum }}</h5>
+          </v-flex>
+          <v-flex xs12 sm12 md6>
+            <h5 class="right mt-2 ml-2">Student Report</h5>
+            <h5 class="mt-2 ml-2">: {{ student.sectionId.name }}</h5>
+          </v-flex>
         </v-layout>
-        <v-spacer></v-spacer>
-        <v-layout>
-          <h5 class=" mt-2 ml-2">Student Report</h5>
-          <!-- <h5 class=" mt-2 ml-2">: {{ getStudentsReportList[0].sectionId.name }}</h5> -->
-        </v-layout>
-      </v-card-actions>
+      </v-flex>
     </v-card>
     <v-data-table
       :headers="headers"
       :items="getStudentsReportList"
       :pagination.sync="pagination"
       :search="search"
+      v-show="showTable"
     >
       <template slot="items" slot-scope="props">
         <td class="text-xs-center">{{ props.index + 1}}</td>
@@ -324,7 +329,6 @@ export default {
   methods: {
     clear() {
       this.$refs.form.reset();
-      //   console.log("this.clear()", this.$refs.form.reset;
     },
     getClass() {
       http()
@@ -391,16 +395,6 @@ export default {
     getStudents() {
       if (this.$refs.form.validate()) {
         this.showLoader = true;
-        // for (let i = 0; i < this.classList.length; i++) {
-        //   if (this.report.classId === this.classList[i]._id) {
-        //     Number(this.studentReort.className) = this.classList[i].classNum;
-        //   }
-        // }
-        // for (let i = 0; i < this.addSection.length; i++) {
-        //   if (this.report.sectionId === this.addSection[i]._id) {
-        //     this.studentReort.sectionName = this.addSection[i].name;
-        //   }
-        // }
         http()
           .get("/getStudentReport", {
             params: {
@@ -470,8 +464,8 @@ export default {
   },
   mounted() {
     this.token = this.$store.state.token;
-    const getindustryList = countryList();
-    this.countryList = getindustryList;
+    const getCountryList = countryList();
+    this.countryList = getCountryList;
     // console.log("getindustryList", this.countryList);
     // this.getExamList();
     this.getClass();
diff --git a/src/pages/Section/section.vue b/src/pages/Section/section.vue
index 5956acd..552b5cc 100644
--- a/src/pages/Section/section.vue
+++ b/src/pages/Section/section.vue
@@ -119,10 +119,10 @@
                     <br />
                     <v-layout>
                       <v-flex xs7 sm6>
-                        <h5 class="right my-1  hidden-xs-only hidden-sm-only">
+                        <h5 class="right my-1 hidden-xs-only hidden-sm-only">
                           <b>Class Name:</b>
                         </h5>
-                        <h5 class="right my-1  hidden-lg-only hidden-md-only hidden-xl-only">
+                        <h5 class="right my-1 hidden-lg-only hidden-md-only hidden-xl-only">
                           <b>Class:</b>
                         </h5>
                       </v-flex>
@@ -192,24 +192,36 @@
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:20px; "
-                  class="mr5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index 1a0b147..46ab0a2 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -971,24 +971,36 @@
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -1663,10 +1675,8 @@
                                 </v-layout>
                               </v-flex>
                             </v-layout>
-                            <!-- </v-container> -->
                           </v-form>
                         </v-flex>
-                        <!-- </v-container> -->
                       </v-stepper-content>
                     </v-stepper-items>
                   </v-stepper>
@@ -1685,8 +1695,8 @@
 
 <script>
 import http from "@/Services/http.js";
-import Util from "@/util";
 import moment from "moment";
+import countryList from "@/script/country.js";
 
 export default {
   data: () => ({
@@ -1713,7 +1723,6 @@ export default {
     addclass: [],
     addSection: [],
     gender: ["Male", "Female"],
-    AddUsercredentials: {},
     pagination: {
       rowsPerPage: 15
     },
@@ -1745,214 +1754,7 @@ export default {
         /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
         "E-mail must be valid"
     ],
-    countries: [
-      "Afghanistan",
-      "Albania",
-      "Algeria",
-      "Andorra",
-      "Angola",
-      "Anguilla",
-      "Antigua &amp; Barbuda",
-      "Argentina",
-      "Armenia",
-      "Aruba",
-      "Australia",
-      "Austria",
-      "Azerbaijan",
-      "Bahamas",
-      "Bahrain",
-      "Bangladesh",
-      "Barbados",
-      "Belarus",
-      "Belgium",
-      "Belize",
-      "Benin",
-      "Bermuda",
-      "Bhutan",
-      "Bolivia",
-      "Bosnia &amp; Herzegovina",
-      "Botswana",
-      "Brazil",
-      "British Virgin Islands",
-      "Brunei",
-      "Bulgaria",
-      "Burkina Faso",
-      "Burundi",
-      "Cambodia",
-      "Cameroon",
-      "Cape Verde",
-      "Cayman Islands",
-      "Chad",
-      "Chile",
-      "China",
-      "Colombia",
-      "Congo",
-      "Cook Islands",
-      "Costa Rica",
-      "Cote D Ivoire",
-      "Croatia",
-      "Cruise Ship",
-      "Cuba",
-      "Cyprus",
-      "Czech Republic",
-      "Denmark",
-      "Djibouti",
-      "Dominica",
-      "Dominican Republic",
-      "Ecuador",
-      "Egypt",
-      "El Salvador",
-      "Equatorial Guinea",
-      "Estonia",
-      "Ethiopia",
-      "Falkland Islands",
-      "Faroe Islands",
-      "Fiji",
-      "Finland",
-      "France",
-      "French Polynesia",
-      "French West Indies",
-      "Gabon",
-      "Gambia",
-      "Georgia",
-      "Germany",
-      "Ghana",
-      "Gibraltar",
-      "Greece",
-      "Greenland",
-      "Grenada",
-      "Guam",
-      "Guatemala",
-      "Guernsey",
-      "Guinea",
-      "Guinea Bissau",
-      "Guyana",
-      "Haiti",
-      "Honduras",
-      "Hong Kong",
-      "Hungary",
-      "Iceland",
-      "India",
-      "Indonesia",
-      "Iran",
-      "Iraq",
-      "Ireland",
-      "Isle of Man",
-      "Israel",
-      "Italy",
-      "Jamaica",
-      "Japan",
-      "Jersey",
-      "Jordan",
-      "Kazakhstan",
-      "Kenya",
-      "Kuwait",
-      "Kyrgyz Republic",
-      "Laos",
-      "Latvia",
-      "Lebanon",
-      "Lesotho",
-      "Liberia",
-      "Libya",
-      "Liechtenstein",
-      "Lithuania",
-      "Luxembourg",
-      "Macau",
-      "Macedonia",
-      "Madagascar",
-      "Malawi",
-      "Malaysia",
-      "Maldives",
-      "Mali",
-      "Malta",
-      "Mauritania",
-      "Mauritius",
-      "Mexico",
-      "Moldova",
-      "Monaco",
-      "Mongolia",
-      "Montenegro",
-      "Montserrat",
-      "Morocco",
-      "Mozambique",
-      "Namibia",
-      "Nepal",
-      "Netherlands",
-      "Netherlands Antilles",
-      "New Caledonia",
-      "New Zealand",
-      "Nicaragua",
-      "Niger",
-      "Nigeria",
-      "Norway",
-      "Oman",
-      "Pakistan",
-      "Palestine",
-      "Panama",
-      "Papua New Guinea",
-      "Paraguay",
-      "Peru",
-      "Philippines",
-      "Poland",
-      "Portugal",
-      "Puerto Rico",
-      "Qatar",
-      "Reunion",
-      "Romania",
-      "Russia",
-      "Rwanda",
-      "Saint Pierre &amp; Miquelon",
-      "Samoa",
-      "San Marino",
-      "Satellite",
-      "Saudi Arabia",
-      "Senegal",
-      "Serbia",
-      "Seychelles",
-      "Sierra Leone",
-      "Singapore",
-      "Slovakia",
-      "Slovenia",
-      "South Africa",
-      "South Korea",
-      "Spain",
-      "Sri Lanka",
-      "St Kitts &amp; Nevis",
-      "St Lucia",
-      "St Vincent",
-      "St. Lucia",
-      "Sudan",
-      "Suriname",
-      "Swaziland",
-      "Sweden",
-      "Switzerland",
-      "Syria",
-      "Taiwan",
-      "Tajikistan",
-      "Tanzania",
-      "Thailand",
-      "Timor L'Este",
-      "Togo",
-      "Tonga",
-      "Trinidad &amp; Tobago",
-      "Tunisia",
-      "Turkey",
-      "Turkmenistan",
-      "Turks &amp; Caicos",
-      "Uganda",
-      "Ukraine",
-      "United Arab Emirates",
-      "United Kingdom",
-      "United States",
-      "Uruguay",
-      "Uzbekistan",
-      "Venezuela",
-      "Vietnam",
-      "Virgin Islands (US)",
-      "Yemen",
-      "Zambia",
-      "Zimbabwe"
-    ],
+    countries: [],
     headers: [
       {
         text: "Roll No.",
@@ -2045,11 +1847,6 @@ export default {
       rollNo: "",
       establishmentYear: new Date().getFullYear()
     },
-    defaultItem: {
-      role: "STUDENT",
-      name: "",
-      email: ""
-    }
   }),
   watch: {
     menu(val) {
@@ -2394,7 +2191,8 @@ export default {
     }
   },
   mounted() {
-    // this.getStudentList();
+    const getCountryList = countryList();
+    this.countries = getCountryList;
     var token = this.$store.state.token;
     http()
       .get("/getClassesList", {
diff --git a/src/pages/Subjects/subjects.vue b/src/pages/Subjects/subjects.vue
index f3bd58d..6d9a435 100644
--- a/src/pages/Subjects/subjects.vue
+++ b/src/pages/Subjects/subjects.vue
@@ -38,46 +38,46 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card flat>
-                <v-container fluid>
-                  <v-layout>
-                    <v-flex xs4 class="pt-4 subheading">
-                      <label class="right">Class:</label>
-                    </v-flex>
-                    <v-flex xs6 class="ml-3">
-                      <v-select
-                        :items="classList"
-                        label="Select Class"
-                        v-model="addSubject.selectName"
-                        item-text="classNum"
-                        item-value="_id"
-                        name="Select Class"
-                        :rules="nameRules"
-                        required
-                      ></v-select>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout>
-                    <v-flex xs4 class="pt-4 subheading">
-                      <label class="right">Subject:</label>
-                    </v-flex>
-                    <v-flex xs6 class="ml-3">
-                      <v-text-field
-                        placeholder="fill your Subject"
-                        v-model="editedItem.subjectName"
-                        type="text"
-                        name="email"
-                        required
-                      ></v-text-field>
-                    </v-flex>
-                  </v-layout>
-                  <v-flex xs12 sm9 offset-sm2>
-                    <v-card-actions>
-                      <v-btn round dark @click.native="close">Cancel</v-btn>
-                      <v-spacer></v-spacer>
-                      <v-btn round dark @click="save">Save</v-btn>
-                    </v-card-actions>
+              <v-container fluid>
+                <v-layout>
+                  <v-flex xs4 class="pt-4 subheading">
+                    <label class="right">Class:</label>
                   </v-flex>
-                </v-container>
+                  <v-flex xs6 class="ml-3">
+                    <v-select
+                      :items="classList"
+                      label="Select Class"
+                      v-model="addSubject.selectName"
+                      item-text="classNum"
+                      item-value="_id"
+                      name="Select Class"
+                      :rules="nameRules"
+                      required
+                    ></v-select>
+                  </v-flex>
+                </v-layout>
+                <v-layout>
+                  <v-flex xs4 class="pt-4 subheading">
+                    <label class="right">Subject:</label>
+                  </v-flex>
+                  <v-flex xs6 class="ml-3">
+                    <v-text-field
+                      placeholder="fill your Subject"
+                      v-model="editedItem.subjectName"
+                      type="text"
+                      name="email"
+                      required
+                    ></v-text-field>
+                  </v-flex>
+                </v-layout>
+                <v-flex xs12 sm9 offset-sm2>
+                  <v-card-actions>
+                    <v-btn round dark @click.native="close">Cancel</v-btn>
+                    <v-spacer></v-spacer>
+                    <v-btn round dark @click="save">Save</v-btn>
+                  </v-card-actions>
+                </v-flex>
+              </v-container>
             </v-card>
           </v-flex>
         </v-dialog>
@@ -131,7 +131,7 @@
               <v-flex xs4 sm1>
                 <label class="right mt-4">Select Class:</label>
               </v-flex>
-              <v-flex xs8 sm3 >
+              <v-flex xs8 sm3>
                 <v-select
                   :items="classList"
                   label="Select Class"
@@ -155,29 +155,41 @@
           :search="search"
         >
           <template slot="items" slot-scope="props">
-            <td id="td" class="text-xs-center">{{ props.index  + 1}}</td>
+            <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
             <td id="td" class="text-xs-center">{{ props.item.subjectName}}</td>
 
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue
index b135023..29faf18 100644
--- a/src/pages/Teachers/teachers.vue
+++ b/src/pages/Teachers/teachers.vue
@@ -516,24 +516,36 @@
             <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
@@ -877,7 +889,7 @@
                   <v-layout class="mx-2">
                     <v-flex xs12 sm11 offset-sm1>
                       <v-layout>
-                        <v-flex xs6 class="">
+                        <v-flex xs6 class>
                           <v-btn @click="clear" round dark>clear</v-btn>
                         </v-flex>
                         <v-flex xs6>
@@ -901,8 +913,8 @@
 
 <script>
 import http from "@/Services/http.js";
-import Util from "@/util";
 import moment from "moment";
+import countryList from "@/script/country.js";
 
 export default {
   data: () => ({
@@ -950,214 +962,7 @@ export default {
         /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
         "E-mail must be valid"
     ],
-    countries: [
-      "Afghanistan",
-      "Albania",
-      "Algeria",
-      "Andorra",
-      "Angola",
-      "Anguilla",
-      "Antigua &amp; Barbuda",
-      "Argentina",
-      "Armenia",
-      "Aruba",
-      "Australia",
-      "Austria",
-      "Azerbaijan",
-      "Bahamas",
-      "Bahrain",
-      "Bangladesh",
-      "Barbados",
-      "Belarus",
-      "Belgium",
-      "Belize",
-      "Benin",
-      "Bermuda",
-      "Bhutan",
-      "Bolivia",
-      "Bosnia &amp; Herzegovina",
-      "Botswana",
-      "Brazil",
-      "British Virgin Islands",
-      "Brunei",
-      "Bulgaria",
-      "Burkina Faso",
-      "Burundi",
-      "Cambodia",
-      "Cameroon",
-      "Cape Verde",
-      "Cayman Islands",
-      "Chad",
-      "Chile",
-      "China",
-      "Colombia",
-      "Congo",
-      "Cook Islands",
-      "Costa Rica",
-      "Cote D Ivoire",
-      "Croatia",
-      "Cruise Ship",
-      "Cuba",
-      "Cyprus",
-      "Czech Republic",
-      "Denmark",
-      "Djibouti",
-      "Dominica",
-      "Dominican Republic",
-      "Ecuador",
-      "Egypt",
-      "El Salvador",
-      "Equatorial Guinea",
-      "Estonia",
-      "Ethiopia",
-      "Falkland Islands",
-      "Faroe Islands",
-      "Fiji",
-      "Finland",
-      "France",
-      "French Polynesia",
-      "French West Indies",
-      "Gabon",
-      "Gambia",
-      "Georgia",
-      "Germany",
-      "Ghana",
-      "Gibraltar",
-      "Greece",
-      "Greenland",
-      "Grenada",
-      "Guam",
-      "Guatemala",
-      "Guernsey",
-      "Guinea",
-      "Guinea Bissau",
-      "Guyana",
-      "Haiti",
-      "Honduras",
-      "Hong Kong",
-      "Hungary",
-      "Iceland",
-      "India",
-      "Indonesia",
-      "Iran",
-      "Iraq",
-      "Ireland",
-      "Isle of Man",
-      "Israel",
-      "Italy",
-      "Jamaica",
-      "Japan",
-      "Jersey",
-      "Jordan",
-      "Kazakhstan",
-      "Kenya",
-      "Kuwait",
-      "Kyrgyz Republic",
-      "Laos",
-      "Latvia",
-      "Lebanon",
-      "Lesotho",
-      "Liberia",
-      "Libya",
-      "Liechtenstein",
-      "Lithuania",
-      "Luxembourg",
-      "Macau",
-      "Macedonia",
-      "Madagascar",
-      "Malawi",
-      "Malaysia",
-      "Maldives",
-      "Mali",
-      "Malta",
-      "Mauritania",
-      "Mauritius",
-      "Mexico",
-      "Moldova",
-      "Monaco",
-      "Mongolia",
-      "Montenegro",
-      "Montserrat",
-      "Morocco",
-      "Mozambique",
-      "Namibia",
-      "Nepal",
-      "Netherlands",
-      "Netherlands Antilles",
-      "New Caledonia",
-      "New Zealand",
-      "Nicaragua",
-      "Niger",
-      "Nigeria",
-      "Norway",
-      "Oman",
-      "Pakistan",
-      "Palestine",
-      "Panama",
-      "Papua New Guinea",
-      "Paraguay",
-      "Peru",
-      "Philippines",
-      "Poland",
-      "Portugal",
-      "Puerto Rico",
-      "Qatar",
-      "Reunion",
-      "Romania",
-      "Russia",
-      "Rwanda",
-      "Saint Pierre &amp; Miquelon",
-      "Samoa",
-      "San Marino",
-      "Satellite",
-      "Saudi Arabia",
-      "Senegal",
-      "Serbia",
-      "Seychelles",
-      "Sierra Leone",
-      "Singapore",
-      "Slovakia",
-      "Slovenia",
-      "South Africa",
-      "South Korea",
-      "Spain",
-      "Sri Lanka",
-      "St Kitts &amp; Nevis",
-      "St Lucia",
-      "St Vincent",
-      "St. Lucia",
-      "Sudan",
-      "Suriname",
-      "Swaziland",
-      "Sweden",
-      "Switzerland",
-      "Syria",
-      "Taiwan",
-      "Tajikistan",
-      "Tanzania",
-      "Thailand",
-      "Timor L'Este",
-      "Togo",
-      "Tonga",
-      "Trinidad &amp; Tobago",
-      "Tunisia",
-      "Turkey",
-      "Turkmenistan",
-      "Turks &amp; Caicos",
-      "Uganda",
-      "Ukraine",
-      "United Arab Emirates",
-      "United Kingdom",
-      "United States",
-      "Uruguay",
-      "Uzbekistan",
-      "Venezuela",
-      "Vietnam",
-      "Virgin Islands (US)",
-      "Yemen",
-      "Zambia",
-      "Zimbabwe"
-    ],
+    countries: [],
     headers: [
       {
         text: "No",
@@ -1444,6 +1249,8 @@ export default {
     }
   },
   mounted() {
+    const getCountryList = countryList();
+    this.countries = getCountryList;
     this.getTeacherList();
   },
   created() {
diff --git a/src/pages/TimeTable/timeTable.vue b/src/pages/TimeTable/timeTable.vue
index 73d5932..f3f9a49 100644
--- a/src/pages/TimeTable/timeTable.vue
+++ b/src/pages/TimeTable/timeTable.vue
@@ -492,23 +492,35 @@
                 <td class="text-xs-center">{{ props.item.sectionData.name }}</td>
                 <td class="text-xs-center">
                   <span>
-                    <img
-                      style="cursor:pointer; width:20px; height:18px; "
-                      class="mr-3 mt-2"
-                      @click="editItem(props.item)"
-                      src="/static/icon/edit1.png"
-                    />
-                    <img
-                      style="cursor:pointer;width:20px; height:20px; "
-                      class="mr-3"
-                      @click="deleteItem(props.item)"
-                      src="/static/icon/delete1.png"
-                    />
-                    <img
-                      style="cursor:pointer; width:20px; height:20px; "
-                      src="/static/icon/add1.png"
-                      @click="addSchedule(props.item._id)"
-                    />
+                    <v-tooltip top>
+                      <img
+                        slot="activator"
+                        style="cursor:pointer; width:20px; height:18px; "
+                        class="mr5"
+                        @click="editItem(props.item)"
+                        src="/static/icon/edit1.png"
+                      />
+                      <span>Edit</span>
+                    </v-tooltip>
+                    <v-tooltip top>
+                      <img
+                        slot="activator"
+                        style="cursor:pointer; width:20px; height:20px; "
+                        class="mr5"
+                        @click="deleteItem(props.item)"
+                        src="/static/icon/delete1.png"
+                      />
+                      <span>Delete</span>
+                    </v-tooltip>
+                    <v-tooltip top>
+                      <img
+                        slot="activator"
+                        style="cursor:pointer; width:20px; height:20px; "
+                        src="/static/icon/add1.png"
+                        @click="addSchedule(props.item._id)"
+                      />
+                      <span>Add</span>
+                    </v-tooltip>
                     <!-- <v-icon color="black" >add_circle_outline</v-icon> -->
                   </span>
                 </td>
@@ -552,10 +564,14 @@
                       {{list.timeOut}}
                     </td>
                     <td>
-                      <v-icon
-                        color="black"
-                        @click="addLecture(props.item._id, timeTableList._id)"
-                      >add_circle_outline</v-icon>
+                      <v-tooltip top>
+                        <v-icon
+                          slot="activator"
+                          color="black"
+                          @click="addLecture(props.item._id, timeTableList._id)"
+                        >add_circle_outline</v-icon>
+                        <span>Add</span>
+                      </v-tooltip>
                     </td>
                   </tr>
                 </template>
@@ -747,7 +763,7 @@
                   <v-layout>
                     <v-flex xs12 sm12>
                       <v-layout>
-                        <v-flex xs4 md4  class="ml-4">
+                        <v-flex xs4 md4 class="ml-4">
                           <v-btn @click="clear" round class="right" dark>clear</v-btn>
                         </v-flex>
                         <v-flex xs8 sm5 md4>
diff --git a/src/pages/User/user.vue b/src/pages/User/user.vue
index c00408c..3710448 100644
--- a/src/pages/User/user.vue
+++ b/src/pages/User/user.vue
@@ -435,24 +435,36 @@
             <td id="td" class="text-xs-center">{{ props.item.phone }}</td>
             <td class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/pages/socialMedia/socialMedia.vue b/src/pages/socialMedia/socialMedia.vue
index 148fbcf..7b948f1 100644
--- a/src/pages/socialMedia/socialMedia.vue
+++ b/src/pages/socialMedia/socialMedia.vue
@@ -149,24 +149,36 @@
 
             <td id="tabeleData" class="text-xs-center">
               <span>
-                <img
-                  style="cursor:pointer; width:25px; height:18px; "
-                  class="mr-5"
-                  @click="profile(props.item)"
-                  src="/static/icon/eye1.png"
-                />
-                <img
-                  style="cursor:pointer; width:20px; height:18px; "
-                  class="mr-5"
-                  @click="editItem(props.item)"
-                  src="/static/icon/edit1.png"
-                />
-                <img
-                  style="cursor:pointer;width:20px; height:20px; "
-                  class="mr-5"
-                  @click="deleteItem(props.item)"
-                  src="/static/icon/delete1.png"
-                />
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:25px; height:18px; "
+                    class="mr5"
+                    @click="profile(props.item)"
+                    src="/static/icon/eye1.png"
+                  />
+                  <span>View</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:18px; "
+                    class="mr5"
+                    @click="editItem(props.item)"
+                    src="/static/icon/edit1.png"
+                  />
+                  <span>Edit</span>
+                </v-tooltip>
+                <v-tooltip top>
+                  <img
+                    slot="activator"
+                    style="cursor:pointer; width:20px; height:20px; "
+                    class="mr5"
+                    @click="deleteItem(props.item)"
+                    src="/static/icon/delete1.png"
+                  />
+                  <span>Delete</span>
+                </v-tooltip>
               </span>
             </td>
           </template>
diff --git a/src/router/paths.js b/src/router/paths.js
index 7ec1ecd..9275d00 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -598,15 +598,15 @@ export default [{
             )
     },
     {
-        path: '/markSheetReport',
+        path: '/progressCardReport',
         meta: {},
-        name: 'markSheetReport',
+        name: 'progressCardReport',
         props: (route) => ({ type: route.query.type }),
         component: () =>
             import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
-                `@/pages/Report/markSheetReport.vue`
+                `@/pages/Report/progressCardReport.vue`
             )
     }
 ];
\ No newline at end of file
-- 
2.0.0