diff --git a/package-lock.json b/package-lock.json
index 92057c1..3877a78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15232,6 +15232,11 @@
         }
       }
     },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -15652,9 +15657,9 @@
       "dev": true
     },
     "vee-validate": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.0.9.tgz",
-      "integrity": "sha512-0qA3hrpF2jIBoEReWF8YkvG1ukJVS56+oyPTxOtb2OfB5d7iUuQiyboOOpXOvOViREHNXTsIcQ5XIQOMBff/wg=="
+      "version": "2.2.15",
+      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.2.15.tgz",
+      "integrity": "sha512-4TOsI8XwVkKVLkg8Nhmy+jyoJrR6XcTRDyxBarzcCvYzU61zamipS1WsB6FlDze8eJQpgglS4NXAS6o4NDPs1g=="
     },
     "vendors": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 2bf6ada..ec00219 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
         "nprogress": "^0.2.0",
         "quill": "^1.3.6",
         "save": "^2.4.0",
-        "vee-validate": "^2.0.9",
+        "underscore": "^1.9.1",
+        "vee-validate": "^2.2.15",
         "vue": "^2.5.16",
         "vue-full-calendar": "^2.7.0",
         "vue-html2canvas": "0.0.4",
diff --git a/src/Services/http.js b/src/Services/http.js
index 9c3448e..bcd38b0 100644
--- a/src/Services/http.js
+++ b/src/Services/http.js
@@ -3,7 +3,7 @@ import store from '@/store/store'
 
 export default () => {
     return axios.create({
-        // baseURL: 'http://192.168.4.220:3002/v1',
+        // baseURL: 'http://192.168.2.221:3002/v1',
         baseURL: 'http://13.234.251.173:8001/v1',
         headers: {
             Authorization: `Bearer ${store.state.token}`
diff --git a/src/api/menu.js b/src/api/menu.js
index 0b6daf4..c0fd962 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -157,11 +157,6 @@ const Menu = [
         icon: '/static/schoolIcons/Events.png',
     },
     {
-        title: 'Holiday',
-        path: '/Holiday',
-        icon: '/static/schoolIcons/Holidays.png',
-    },
-    {
         title: 'Account',
         group: 'Account',
         component: 'Account',
@@ -173,6 +168,16 @@ const Menu = [
             { name: 'Expense', title: 'Expense', component: 'Expense', action: '', },
             { name: 'Income', title: 'Income', component: 'Income', action: '', },
         ]
+    },
+    {
+        title: 'Holiday',
+        path: '/Holiday',
+        icon: '/static/schoolIcons/Holidays.png',
+    },
+    {
+        title: 'General Setting',
+        path: '/generalSetting',
+        icon: '/static/schoolIcons/settings.png',
     }
 ];
 
diff --git a/src/components/pageHeader/AppToolbar.vue b/src/components/pageHeader/AppToolbar.vue
index ae93ac4..9fbb956 100644
--- a/src/components/pageHeader/AppToolbar.vue
+++ b/src/components/pageHeader/AppToolbar.vue
@@ -9,7 +9,7 @@
       xs7
       sm3
       class="userSearch"
-      v-if="$route.name != 'Dashboard' && $route.name != 'changepassword'"
+      v-if="$route.name != 'Dashboard' && $route.name != 'changepassword' && $route.name != 'generalSetting'  && $route.name != 'resetPassword'"
     >
       <v-text-field
         flat
@@ -25,9 +25,9 @@
     <v-spacer></v-spacer>
     <v-menu offset-y origin="center center" :nudge-bottom="10" transition="scale-transition">
       <v-btn icon large flat slot="activator">
-        <v-avatar >
+        <v-avatar>
           <!-- <img src="/static/icon/user.png" /> -->
-          <v-icon dark  size="40px">account_circle</v-icon>
+          <v-icon dark size="40px">account_circle</v-icon>
         </v-avatar>
       </v-btn>
       <v-list class="pa-0">
@@ -63,7 +63,7 @@ export default {
     items: [
       {
         icon: "account_circle",
-        href: "/changepassword",
+        href: "/resetPassword",
         title: "Change Password",
         click: e => {
           console.log(e);
@@ -111,7 +111,7 @@ export default {
   font-size: 30px;
 }
 .fixcolors {
-    background: #444B54 !important;
+  background: #444b54 !important;
 }
 @media screen and (min-width: 1270px) {
   .hide {
diff --git a/src/main.js b/src/main.js
index 08d53ca..2eb30de 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,6 +27,15 @@ Vue.use(FullCalendar);
 // Vue.use(VueAxios, axios);
 Vue.filter('truncate', Truncate);
 Vue.use(VeeValidate, { fieldsBagName: 'formFields' });
+VeeValidate.Validator.localize({
+    en: {
+        custom: {
+            password2: {
+                is: 'The passwords do not match'
+            }
+        }
+    }
+})
 Vue.use(Vuetify, {
     // theme: {
     //     primary: "f1f1f1", // #E53935
diff --git a/src/pages/Administrator/academicYear.vue b/src/pages/Administrator/academicYear.vue
index 862f4d6..3453828 100644
--- a/src/pages/Administrator/academicYear.vue
+++ b/src/pages/Administrator/academicYear.vue
@@ -44,7 +44,7 @@
                     <v-flex xs4 class="pt-4 subheading">
                       <label class="right">Year:</label>
                     </v-flex>
-                    <v-flex xs8 sm5 class="ml-3">
+                    <v-flex xs8 sm6 class="ml-3">
                       <v-text-field
                         v-model="editedItem.year"
                         placeholder="fill your Title"
@@ -59,7 +59,7 @@
                     <v-flex xs4 class="pt-4 subheading">
                       <label class="right">Year Title:</label>
                     </v-flex>
-                    <v-flex xs8 sm5 class="ml-3">
+                    <v-flex xs8 sm6 class="ml-3">
                       <v-text-field
                         v-model="editedItem.yearTitle"
                         placeholder="fill your Year Title"
@@ -74,7 +74,7 @@
                     <v-flex xs4 class="pt-4 subheading">
                       <label class="right">Date:</label>
                     </v-flex>
-                    <v-flex xs8 sm5 class="ml-3">
+                    <v-flex xs8 sm6 class="ml-3">
                       <v-menu
                         ref="menu"
                         :close-on-content-click="false"
@@ -104,9 +104,9 @@
                 <v-flex xs12 sm12>
                   <v-layout>
                     <v-flex xs4 class="pt-4 subheading">
-                      <label class="right">Date:</label>
+                      <label class="right">Starting Date:</label>
                     </v-flex>
-                    <v-flex xs8 sm5 class="ml-3">
+                    <v-flex xs8 sm6 class="ml-3">
                       <v-menu
                         ref="menuEndDate"
                         :close-on-content-click="false"
@@ -149,8 +149,8 @@
 
         <!-- ****** PROFILE ACADEMIC YEAR DEATILS ******  -->
 
-        <v-dialog v-model="dialog1" max-width="700px">
-          <v-toolbar color="white">
+        <v-dialog v-model="dialog1" max-width="500px">
+          <v-toolbar  color="v-toolbar">
             <v-spacer></v-spacer>
             <v-toolbar-title>
               <h3>Academic Year</h3>
@@ -176,21 +176,31 @@
                     <v-layout>
                       <v-flex xs5 sm6>
                         <h5 class="right my-1">
-                          <b>Date:</b>
+                          <b>Year Title:</b>
                         </h5>
                       </v-flex>
                       <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ dates(editedItem.dateOfEvent) }}</h5>
+                        <h5 class="my-1">{{ editedItem.yearTitle }}</h5>
                       </v-flex>
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
                         <h5 class="right my-1">
-                          <b>Description:</b>
+                          <b>Starting Date:</b>
                         </h5>
                       </v-flex>
                       <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.yearTitle }}</h5>
+                        <h5 class="my-1">{{dates(editedItem.startingDate)}}</h5>
+                      </v-flex>
+                    </v-layout>
+                    <v-layout>
+                      <v-flex xs5 sm6>
+                        <h5 class="right my-1">
+                          <b>Ending Date:</b>
+                        </h5>
+                      </v-flex>
+                      <v-flex sm6 xs8>
+                        <h5 class="my-1">{{dates(editedItem.endingDate)}}</h5>
                       </v-flex>
                     </v-layout>
                   </v-flex>
diff --git a/src/pages/Administrator/resetPassword.vue b/src/pages/Administrator/resetPassword.vue
index 166fb50..d000313 100644
--- a/src/pages/Administrator/resetPassword.vue
+++ b/src/pages/Administrator/resetPassword.vue
@@ -11,17 +11,39 @@
           <v-card class="elevation-1 pa-3" id="form">
             <v-card-text>
               <v-flex xs12 sm8 md8 lg8 offset-sm2>
-                <v-form class="mt-3">
-                  <v-select :rules="[rules.required]" label="Select Users" :tems="users"></v-select>
-                  <v-select :rules="[rules.required]" label="Select Users Name" :tems="usersName"></v-select>
+                <v-form class="mt-3" ref="form" v-model="valid" lazy-validation>
+                  <v-select
+                    :rules="userRule"
+                    label="Select User"
+                    :items="getRoles"
+                    item-text="name"
+                    item-value="name"
+                    v-model="resetPassword.name"
+                    @change="getUsers(resetPassword.name)"
+                  ></v-select>
+                  <v-select
+                    :rules="userNameRule"
+                    label="Select User Name"
+                    :items="getUsersName"
+                    item-text="email"
+                    item-value="email"
+                    v-model="resetPassword.email"
+                  ></v-select>
                   <v-text-field
-                    :rules="[rules.required]"
-                    v-model="user.oldPassword"
+                    :rules="newPasswordRule"
+                    v-model="resetPassword.newPassword"
+                    :error-messages="errors.collect('resetPassword.newPassword')"
+                    v-validate="'required'"
+                    data-vv-name="resetPassword.newPassword"
                     label="New Password"
                   ></v-text-field>
                   <v-text-field
-                    v-model="user.newPassword"
-                    :rules="[rules.required]"
+                    v-model="resetPassword.confirmPassword"
+                    :rules="rePasswordRule"
+                    :error-messages="errors.collect('password2')"
+                    v-validate="{ required: true, is: resetPassword.newPassword }"
+                    data-vv-name="password2"
+                    data-vv-as="password"
                     label="Re-Password"
                   ></v-text-field>
                 </v-form>
@@ -66,52 +88,99 @@ export default {
       mode: "",
       timeout: 4000,
       text: "",
-      user: {},
-      users: [],
-      usersName: [],
-      e1: true,
-      e2: true,
-      e3: true,
+      color: "",
+      password2: "",
+      resetPassword: {},
+      getUsersName: [],
+      getRoles: [],
+      valid: true,
       loading: false,
-      valid: false,
       text: "Password Changed",
-      currentPassword: "",
       newPassword: "",
-      confirmPassword: "",
-      rules: {
-        required: value => !!value || "This password field is Required."
-        // min: v => (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/).test(v) && v.length >= 8 || 'Min 8 characters upper case lower case symbol required'
-      }
+      userRule: [v => !!v || "User is required"],
+      userNameRule: [v => !!v || "User Name is required"],
+      newPasswordRule: [v => !!v || "New Password is required"],
+      rePasswordRule: [v => !!v || "Re-Password is required"]
     };
   },
+  mounted() {
+    this.token = this.$store.state.token;
+    this.getRole();
+  },
   methods: {
     reset() {
-      var token = this.$store.state.token;
+      if (this.$refs.form.validate()) {
+        this.loading = true;
+        this.resetPassword.roleName = this.resetPassword.name;
+        http()
+          .put("/resetPasswordOfUsers", this.resetPassword, {
+            headers: { Authorization: "Bearer " + this.token }
+          })
+          .then(response => {
+            this.loading = false;
+            this.snackbar = true;
+            this.text = "Successfully Restet password !!";
+            this.color = "green";
+            this.clear();
+          })
+          .catch(error => {
+            // console.log("err====>",err);
+            this.snackbar = true;
+            this.text = "User Not Found or Incorrect currentPassword";
+            this.color = "error";
+            this.loading = false;
+          });
+      }
+    },
+    getRole() {
+      this.showLoader = true;
       http()
-        .put("/schoolChangePassword", {
-          headers: { Authorization: "Bearer " + token }
+        .get("/getRolesList", {
+          headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
-          this.loading = true;
-          if ((this.snackbar = true)) {
-            this.text = "Successfully changed password !!";
-            console.log("snackbar", response.data.message);
+          for (let i = 0; i < response.data.data.length; i++) {
+            if (
+              response.data.data[i].name != "SUPERADMIN" &&
+              response.data.data[i].name != "ADMIN"
+            ) {
+              this.getRoles.push(response.data.data[i]);
+              this.showLoader = false;
+            }
           }
-          setTimeout(() => {
-            this.$router.push("/dashboard");
-          }, 2000);
         })
-        .catch(err => {
-          // console.log("err====>",err);
-          this.text = "User Not Found or Incorrect currentPassword";
-          this.snackbar = true;
-          this.loading = false;
+        .catch(error => {
+          this.showLoader = false;
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+          }
+        });
+    },
+    clear() {
+      this.$refs.form.reset();
+    },
+    getUsers(roles) {
+      this.showLoader = true;
+      http()
+        .get("/getUserWithRole", {
+          params: {
+            name: roles
+          },
+          headers: { Authorization: "Bearer " + this.token }
+        })
+        .then(response => {
+          this.getUsersName = response.data.data;
+        })
+        .catch(error => {
+          this.showLoader = false;
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+          }
         });
-    }
-  },
-  computed: {
-    color() {
-      return this.loading ? "success" : "error";
     }
   }
 };
diff --git a/src/pages/Administrator/role.vue b/src/pages/Administrator/role.vue
index 70985df..70ee1b0 100644
--- a/src/pages/Administrator/role.vue
+++ b/src/pages/Administrator/role.vue
@@ -69,7 +69,7 @@
 
         <v-data-table
           :headers="headers"
-          :items="getRole"
+          :items="getRoles"
           :pagination.sync="pagination"
           :search="search"
         >
@@ -198,7 +198,7 @@ export default {
       { text: "Role", value: "role", sortable: false, align: "center" },
       { text: "Action", value: "", sortable: false, align: "center" }
     ],
-    getRole: [],
+    getRoles: [],
     editedIndex: -1,
     token: "",
     addrole: {},
@@ -212,7 +212,7 @@ export default {
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
-          this.getRole = response.data.data;
+          this.getRoles = response.data.data;
           this.showLoader = false;
         })
         .catch(error => {
@@ -225,7 +225,7 @@ export default {
         });
     },
     editItem(item) {
-      this.editedIndex = this.getRole.indexOf(item);
+      this.editedIndex = this.getRoles.indexOf(item);
       this.editedItem = Object.assign({}, item);
       this.dialog = true;
     },
@@ -284,7 +284,7 @@ export default {
           .then(response => {
             this.snackbar = true;
             this.text = response.data.message;
-            // this.getRole();
+            this.getRole();
             this.clear();
             this.loading = false;
           })
diff --git a/src/pages/Mark/mark.vue b/src/pages/Mark/mark.vue
index d6b31ae..0bd0530 100644
--- a/src/pages/Mark/mark.vue
+++ b/src/pages/Mark/mark.vue
@@ -20,220 +20,6 @@
       <!-- ****** Edit Mark ****** -->
 
       <v-tab-item>
-        <!-- <v-snackbar
-          :timeout="timeout"
-          :top="y === 'top'"
-          :right="x === 'right'"
-          :vertical="mode === 'vertical'"
-          v-model="snackbar"
-          color="success"
-        >{{ text }}</v-snackbar>
-        <v-dialog v-model="dialog" max-width="800px" scrollable>
-          <v-card flat>
-            <v-toolbar class="grey lighten-2" flat>
-              <v-spacer></v-spacer>
-              <v-toolbar-title>
-                <h3>Edit Mark</h3>
-              </v-toolbar-title>
-              <v-spacer></v-spacer>
-            </v-toolbar>
-            <v-card-text style="height:670px;">
-              <v-form ref="form">
-                <v-container fluid>
-                  <v-layout>
-                    <v-flex xs12 sm12>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Exam Name:</label>
-                        </v-flex>
-                        <v-flex xs5 class="ml-3">
-                          <v-select
-                            :rules="examNameRules"
-                            :items="examList"
-                            v-model="editedItem.examName"
-                            label="Select your Exam Name"
-                            item-text="examName"
-                            item-value="examName"
-                          ></v-select>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                    <v-flex xs12 sm12>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Class:</label>
-                        </v-flex>
-                        <v-flex xs5 class="ml-3">
-                          <v-select
-                            v-model="editedItem.classId"
-                            label="Select your Class"
-                            type="text"
-                            :items="classList"
-                            item-text="classNum"
-                            item-value="_id"
-                            @change="getSections(editedItem.classId)"
-                            required
-                          ></v-select>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                    <v-flex xs12 sm12>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Section:</label>
-                        </v-flex>
-                        <v-flex xs5 class="ml-3">
-                          <v-select
-                            :items="addSection"
-                            label="Select your section"
-                            v-model="editedItem.sectionId"
-                            item-text="name"
-                            item-value="_id"
-                            name="Select Section"
-                            :rules="sectionRules"
-                            required
-                          ></v-select>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                    <v-flex xs12 sm12>
-                      <v-layout>
-                        <v-flex xs4 class="pt-4 subheading">
-                          <label class="right">Subject Name:</label>
-                        </v-flex>
-                        <v-flex xs5 class="ml-3">
-                          <v-select
-                            :items="subjects"
-                            label="Select your Subject Name"
-                            v-model="editedItem.subjectName"
-                            item-text="subjectName"
-                            item-value="subjectName"
-                            name="Select Section"
-                            :rules="sectionRules"
-                            required
-                          ></v-select>
-                        </v-flex>
-                      </v-layout>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout>
-                    <v-flex xs12 sm8 offset-sm2>
-                      <v-card-actions>
-                        <v-btn round dark @click.native="close">Close</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-form>
-            </v-card-text>
-          </v-card>
-        </v-dialog>-->
-
-        <!-- ****** PROFILE VIEW Exam  ******  -->
-
-        <!-- <v-dialog v-model="dialog1" max-width="600px">
-          <v-card>
-            <v-toolbar color="grey lighten-2" flat>
-              <v-spacer></v-spacer>
-              <v-toolbar-title>
-                <h3>Mark</h3>
-              </v-toolbar-title>
-              <v-spacer></v-spacer>
-              <v-icon @click="close1">close</v-icon>
-            </v-toolbar>
-            <v-card-text>
-              <v-container grid-list-md>
-                <v-layout wrap>
-                  <v-flex>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Exam Name:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.examName }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Class:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.classId }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Section:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.sectionId }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Subject Name:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.subjectName }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Date:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ dates(editedItem.date) }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Time From:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.timeFrom }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Time To:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.timeTo }}</h5>
-                      </v-flex>
-                    </v-layout>
-                    <v-layout>
-                      <v-flex xs5 sm6>
-                        <h5 class="right my-1">
-                          <b>Room:</b>
-                        </h5>
-                      </v-flex>
-                      <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.room }}</h5>
-                      </v-flex>
-                    </v-layout>
-                  </v-flex>
-                </v-layout>
-              </v-container>
-            </v-card-text>
-          </v-card>
-        </v-dialog>-->
-
         <v-snackbar
           :timeout="timeout"
           :top="y === 'top'"
@@ -310,12 +96,6 @@
             <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 } }">
                   <v-tooltip top>
                     <img
@@ -325,14 +105,8 @@
                       src="/static/icon/edit1.png"
                     />
                     <span>Edit</span>
-                  </v-tooltip>  
+                  </v-tooltip>
                 </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>
@@ -504,12 +278,6 @@ export default {
   data: () => ({
     snackbar: false,
     date: null,
-    // editDate: false,
-    // menu1: false,
-    // menuB: false,
-    // menu2: false,
-    // menuEdit: false,
-    // timeToEdit: false,
     color: "",
     y: "top",
     x: "right",
@@ -517,7 +285,6 @@ export default {
     timeout: 10000,
     text: "",
     loading: false,
-    // date: null,
     search: "",
     showLoader: false,
     dialog: false,
@@ -535,12 +302,6 @@ export default {
     examRules: [v => !!v || "Exam is required"],
 
     headerOfMark: [
-      // {
-      //   align: "justify-center",
-      //   text: "#",
-      //   sortable: false,
-      //   value: "index"
-      // },
       {
         align: "justify-center",
         text: "No",
@@ -565,26 +326,6 @@ export default {
         sortable: false,
         align: "center"
       }
-      // {
-      //   text: "Distribution Type",
-      //   value: "distributionType",
-      //   sortable: false,
-      //   align: "center"
-      // },
-      // { text: "markValue", value: "markValue", sortable: false, align: "center" },
-      // {
-      //   text: "Roll No.",
-      //   align: "center",
-      //   sortable: false,
-      //   value: "rollNo"
-      // },
-      // { text: "Exam", value: "exam", sortable: false, align: "center" },
-      // {
-      //   text: "ASSIGNMENT",
-      //   value: "assignment",
-      //   sortable: false,
-      //   align: "center"
-      // }
     ],
     headers: [
       {
@@ -624,7 +365,6 @@ export default {
     subjects: [],
     addMark: {},
     getMark: {},
-    // editedItem: {},
     getScheduleData: {},
     markData: [],
     getStudentData: [],
@@ -632,75 +372,6 @@ export default {
     token: ""
   }),
   methods: {
-    // dates: function(date) {
-    //   return moment(date).format("MMMM DD, YYYY");
-    // },
-    // pickFile() {
-    //   this.$refs.image.click();
-    // },
-    // getStudentsList() {
-    //   this.showLoader = true;
-    //   http()
-    //     .get("/getStudentsList", {
-    //       params: { classId: this.getScheduleData.classId },
-    //       headers: { Authorization: "Bearer " + this.token }
-    //     })
-    //     .then(response => {
-    //       this.getStudentsList = response.data.data;
-    //       this.showLoader = false;
-    //     })
-    //     .catch(error => {
-    //       // console.log("err====>", err);
-    //       this.showLoader = false;
-    //       this.loadingSearch = 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);
-    //       }
-    //     });
-    // },
-    // editItem(item) {
-    //   console.log("item", item);
-    //   this.editedIndex = this.ScheduleData.indexOf(item);
-    //   this.editedItem = Object.assign({}, item);
-    //   this.editedItem.classId = this.editedItem.classId._id;
-    //   this.editedItem.sectionId = this.editedItem.sectionId._id;
-    //   this.editedItem.date =
-    //     this.editedItem.date != undefined
-    //       ? (this.editedItem.date = this.editedItem.date.substring(0, 10))
-    //       : (this.editedItem.date = "");
-    //   this.dialog = true;
-    // },
-    // profile(item) {
-    //   this.editedIndex = this.ScheduleData.indexOf(item);
-    //   this.editedItem = Object.assign({}, item);
-    //   this.editedItem.classId = this.editedItem.classId.classNum;
-    //   this.editedItem.sectionId = this.editedItem.sectionId.name;
-    //   this.dialog1 = true;
-    // },
-    // deleteSchedule(item) {
-    //   let deleteSchedule = {
-    //     scheduleId: item._id
-    //   };
-    //   http()
-    //     .delete(
-    //       "/deleteSchedule",
-    //       confirm("Are you sure you want to Delete this?") && {
-    //         params: deleteSchedule
-    //       }
-    //     )
-    //     .then(response => {
-    //       this.snackbar = true;
-    //       this.text = "Successfully Delete Schedule ";
-    //       this.getStudentsList();
-    //     })
-    //     .catch(error => {
-    //       // console.log(error);
-    //     });
-    // },
     activeTab(type) {
       switch (type) {
         case "existing":
@@ -714,34 +385,6 @@ export default {
           break;
       }
     },
-    // close() {
-    //   this.dialog = false;
-    // },
-    // close1() {
-    //   this.dialog1 = false;
-    // },
-    // clear() {
-    //   this.$refs.form.reset();
-    //   this.disable = false;
-    //   this.loading = false;
-    // },
-    // save() {
-    //   this.editedItem.scheduleId = this.editedItem._id;
-    //   http()
-    //     .put("/updateSchedule", this.editedItem)
-    //     .then(response => {
-    //       this.snackbar = true;
-    //       this.text = "Successfully Edit Exam Schedule";
-    //       this.color = "green";
-    //       this.getSchedulesList();
-    //       this.close();
-    //     })
-    //     .catch(error => {
-    //       this.snackbar = true;
-    //       this.text = error.response.data.message;
-    //       this.color = "red";
-    //     });
-    // },
     getClass() {
       this.showLoader = true;
       http()
@@ -751,7 +394,6 @@ export default {
         .then(response => {
           this.classList = response.data.data;
           this.showLoader = false;
-          // console.log("getClassesList=====>",this.addclass)
         })
         .catch(err => {
           // console.log("err====>", err);
@@ -762,7 +404,6 @@ export default {
       this.showLoader = true;
       for (let i = 0; i < this.classList.length; i++) {
         if (_id == this.classList[i]._id) {
-          //   console.log(this.classList[i].subjects);
           this.subjects = this.classList[i].subjects;
         }
       }
@@ -820,7 +461,6 @@ export default {
           .then(response => {
             this.getStudentData = response.data.data;
             this.showLoader = false;
-            // console.log("getSectionsList=====>", response.data.data);
             this.showLoader = true;
             http()
               .get("/getMarkDistributionsList", {
@@ -849,7 +489,6 @@ export default {
                     });
                   }
                 }
-                console.log("this.getStudentData", this.getStudentData);
               })
               .catch(error => {
                 console.log("err====>", error);
@@ -865,23 +504,16 @@ export default {
     submit() {
       let studentsMarks = [];
       for (var j = 0; j < this.getStudentData.length; j++) {
-        studentsMarks.push({
+        let data = {
+          examId: this.addMark.examId,
+          classId: this.addMark.classId,
+          sectionId: this.addMark.sectionId,
+          subjectId: this.addMark.subjectId,
           studentId: this.getStudentData[j]._id,
-          marksObtained: this.getStudentData[j].marksObtained
-        });
-      }
-      // console.log("marksObtaine----marksObtained", studentsMarks);
-      let markData = {
-        examId: this.addMark.examId,
-        classId: this.addMark.classId,
-        sectionId: this.addMark.sectionId,
-        subjectId: this.addMark.subjectId,
-        studentsMarks: studentsMarks
-      };
-      console.log("markData", markData);
-      if (this.$refs.form.validate()) {
+          studentsMarks: this.getStudentData[j].marksObtained
+        };
         http()
-          .post("/createMark", markData)
+          .post("/createMark", data)
           .then(response => {
             this.snackbar = true;
             this.text = response.data.message;
@@ -890,10 +522,9 @@ export default {
             this.clear();
           })
           .catch(error => {
-            if ((this.snackbar = true)) {
-              this.text = error.response.data.message;
-              this.color = "red";
-            }
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "red";
           });
       }
     },
@@ -919,7 +550,6 @@ export default {
   },
   mounted() {
     this.token = this.$store.state.token;
-    // this.getSchedulesList();
     this.getClass();
     this.getExamList();
   },
diff --git a/src/pages/Mark/promotion.vue b/src/pages/Mark/promotion.vue
index aca4b53..7d12868 100644
--- a/src/pages/Mark/promotion.vue
+++ b/src/pages/Mark/promotion.vue
@@ -17,7 +17,13 @@
                 <label>Academic Year :</label>
               </v-flex>
               <v-flex md10>
-                <v-select :items="acedemicYear" label="Select Academic Year"></v-select>
+                <v-select
+                  :items="acedemicYear"
+                  v-model="promotion.year"
+                  item-value="year"
+                  item-text="year"
+                  label="promotion.year"
+                ></v-select>
               </v-flex>
             </v-flex>
             <v-flex xs12 sm12 md3>
@@ -26,10 +32,9 @@
               </v-flex>
               <v-flex md10 class="ml-2">
                 <v-select
-                  v-model="promtion.classId"
+                  v-model="promotion.classId"
                   label="Select your class"
                   type="text"
-                  :rules="classRules"
                   :items="classList"
                   item-text="classNum"
                   item-value="_id"
@@ -42,7 +47,12 @@
                 <label>Promotion Academic Year :</label>
               </v-flex>
               <v-flex md10>
-                <v-select :items="acedemicYear" label="Select Promotion Academic Year"></v-select>
+                <v-select
+                  :items="acedemicYear"
+                  v-model="promotion.year"
+                  item-text="year"
+                  label="Select Promotion Academic Year"
+                ></v-select>
               </v-flex>
             </v-flex>
             <v-flex xs12 sm12 md3>
@@ -56,7 +66,7 @@
           </v-layout>
         </v-flex>
       </v-card>
-      <v-container class="pb-0">
+      <!-- <v-container class="pb-0">
         <v-card class="px-3 grey lighten-2" flat>
           <v-flex xs12>
             <v-layout>
@@ -83,7 +93,6 @@
         </v-card>
       </v-container>
       <v-container fluid>
-        <!-- <v-flex xs12> -->
         <v-layout wrap>
           <v-flex xs12 sm12 md6>
             <v-layout>
@@ -157,17 +166,9 @@
                 ></v-text-field>
               </v-flex>
             </v-flex>
-            <!-- <v-flex xs12 sm12 md3>
-              <v-flex md12 class="mt-4 body-1">
-                <label class>Promotion Class :</label>
-              </v-flex>
-              <v-flex md10 class="ml-2">
-                <v-select :items="acedemicYear" label="Select Promotion Class"></v-select>
-              </v-flex>
-            </v-flex>-->
           </v-layout>
         </v-flex>
-      </v-card>
+      </v-card>-->
       <v-layout>
         <v-flex xs10 sm10 md4 class="mx-auto mt-4">
           <v-btn class="black" dark block round>Promotion Mark Setting</v-btn>
@@ -186,7 +187,9 @@ export default {
       radios: "radio-1",
       acedemicYear: [],
       classList: [],
-      promtion: {},
+      promotion: {
+        // academicYear: ""
+      },
       passmark: {
         hindi: "40",
         english: "40",
@@ -197,6 +200,10 @@ export default {
     };
   },
   mounted() {
+    var year = new Date().getFullYear() + 1;
+    // this.promotion.acedemicYear = new Date().getFullYear() + "-" + year;
+    this.acedemicYear.push({ year: new Date().getFullYear() + "-" + year });
+    console.log("  this.promotion.acedemicYear ", this.acedemicYear);
     this.token = this.$store.state.token;
     this.getClass();
   },
diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue
index e2a7e21..bf17166 100644
--- a/src/pages/Mark/viewMark.vue
+++ b/src/pages/Mark/viewMark.vue
@@ -17,7 +17,7 @@
                 </v-toolbar>
                 <v-card-text>
                   <v-container>
-                    <v-layout wrap v-for="(mark,i) in markData" :key="i">
+                    <v-layout wrap v-for="(value, id, index) in filterData" v-if="index == 0">
                       <v-flex xs12>
                         <v-layout>
                           <v-flex
@@ -27,11 +27,11 @@
                             <v-avatar size="100px">
                               <img
                                 src="/static/icon/user.png"
-                                v-if="!mark.studentsMarks[0].studentId.profilePicUrl"
+                                v-if="!value[0].studentId.profilePicUrl"
                               />
                               <img
-                                :src="mark.studentsMarks[0].studentId.profilePicUrl"
-                                v-else-if="mark.studentsMarks[0].studentId.profilePicUrl"
+                                :src="value[0].studentId.profilePicUrl"
+                                v-else-if="value[0].studentId.profilePicUrl"
                               />
                             </v-avatar>
                           </v-flex>
@@ -39,39 +39,39 @@
                         <v-layout>
                           <v-flex xs12 sm12>
                             <h3 class="text-xs-center">
-                              <b>{{ mark.studentsMarks[0].studentId.name }}</b>
+                              <b>{{ value[0].studentId.name }}</b>
                             </h3>
                             <p class="text-xs-center grey--text">Student</p>
                           </v-flex>
                         </v-layout>
                         <v-layout style="border: 1px solid lightgrey;">
-                          <v-flex xs6 sm6 class="py-0">
-                            <h4 class="right">
-                              <b>Roll No :</b>
+                          <v-flex xs6 sm6>
+                            <h4 class="right py-0">
+                              <b>Roll No:</b>
                             </h4>
                           </v-flex>
-                          <v-flex sm6 xs6 class="py-0">
-                            <h4>{{ mark.studentsMarks[0].studentId.rollNo }}</h4>
+                          <v-flex sm6 xs6>
+                            <h4 class="py-0">{{ value[0].studentId.rollNo }}</h4>
                           </v-flex>
                         </v-layout>
                         <v-layout style="border: 1px solid lightgrey;">
-                          <v-flex xs6 sm6 class="py-0">
-                            <h4 class="right">
-                              <b>Class :</b>
+                          <v-flex xs6 sm6>
+                            <h4 class="right py-0">
+                              <b>Class:</b>
                             </h4>
                           </v-flex>
-                          <v-flex sm6 xs6 class="right py-0">
-                            <h4>{{ mark.classId.classNum }}</h4>
+                          <v-flex sm6 xs6>
+                            <h4 class="py-0">{{value[0].classId.classNum }}</h4>
                           </v-flex>
                         </v-layout>
                         <v-layout style="border: 1px solid lightgrey;">
-                          <v-flex xs6 sm6 class="right py-0">
-                            <h4 class="right">
-                              <b>Section :</b>
+                          <v-flex xs6 sm6 class="right">
+                            <h4 class="right py-0">
+                              <b>Section:</b>
                             </h4>
                           </v-flex>
-                          <v-flex sm6 xs6 class="right py-0">
-                            <h4>{{ mark.sectionId.name}}</h4>
+                          <v-flex sm6 xs6 class="right">
+                            <h4 class="py-0">{{ value[0].sectionId.name}}</h4>
                           </v-flex>
                         </v-layout>
                       </v-flex>
@@ -84,76 +84,43 @@
             <!-- ****** TABLE DATA MARK  ****** -->
 
             <v-flex xs12 sm12 md9 class="mt-4">
-              <v-card>
-                <v-toolbar dark class="fixcolors" flat>
-                  <v-spacer></v-spacer>
-                  <v-toolbar-title>
-                    <h3>Mark</h3>
-                  </v-toolbar-title>
-                  <v-spacer></v-spacer>
-                </v-toolbar>
-                <v-card-title
-                  v-for="(markList,i) in markData"
-                  :key="i"
-                  class="subheading"
-                >{{ markList.examId.examName }}</v-card-title>
-                <table class="feeTypeTable tableRsponsive">
-                  <tr class="info white--text">
-                    <th rowspan="2">Subject</th>
-                    <th
-                      colspan="2"
-                      v-for="(markDistribution,i) in markDistributions"
-                      :key="i "
-                    >{{ markDistribution.markDistributionId.distributionType}}</th>
-                    <!-- <th colspan="2">ASSIGNMENT</th> -->
-                    <th colspan="3">Total</th>
-                  </tr>
-                  <tr class="info white--text">
-                    <th
-                      class="bg-sky"
-                      v-for="(markDistribution,i) in markDistributions"
-                      :key="i"
-                    >{{i === 0 ? 'Mark' : 'Highest Mark'}}</th>
-                    <th
-                      class="bg-sky-light"
-                      v-for="(markDistribution,i) in markDistributions"
-                      :key="i"
-                    >{{i === 0 ? 'Mark' : 'Highest Mark'}}</th>
-                    <th class="bg-sky">Mark</th>
-                    <th class="bg-purple">Point</th>
-                    <th class="bg-skyDark">Grade</th>
-                  </tr>
-                  <!-- </tr> -->
-                  <tr v-for="(mark,i) in markData" :key="i">
-                    <td>{{ mark.classId.subjects[0].subjectName }}</td>
-                    <td
-                      v-for="(markDistribution,i) in markParticularDistributionData"
-                      :key="i"
-                    >{{ markDistribution }}</td>
-                    <!-- <td>
-                      10	
-                    </td>
-                    <td>
-                      10	
-                    </td>
-                    <td>
-                      83
-                    </td>
-                    <td>
-                      8	
-                    </td>
-                    <td>B
-                    </td>-->
-                  </tr>
-                  <!-- <tfoot>
-                    <tr>
-                      <td colspan="2">Total:</td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
+              <v-toolbar dark class="fixcolors" flat>
+                <v-spacer></v-spacer>
+                <v-toolbar-title>
+                  <h3>Mark</h3>
+                </v-toolbar-title>
+                <v-spacer></v-spacer>
+              </v-toolbar>
+              <v-card v-for="(value, id, index) in filterData">
+                <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
+                <table class="mb-3 tableRsponsive feeTypeTable">
+                  <thead>
+                    <tr class="info white--text">
+                      <td rowspan="2">Subject</td>
+                      <td
+                        colspan="2"
+                        v-for="exam in value[index].studentsMarks"
+                      >{{exam.markDistributionId.distributionType}}</td>
+                      <td>Total</td>
+                    </tr>
+                    <tr v-for="(subject, ind) in value" v-if="ind == 0">
+                      <template v-for="(exam, i) in subject.studentsMarks">
+                        <td class="bg-sky white--text">Mark</td>
+                        <td class="bg-sky-light white--text">Highest Mark</td>
+                      </template>
+                      <td class="bg-sky white--text">Mark</td>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr v-for="subject in value">
+                      <td>{{subject.subjectName}}</td>
+                      <template v-for="(exam, i) in subject.studentsMarks">
+                        <td>{{exam.marksScored}}</td>
+                        <td>{{exam.markDistributionId.markValue}}</td>
+                      </template>
+                      <td>{{subject.totalMarks}}</td>
                     </tr>
-                  </tfoot>-->
+                  </tbody>
                 </table>
               </v-card>
             </v-flex>
@@ -170,6 +137,7 @@
 <script>
 import http from "@/Services/http.js";
 import moment from "moment";
+import _ from "underscore";
 
 export default {
   data: () => ({
@@ -177,7 +145,8 @@ export default {
     markData: [],
     token: "",
     markDistributions: [],
-    markParticularDistributionData: []
+    markParticularDistributionData: [],
+    filterData: []
   }),
   mounted() {
     this.token = this.$store.state.token;
@@ -185,41 +154,93 @@ export default {
   },
   methods: {
     getMarkList() {
-      this.showLoader = true;
+      this.showLoader = false;
       http()
         .get("/getParticularMark", {
           params: { studentId: this.$route.params.markId },
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
-          this.markData = response.data.data;
-          for (let i = 0; i < this.markData.length; i++) {
-            for (let j = 0; j < this.markData[i].studentsMarks.length; j++) {
-              //  console.log("this.studentsMarksSSSSSSSSSSSSS",this.markData[i].studentsMarks[j].marksObtained)
-
-              this.markDistributions = this.markData[i].studentsMarks[
-                j
-              ].marksObtained;
+          let newData = response.data.data;
+          for (var i = 0; i < newData.length; i++) {
+            newData[i].examination = newData[i].examId._id;
+          }
+          this.filterData = _.groupBy(newData, ["examination"]);
+          console.log("check filtered data", this.filterData);
+          for (let data in this.filterData) {
+            // console.log("this.filterData[data].length", this.filterData[data]);
+            for (let item in this.filterData[data]) {
+              // console.log("check", this.filterData[data][item].studentsMarks);
+              var totalMarks = 0;
               for (
-                let k = 0;
-                k < this.markData[i].studentsMarks[j].marksObtained.length;
-                k++
+                let i = 0;
+                i < this.filterData[data][item].studentsMarks.length;
+                i++
               ) {
-                this.markParticularDistributionData.push(
-                  this.markData[i].studentsMarks[j].marksObtained[k].marksScored
-                );
-                this.markParticularDistributionData.push(
-                  this.markData[i].studentsMarks[j].marksObtained[k]
-                    .markDistributionId.markValue
-                );
-                console.log(
-                  "this.markParticularDistributionData",
-                  this.markParticularDistributionData
-                );
+                // console.log(
+                //   "check data",
+                //   this.filterData[data][item].studentsMarks[i]
+                // );
+                totalMarks += this.filterData[data][item].studentsMarks[i]
+                  .marksScored;
               }
+              this.filterData[data][item].totalMarks = totalMarks;
             }
           }
-          this.showLoader = false;
+          // var aray = [];
+          // this.markData = response.data.data;
+          // for (let i = 0; i < this.markData.length; i++) {
+          //   console.log(this.markData[i].examId.examName);
+          //   let index = -1;
+
+          //   aray.forEach((dat_, k) => {
+          //     if (dat_.category == this.markData[i].examId.examName) {
+          //       index = k;
+          //     }
+          //   });
+          //   if (index == -1) {
+          //     var obj = {
+          //       category: this.markData[i].examId.examName,
+          //       extraData: []
+          //     };
+          //     obj.extraData.push(this.markData[i]);
+          //     aray.push(obj);
+          //   } else {
+          //     console.log("=o", this.markData[i]);
+          //     //  aray[index].extraData =
+
+          //     aray[index].extraData.push(this.markData[i]);
+          //   }
+          //   console.log("aray-", aray);
+
+          // for (let j = 0; j < this.markData[i].studentsMarks.length; j++) {
+          //   //  console.log("this.studentsMarksSSSSSSSSSSSSS",this.markData[i].studentsMarks[j].marksObtained)
+
+          //   this.markDistributions = this.markData[i].studentsMarks[
+          //     j
+          //   ].marksObtained;
+          //   for (
+          //     let k = 0;
+          //     k < this.markData[i].studentsMarks[j].marksObtained.length;
+          //     k++
+          //   ) {
+          //     this.markParticularDistributionData.push(
+          //       this.markData[i].studentsMarks[j].marksObtained[k].marksScored
+          //     );
+          //     this.markParticularDistributionData.push(
+          //       this.markData[i].studentsMarks[j].marksObtained[k]
+          //         .markDistributionId.markValue
+          //     );
+          //     // console.log(
+          //     //   "this.markParticularDistributionData",
+          //     //   this.markParticularDistributionData
+          //     // );
+          //   }
+          // }
+          // }
+          // this.markData = aray;
+          // console.log("aray-2", aray);
+          // this.showLoader = false;
         })
         .catch(error => {
           // console.log("err====>", err);
diff --git a/src/pages/News/news.vue b/src/pages/News/news.vue
index 8710725..6d41dba 100644
--- a/src/pages/News/news.vue
+++ b/src/pages/News/news.vue
@@ -37,7 +37,7 @@
               </v-toolbar-title>
               <v-spacer></v-spacer>
             </v-toolbar>
-            <v-card-text style="height:600px;">
+            <v-card-text style="height:520px;">
               <!-- <v-form ref="form">
               <v-container fluid>-->
               <v-layout row>
diff --git a/src/pages/Notification/notification.vue b/src/pages/Notification/notification.vue
index 19a2c0e..abf3315 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="500px">
+        <v-dialog v-model="dialog1" max-width="700px">
           <v-toolbar color="v-toolbar">
             <v-spacer></v-spacer>
             <v-toolbar-title>
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index e5d9363..382bc07 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -1,14 +1,5 @@
 <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>
@@ -27,7 +18,7 @@
                 <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-flex xs9 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="getReport.classId"
                     label="Select your class"
@@ -47,7 +38,7 @@
                 <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-flex xs9 sm6 lg8 class="ml-2">
                   <v-select
                     :items="addSection"
                     label="Select your Section"
@@ -67,7 +58,7 @@
                 <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-flex xs9 sm6  lg8 class="ml-2">
                   <v-select
                     :items="getStudentsList"
                     label="Select your student"
@@ -81,48 +72,146 @@
               </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-btn
+                @click="getMarkReportList"
+                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>-->
+    <!-- ****** PROFILE MARK  ****** -->
+
+    <v-container fluid grid-list-md v-if="showReport">
+      <v-flex xs12 sm12>
+        <v-container fluid>
+          <v-layout wrap>
+            <v-flex xs12 sm12 md3 class="mt-4">
+              <v-card flat>
+                <v-toolbar dark class="fixcolors" flat>
+                  <v-spacer></v-spacer>
+                  <v-toolbar-title>
+                    <h3>Profile</h3>
+                  </v-toolbar-title>
+                  <v-spacer></v-spacer>
+                </v-toolbar>
+                <v-card-text>
+                  <v-container>
+                    <v-layout wrap v-for="(value, id, index) in filterData" v-if="index == 0">
+                      <v-flex xs12>
+                        <v-layout>
+                          <v-flex
+                            xs12
+                            class="text-xs-center text-sm-center text-md-center text-lg-center"
+                          >
+                            <v-avatar size="100px">
+                              <img
+                                src="/static/icon/user.png"
+                                v-if="!value[0].studentId.profilePicUrl"
+                              />
+                              <img
+                                :src="value[0].studentId.profilePicUrl"
+                                v-else-if="value[0].studentId.profilePicUrl"
+                              />
+                            </v-avatar>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout>
+                          <v-flex xs12 sm12>
+                            <h3 class="text-xs-center">
+                              <b>{{ value[0].studentId.name }}</b>
+                            </h3>
+                            <p class="text-xs-center grey--text">Student</p>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout style="border: 1px solid lightgrey;">
+                          <v-flex xs6 sm6>
+                            <h4 class="right py-0">
+                              <b>Roll No:</b>
+                            </h4>
+                          </v-flex>
+                          <v-flex sm6 xs6 >
+                            <h4 class="py-0">{{ value[0].studentId.rollNo }}</h4>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout style="border: 1px solid lightgrey;" >
+                          <v-flex xs6 sm6>
+                            <h4 class="right py-0">
+                              <b>Class:</b>
+                            </h4>
+                          </v-flex>
+                          <v-flex sm6 xs6>
+                            <h4 class="py-0">{{value[0].classId.classNum }}</h4>
+                          </v-flex>
+                        </v-layout>
+                        <v-layout style="border: 1px solid lightgrey;">
+                          <v-flex xs6 sm6 class="right">
+                            <h4 class="right py-0">
+                              <b>Section:</b>
+                            </h4>
+                          </v-flex>
+                          <v-flex sm6 xs6 class="right">
+                            <h4 class="py-0">{{ value[0].sectionId.name}}</h4>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                    </v-layout>
+                  </v-container>
+                </v-card-text>
+              </v-card>
+            </v-flex>
+
+            <!-- ****** TABLE DATA MARK  ****** -->
+
+            <v-flex xs12 sm12 md9 class="mt-4">
+              <v-toolbar dark class="fixcolors" flat>
+                <v-spacer></v-spacer>
+                <v-toolbar-title>
+                  <h3>Mark</h3>
+                </v-toolbar-title>
+                <v-spacer></v-spacer>
+              </v-toolbar>
+              <v-card v-for="(value, id, index) in filterData">
+                <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
+                <table class="mb-4 tableRsponsive feeTypeTable">
+                  <thead>
+                    <tr class="info white--text">
+                      <td rowspan="2">Subject</td>
+                      <td
+                        colspan="2"
+                        v-for="exam in value[index].studentsMarks"
+                      >{{exam.markDistributionId.distributionType}}</td>
+                      <td>Total</td>
+                    </tr>
+                    <tr v-for="(subject, ind) in value" v-if="ind == 0">
+                      <template v-for="(exam, i) in subject.studentsMarks">
+                        <td class="bg-sky white--text">Mark</td>
+                        <td class="bg-sky-light white--text">Highest Mark</td>
+                      </template>
+                      <td class="bg-sky white--text">Mark</td>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr v-for="subject in value">
+                      <td>{{subject.subjectName}}</td>
+                      <template v-for="(exam, i) in subject.studentsMarks">
+                        <td>{{exam.marksScored}}</td>
+                        <td>{{exam.markDistributionId.markValue}}</td>
+                      </template>
+                      <td>{{subject.totalMarks}}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </v-card>
+            </v-flex>
+          </v-layout>
+        </v-container>
+      </v-flex>
+    </v-container>
     <div class="loader" v-if="showLoader">
       <v-progress-circular indeterminate color="white"></v-progress-circular>
     </div>
@@ -132,67 +221,32 @@
 <script>
 import http from "@/Services/http.js";
 import moment from "moment";
+import _ from "underscore";
 
 export default {
   data: () => ({
-    snackbar: false,
-    color: "",
-    y: "top",
-    x: "right",
-    mode: "",
-    timeout: 10000,
-    text: "",
-    loading: false,
-    search: "",
     showLoader: false,
+    markData: [],
+    token: "",
+    markDistributions: [],
+    markParticularDistributionData: [],
+    loading: false,
     valid: true,
+    loading: false,
+    showReport: false,
     addSection: [],
+    filterData: [],
+    getStudentsList: [],
     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: ""
+    classList: []
   }),
+  mounted() {
+    this.token = this.$store.state.token;
+    this.getClass();
+  },
   methods: {
     clear() {
       this.$refs.form.reset();
@@ -244,56 +298,145 @@ export default {
           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);
-            // }
-          });
-      }
+    getMarkReportList() {
+      this.showLoader = false;
+      this.showReport = true;
+      http()
+        .get("/getParticularMark", {
+          params: { studentId: this.getReport.studentId },
+          headers: { Authorization: "Bearer " + this.token }
+        })
+        .then(response => {
+          let newData = response.data.data;
+          for (var i = 0; i < newData.length; i++) {
+            newData[i].examination = newData[i].examId._id;
+          }
+          this.filterData = _.groupBy(newData, ["examination"]);
+          console.log("check filtered data", this.filterData);
+          for (let data in this.filterData) {
+            // console.log("this.filterData[data].length", this.filterData[data]);
+            for (let item in this.filterData[data]) {
+              // console.log("check", this.filterData[data][item].studentsMarks);
+              var totalMarks = 0;
+              for (
+                let i = 0;
+                i < this.filterData[data][item].studentsMarks.length;
+                i++
+              ) {
+                // console.log(
+                //   "check data",
+                //   this.filterData[data][item].studentsMarks[i]
+                // );
+                totalMarks += this.filterData[data][item].studentsMarks[i]
+                  .marksScored;
+              }
+              this.filterData[data][item].totalMarks = totalMarks;
+            }
+          }
+          // var aray = [];
+          // this.markData = response.data.data;
+          // for (let i = 0; i < this.markData.length; i++) {
+          //   console.log(this.markData[i].examId.examName);
+          //   let index = -1;
+
+          //   aray.forEach((dat_, k) => {
+          //     if (dat_.category == this.markData[i].examId.examName) {
+          //       index = k;
+          //     }
+          //   });
+          //   if (index == -1) {
+          //     var obj = {
+          //       category: this.markData[i].examId.examName,
+          //       extraData: []
+          //     };
+          //     obj.extraData.push(this.markData[i]);
+          //     aray.push(obj);
+          //   } else {
+          //     console.log("=o", this.markData[i]);
+          //     //  aray[index].extraData =
+
+          //     aray[index].extraData.push(this.markData[i]);
+          //   }
+          //   console.log("aray-", aray);
+
+          // for (let j = 0; j < this.markData[i].studentsMarks.length; j++) {
+          //   //  console.log("this.studentsMarksSSSSSSSSSSSSS",this.markData[i].studentsMarks[j].marksObtained)
+
+          //   this.markDistributions = this.markData[i].studentsMarks[
+          //     j
+          //   ].marksObtained;
+          //   for (
+          //     let k = 0;
+          //     k < this.markData[i].studentsMarks[j].marksObtained.length;
+          //     k++
+          //   ) {
+          //     this.markParticularDistributionData.push(
+          //       this.markData[i].studentsMarks[j].marksObtained[k].marksScored
+          //     );
+          //     this.markParticularDistributionData.push(
+          //       this.markData[i].studentsMarks[j].marksObtained[k]
+          //         .markDistributionId.markValue
+          //     );
+          //     // console.log(
+          //     //   "this.markParticularDistributionData",
+          //     //   this.markParticularDistributionData
+          //     // );
+          //   }
+          // }
+          // }
+          // this.markData = aray;
+          // console.log("aray-2", aray);
+          // 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;
+table {
+  border-collapse: collapse;
+  border: 1px solid #e2e7eb;
+}
+
+th,
+td {
+  border: 1px solid #e2e7eb;
+  padding: 10px;
+  text-align: center;
 }
-.activebtn {
-  color: black !important;
+table.feeTypeTable {
+  table-layout: auto !important;
+  width: 100% !important;
+}
+.bg-sky {
+  background-color: #98b2cc !important;
+}
+.bg-sky-light {
+  background-color: #89a0b8;
+}
+.bg-purple {
+  background-color: #9583ac;
+}
+.bg-skyDark {
+  background-color: #956785;
+}
+@media screen and (max-width: 380px) {
+  .tableRsponsive {
+    display: block;
+    position: relative;
+    overflow: scroll;
+  }
 }
-</style>s
\ No newline at end of file
+</style> s
\ No newline at end of file
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index da85029..b3afa4c 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -18,7 +18,7 @@
         <v-spacer></v-spacer>
       </v-card-actions>
     </v-card>
-    <v-card flat  class="elevation-0">
+    <v-card flat class="elevation-0">
       <v-form ref="form" v-model="valid" lazy-validation>
         <v-flex xs12 sm12 lg12>
           <v-layout wrap>
@@ -136,7 +136,7 @@
               </v-flex>
             </v-layout>
             </v-flex>-->
-            <v-flex xs12 sm12 lg4>
+            <v-flex xs12 sm12 lg4 v-if="classShow">
               <v-layout>
                 <v-flex xs4 sm4 lg3 class="subheading mt-4">
                   <label class="right">Class:</label>
@@ -179,26 +179,30 @@
               <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-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-flex xs12>
-        <v-layout v-for="(student,i) in getStudentsReportList" :key="i">
+    <!-- <v-card flat>
+      <v-flex xs12 v-for="(student,i) in getStudentsReportList" :key="i">
+        <v-layout>
           <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>
+            <h5 class="mt-2 ml-2">Class: {{ 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>
+            <h5 class="right mt-2 ml-2">Section: {{ student.sectionId.name }}</h5>
           </v-flex>
         </v-layout>
       </v-flex>
-    </v-card>
+    </v-card>-->
     <v-data-table
       :headers="headers"
       :items="getStudentsReportList"
@@ -217,6 +221,8 @@
         <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 id="td" class="text-xs-center">{{ props.item.classId.classNum }}</td>
+        <td id="td" class="text-xs-center">{{ props.item.sectionId.name }}</td>
       </template>
       <v-alert
         slot="no-results"
@@ -258,6 +264,7 @@ export default {
     BirthdayShow: false,
     sectionShow: false,
     showTable: false,
+    ClassShow: true,
     addSection: [],
     pagination: {
       rowsPerPage: 15
@@ -300,6 +307,18 @@ export default {
         value: "email",
         sortable: false,
         align: "center"
+      },
+      {
+        text: "Class",
+        value: "classId",
+        sortable: false,
+        align: "center"
+      },
+      {
+        text: "Section",
+        value: "sectionId",
+        sortable: false,
+        align: "center"
       }
     ],
     classList: [],
@@ -350,6 +369,8 @@ export default {
         this.countryShow = false;
         this.BirthdayShow = false;
         this.HostelShow = false;
+        this.classShow = false;
+        this.sectionShow = false;
       }
       if (this.report.form === "Gender") {
         this.genderShow = true;
@@ -358,6 +379,7 @@ export default {
         this.BirthdayShow = false;
         this.countryShow = false;
         this.HostelShow = false;
+        this.classShow = true;
       }
       if (this.report.form === "Transport") {
         this.TransportShow = true;
@@ -366,6 +388,7 @@ export default {
         this.BirthdayShow = false;
         this.countryShow = false;
         this.HostelShow = false;
+        this.classShow = true;
       }
       if (this.report.form === "Country") {
         this.countryShow = true;
@@ -374,6 +397,7 @@ export default {
         this.bloodGroup = false;
         this.BirthdayShow = false;
         this.HostelShow = false;
+        this.classShow = true;
       }
       if (this.report.form === "Hostel") {
         this.HostelShow = true;
@@ -382,6 +406,7 @@ export default {
         this.bloodGroup = false;
         this.countryShow = false;
         this.BirthdayShow = false;
+        this.classShow = true;
       }
       if (this.report.form === "Birthday") {
         this.BirthdayShow = true;
@@ -390,6 +415,7 @@ export default {
         this.HostelShow = false;
         this.bloodGroup = false;
         this.countryShow = false;
+        this.classShow = true;
       }
     },
     getStudents() {
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index 46ab0a2..0cc4db2 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -1846,7 +1846,7 @@ export default {
       weight: "",
       rollNo: "",
       establishmentYear: new Date().getFullYear()
-    },
+    }
   }),
   watch: {
     menu(val) {
@@ -1878,6 +1878,7 @@ export default {
     },
     getSections(_id) {
       var token = this.$store.state.token;
+      this.showLoader = true;
       http()
         .get(
           "/getSectionsList",
@@ -1888,15 +1889,18 @@ export default {
         )
         .then(response => {
           this.addSection = response.data.data;
-          console.log("getSectionsList=====>", this.addSection);
+          this.showLoader = false;
+          // console.log("getSectionsList=====>", this.addSection);
         })
         .catch(err => {
+          this.showLoader = false;
           // console.log("err====>", err);
           // this.$router.replace({ path: '/' });
         });
     },
     getSection(_id) {
       var token = this.$store.state.token;
+      this.showLoader = true;
       http()
         .get(
           "/getSectionsList",
@@ -1907,9 +1911,11 @@ export default {
         )
         .then(response => {
           this.addSection = response.data.data;
-          console.log("getSectionsList=====>", this.addSection);
+          this.showLoader = false;
+          // console.log("getSectionsList=====>", this.addSection);
         })
         .catch(err => {
+          this.showLoader = false;
           // console.log("err====>", err);
           // this.$router.replace({ path: '/' });
         });
diff --git a/src/pages/Subjects/subjects.vue b/src/pages/Subjects/subjects.vue
index 6d9a435..b9943f3 100644
--- a/src/pages/Subjects/subjects.vue
+++ b/src/pages/Subjects/subjects.vue
@@ -128,10 +128,10 @@
         <v-card flat>
           <v-card-actions>
             <v-layout>
-              <v-flex xs4 sm1>
+              <v-flex xs4 sm2 lg1>
                 <label class="right mt-4">Select Class:</label>
               </v-flex>
-              <v-flex xs8 sm3>
+              <v-flex xs8 sm4 lg3>
                 <v-select
                   :items="classList"
                   label="Select Class"
diff --git a/src/pages/generalSetting/generalSetting.vue b/src/pages/generalSetting/generalSetting.vue
new file mode 100644
index 0000000..a1f2696
--- /dev/null
+++ b/src/pages/generalSetting/generalSetting.vue
@@ -0,0 +1,224 @@
+<template>
+  <v-app id="login">
+    <v-container fill-height>
+      <v-layout>
+        <v-flex xs12 sm12 md12 lg12 class="mt-5">
+          <v-toolbar class="fixcolors mt-5" dark>
+            <v-spacer></v-spacer>
+            <v-toolbar-title>General Setting</v-toolbar-title>
+            <v-spacer></v-spacer>
+          </v-toolbar>
+          <v-card class="elevation-1 pa-3" id="form">
+            <v-card-text>
+              <v-flex xs12>
+                <v-form class="mt-3" ref="form" v-model="valid" lazy-validation>
+                  <v-flex xs12>
+                    <!-- <v-layout> -->
+                      <v-flex xs12>
+                        <v-layout>
+                          <v-flex xs4 sm4>
+                            <label class="subheading right pt-4">Site Title:</label>
+                          </v-flex>
+                          <v-flex xs8 sm5>
+                            <v-text-field
+                              class="ml-3"
+                              placeholder="fill your Site title"
+                              v-model="setting.name"
+                            ></v-text-field>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                      <v-flex xs12>
+                        <v-layout>
+                          <v-flex xs4 sm4>
+                            <label class="subheading right pt-4">Phone:</label>
+                          </v-flex>
+                          <v-flex xs8 sm5>
+                            <v-text-field
+                              class="ml-3"
+                              placeholder="fill your Phone number"
+                              v-model="setting.mobile"
+                            ></v-text-field>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                    <!-- </v-layout> -->
+                    <!-- <v-layout> -->
+                      <v-flex xs12>
+                        <v-layout>
+                          <v-flex xs4 sm4>
+                            <label class="subheading right pt-4">Email:</label>
+                          </v-flex>
+                          <v-flex xs8 sm5>
+                            <v-text-field
+                              class="ml-3"
+                              placeholder="fill your email"
+                              v-model="setting.email"
+                            ></v-text-field>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                      <v-flex xs12>
+                        <v-layout>
+                          <v-flex xs4 sm4>
+                            <label class="subheading right pt-4">Address:</label>
+                          </v-flex>
+                          <v-flex xs8 sm5>
+                            <v-text-field
+                              class="ml-3"
+                              placeholder="fill your Address"
+                              v-model="setting.address"
+                            ></v-text-field>
+                          </v-flex>
+                        </v-layout>
+                      </v-flex>
+                    <!-- </v-layout> -->
+                  </v-flex>
+                </v-form>
+              </v-flex>
+            </v-card-text>
+            <v-card-actions>
+              <v-flex text-xs-center>
+                <v-btn
+                  class="mt-3"
+                  round
+                  color="black"
+                  dark
+                  large
+                  :loading="loading"
+                  @click="reset"
+                >submit</v-btn>
+              </v-flex>
+            </v-card-actions>
+            <v-snackbar
+              :timeout="timeout"
+              :top="y === 'top'"
+              :right="x === 'right'"
+              :vertical="mode === 'vertical'"
+              v-model="snackbar"
+              :color="color"
+            >{{ text }}</v-snackbar>
+          </v-card>
+        </v-flex>
+      </v-layout>
+    </v-container>
+  </v-app>
+</template>
+<script>
+import http from "@/Services/http.js";
+
+export default {
+  data() {
+    return {
+      snackbar: false,
+      y: "top",
+      x: "right",
+      mode: "",
+      timeout: 4000,
+      text: "",
+      color: "",
+      setting: {},
+      valid: true,
+      loading: false,
+      text: ""
+    };
+  },
+  mounted() {
+    this.token = this.$store.state.token;
+    // this.getRole();
+  },
+  methods: {
+    reset() {
+      if (this.$refs.form.validate()) {
+        this.loading = true;
+        this.setting.schoolId = this.$store.state.id;
+        http()
+          .put("/updateSchool", this.setting, {
+            headers: { Authorization: "Bearer " + this.token }
+          })
+          .then(response => {
+            this.loading = false;
+            this.snackbar = true;
+            this.text = response.data.message;
+            this.color = "green";
+            this.clear();
+          })
+          .catch(error => {
+            // console.log("err====>",err);
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "error";
+            this.loading = false;
+          });
+      }
+    },
+    // getRole() {
+    //   this.showLoader = true;
+    //   http()
+    //     .get("/getRolesList", {
+    //       headers: { Authorization: "Bearer " + this.token }
+    //     })
+    //     .then(response => {
+    //       for (let i = 0; i < response.data.data.length; i++) {
+    //         if (
+    //           response.data.data[i].name != "SUPERADMIN" &&
+    //           response.data.data[i].name != "ADMIN"
+    //         ) {
+    //           this.getRoles.push(response.data.data[i]);
+    //           this.showLoader = false;
+    //         }
+    //       }
+    //     })
+    //     .catch(error => {
+    //       this.showLoader = false;
+    //       if (error.response.status === 401) {
+    //         this.$router.replace({ path: "/" });
+    //         this.$store.dispatch("setToken", null);
+    //         this.$store.dispatch("Id", null);
+    //       }
+    //     });
+    // },
+    clear() {
+      this.$refs.form.reset();
+    }
+    // getUsers(roles) {
+    //   this.showLoader = true;
+    //   http()
+    //     .get("/getUserWithRole", {
+    //       params: {
+    //         name: roles
+    //       },
+    //       headers: { Authorization: "Bearer " + this.token }
+    //     })
+    //     .then(response => {
+    //       this.getUsersName = response.data.data;
+    //     })
+    //     .catch(error => {
+    //       this.showLoader = false;
+    //       if (error.response.status === 401) {
+    //         this.$router.replace({ path: "/" });
+    //         this.$store.dispatch("setToken", null);
+    //         this.$store.dispatch("Id", null);
+    //       }
+    //     });
+    // }
+  }
+};
+</script>
+<style scoped>
+img {
+  position: absolute;
+  top: 13px;
+  left: 50px;
+}
+.v-btn--large {
+  padding: 0px 74px;
+}
+@media screen and (max-width: 769px) {
+  .v-btn--large {
+    font-size: 14px;
+    height: 44px;
+    padding: 0 32px;
+  }
+}
+</style>
diff --git a/src/router/paths.js b/src/router/paths.js
index 9275d00..9797067 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -608,5 +608,17 @@ export default [{
                 /* webpackMode: "lazy-once" */
                 `@/pages/Report/progressCardReport.vue`
             )
+    },
+    {
+        path: '/generalSetting',
+        meta: {},
+        name: 'generalSetting',
+        props: (route) => ({ type: route.query.type }),
+        component: () =>
+            import (
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/generalSetting/generalSetting.vue`
+            )
     }
 ];
\ No newline at end of file