fixed all bugs

Shikha Mishra
1 parent 37996f3ca5
Showing 70 changed files with 194 additions and 272 deletions Show diff stats
src/Services/http.js
src/api/menu.js
src/pages/Administrator/role.vue
src/pages/Attendence/studentAttendence.vue
src/pages/Attendence/viewTeacherAttendence.vue
src/pages/Dashboard/dashboard.vue
src/pages/Mark/mark.vue
src/pages/Mark/viewMark.vue
src/pages/Report/progressCardReport.vue
src/pages/Report/studentReport.vue
src/pages/Students/students.vue
src/pages/User/user.vue
src/router/paths.js
static/icon/accounts.png
static/icon/adminstrator.png
static/icon/attendence.png
static/icon/class.png
static/icon/dashboard icons-01.png
static/icon/dashboard icons-02.png
static/icon/dashboard icons-03.png
@@ -7,7 +7,7 @@ const baseURL = `${baseDomain}`;
  
 export default () => {
     return axios.create({
-        // baseURL: 'http://192.168.0.150:3002/v1',
+        // baseURL: 'http://192.168.0.105:3002/v1',
         baseURL,
         headers: {
             Authorization: `Bearer ${store.state.token}`
@@ -4,53 +4,53 @@ const adminMenu = [
         title: 'Dashboard',
         // group: 'apps',
         name: 'Dashboard',
-        icon: '/static/icon/dashboard icons-04.png',
+        icon: '/static/icon/dashboard.png',
     },
     {
         title: 'Class',
         // group: 'apps',
         name: 'Class',
-        icon: '/static/icon/dashboard icons-03.png',
+        icon: '/static/icon/class.png',
     },
     {
         title: 'Section',
         // group: 'apps',
         name: 'Section',
-        icon: '/static/icon/dashboard icons-05.png',
+        icon: '/static/icon/section.png',
     },
     {
         title: 'Subjects',
         name: 'Subject',
-        icon: '/static/icon/dashboard icons-02.png',
+        icon: '/static/icon/subject.png',
     },
     {
         title: 'Parents',
         // group: 'apps',
         name: 'Parents',
-        icon: '/static/icon/dashboard icons-07.png',
+        icon: '/static/icon/parents.png',
     },
     {
         title: 'Teachers',
         // group: '',
         name: 'Teachers',
-        icon: '/static/icon/dashboard icons-08.png',
+        icon: '/static/icon/teacher.png',
     },
     {
         title: 'Students',
         // group: 'apps',
         name: 'Students',
-        icon: '/static/icon/dashboard icons-09.png',
+        icon: '/static/icon/student.png',
     },
     {
         title: 'User',
         name: 'User',
-        icon: '/static/icon/dashboard icons-06.png',
+        icon: '/static/icon/users.png',
     },
     {
         title: 'Attendance',
         group: 'Attendance',
         component: 'Attendance',
-        icon: '/static/icon/dashboard icons-19.png',
+        icon: '/static/icon/attendence.png',
         items: [
             { name: 'StudentAttendence', title: 'Student Attendance', component: 'StudentAttendence', action: '', },
             { name: 'TeacherAttendence', title: 'Teacher Attendance', component: 'TeacherAttendence', action: '', }
@@ -61,7 +61,7 @@ const adminMenu = [
         title: 'Exam',
         group: 'Exam',
         component: 'Exam',
-        icon: '/static/icon/dashboard icons-21.png',
+        icon: '/static/icon/exam.png',
         items: [
             { name: 'Exam', title: 'Exam', component: 'Exam', action: '', },
             { name: 'ExamSchedule', title: 'Exam Schedule', component: 'ExamSchedule', action: '', },
@@ -70,10 +70,10 @@ const adminMenu = [
         ]
     },
     {
-        title: 'Mark',
+        title: 'Marks',
         group: 'Mark',
         component: 'Mark',
-        icon: '/static/icon/dashboard icons-23.png',
+        icon: '/static/icon/marks.png',
         items: [
             { name: 'Mark', title: 'Mark', component: 'Mark', action: '', },
             { name: 'MarkDistribution', title: 'Mark Distribution', component: 'MarkDistribution', action: '', },
@@ -85,7 +85,7 @@ const adminMenu = [
         title: 'Administrator',
         group: 'Administrator',
         component: 'Administrator',
-        icon: '/static/icon/dashboard icons-25.png',
+        icon: '/static/icon/adminstrator.png',
         items: [
             { name: 'AcademicYear', title: 'Academic Year', component: 'AcademicYear', action: '', },
             // { name: 'systemAdmin', title: 'System Admin', component: 'systemAdmin', action: '', },
@@ -98,12 +98,12 @@ const adminMenu = [
     {
         title: 'Notice Board',
         name: 'NoticeBoard',
-        icon: '/static/icon/dashboard icons-27.png',
+        icon: '/static/icon/notice board.png',
     },
     {
         title: 'News',
         name: 'News',
-        icon: '/static/icon/dashboard icons-41.png',
+        icon: '/static/icon/news.png',
     },
     // {
     //   title: 'Reminder',
@@ -113,13 +113,13 @@ const adminMenu = [
     {
         title: 'Time Table',
         name: 'TimeTable',
-        icon: '/static/icon/dashboard icons-23.png',
+        icon: '/static/icon/time table.png',
     },
     {
         title: 'Library',
         group: 'Library',
         component: 'Library',
-        icon: '/static/icon/dashboard icons-29.png',
+        icon: '/static/icon/library.png',
         items: [
             { name: 'LibraryMember', title: ' Library Member', component: 'LibraryMember', action: '', },
             { name: 'Books', title: 'Books', component: 'Books', action: '', },
@@ -132,7 +132,7 @@ const adminMenu = [
         title: 'Report',
         group: 'Report',
         component: 'Report',
-        icon: '/static/icon/dashboard icons-31.png',
+        icon: '/static/icon/reports.png',
         items: [
             { name: 'studentReport', title: 'Student Report', component: 'studentReport', action: '', },
             { name: 'ProgressCardReport', title: 'Progress Card Report', component: 'ProgressCardReport', action: '', }
@@ -141,7 +141,7 @@ const adminMenu = [
     {
         title: 'Notification',
         name: 'Notification',
-        icon: '/static/icon/dashboard icons-33.png',
+        icon: '/static/icon/notification.png',
     },
     {
         title: 'Social Media',
@@ -151,18 +151,18 @@ const adminMenu = [
     {
         title: 'Gallery',
         name: 'Gallery',
-        icon: '/static/icon/dashboard icons-37.png',
+        icon: '/static/icon/gallery.png',
     },
     {
         title: 'Event',
         name: 'Event',
-        icon: '/static/icon/dashboard icons-39.png',
+        icon: '/static/icon/events.png',
     },
     {
         title: 'Account',
         group: 'Account',
         component: 'Account',
-        icon: '/static/icon/dashboard icons-43.png',
+        icon: '/static/icon/accounts.png',
         items: [
             { name: 'feeTypes', title: 'Fee Types', component: 'feeTypes', action: '', },
             { name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', },
@@ -175,12 +175,12 @@ const adminMenu = [
     {
         title: 'Holiday',
         name: 'Holiday',
-        icon: '/static/icon/dashboard icons-41.png',
+        icon: '/static/icon/holiday.png',
     },
     {
         title: 'General Setting',
         name: 'GeneralSetting',
-        icon: '/static/icon/dashboard icons-45.png',
+        icon: '/static/icon/settings.png',
     }
 ];
  
@@ -257,6 +257,7 @@ export default {
           .post("/createRole", this.addrole)
           .then(response => {
             this.snackbar = true;
+            this.addRoleDialog = false;
             this.text = response.data.message;
             this.getRole();
             this.clear();
@@ -69,7 +69,7 @@
                   class="mr-3"
                   src="/static/icon/dashboard icons-47.png"
                 />
-                <span>Edit</span>
+                <span>View</span>
               </v-tooltip>
             </router-link>
             <v-tooltip top>
 <template>
   <v-container fluid grid-list-md>
     <div v-show="hideData">
-      <!-- <v-layout row>
-        <v-btn color="grey" @click="exportPdf" class="right" dark>
+      <v-layout row>
+        <v-btn @click="exportPdf" round class="right open-dialog-button" dark>
           Export Pdf
           <v-icon dark right size="20">save_alt</v-icon>
         </v-btn>
         <v-dialog v-model="dialogExport" max-width="500px">
-          <v-btn slot="activator" color="grey" class="right" dark>
+          <!-- <v-btn round slot="activator" class="right open-dialog-button" dark>
             Export csv
             <v-icon dark right size="20">save_alt</v-icon>
-          </v-btn>
-          <v-card>
-            <h3 class="text-xs-center py-2 grey lighten-1 white--text">Export</h3>
+          </v-btn> -->
+          <v-card flat class="card-style pa-2" dark>
+            <h3 class=" title text-xs-center">Export</h3>
             <v-card-text>
               <v-container grid-list-md>
                 <v-layout wrap>
@@ -70,14 +70,14 @@
             </v-card-text>
             <v-card-actions>
               <v-spacer></v-spacer>
-              <v-btn color="blue darken-1" flat @click.native="dialogExport = false">Close</v-btn>
+              <v-btn  flat @click.native="dialogExport = false">Close</v-btn>
               <download-csv :data="json_data">
-                <v-btn color="blue darken-1" flat @click.native="exportData">Export</v-btn>
+                <v-btn flat @click.native="exportData">Export</v-btn>
               </download-csv>
             </v-card-actions>
           </v-card>
         </v-dialog>
-      </v-layout>-->
+      </v-layout>
       <v-layout wrap>
         <v-flex xs12 sm12 md4>
           <v-card flat>
@@ -170,16 +170,10 @@
     <v-layout v-show="showPdfData">
       <v-container>
         <v-flex xs12 sm12 md8 offset-sm2>
-          <!-- <v-btn
-            color="grey"
-            @click="generatePDF2Canvas()"
-            :loading="loadingPdf"
-            class="right"
-            dark
-          >
+          <v-btn class="right add-button" @click="generatePDF2Canvas()" :loading="loadingPdf" dark>
             Download
             <v-icon dark right size="20">save_alt</v-icon>
-          </v-btn>-->
+          </v-btn>
         </v-flex>
       </v-container>
     </v-layout>
@@ -189,58 +183,48 @@
           <v-flex xs12 sm12 md8 offset-sm2>
             <div ref="printMe">
               <v-flex xs12 class="pl-3">
-                <!-- <v-layout>
+                <v-layout>
                   <v-flex xs6 sm2 class="pa-0 mb-1">
                     <h4>
                       <b>Name</b>
                     </h4>
                   </v-flex>
                   <v-flex sm10 xs6 class="pa-0">
-                    <h4>: {{ studentData.name }}</h4>
+                    <h4>: {{ teacherData.name }}</h4>
                   </v-flex>
                 </v-layout>
                 <v-layout>
                   <v-flex xs6 sm2 class="pa-0 mb-1">
                     <h4>
-                      <b>Type</b>
+                      <b>Email</b>
                     </h4>
                   </v-flex>
                   <v-flex sm10 xs6 class="pa-0 mb-1">
-                    <h4>: Student</h4>
+                    <h4>: {{ teacherData.email }}</h4>
                   </v-flex>
                 </v-layout>
                 <v-layout>
                   <v-flex xs6 sm2 class="pa-0 mb-1">
                     <h4>
-                      <b>Roll No</b>
+                      <b>City</b>
                     </h4>
                   </v-flex>
-                  <v-flex sm10 xs6 class="pa-0 mb-1">
-                    <h4>: {{ studentData.rollNo }}</h4>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs6 sm2 class="pa-0 mb-1">
-                    <h4>
-                      <b>Class</b>
-                    </h4>
-                  </v-flex>
-                  <v-flex sm10 xs6 class="pa-0 mb-1">
-                    <h4>: {{ studentData.classId.classNum }}</h4>
+                  <v-flex sm10 xs6 class="pa-0 mb-3">
+                    <h4>: {{ teacherData.city}}</h4>
                   </v-flex>
                 </v-layout>
                 <v-layout>
                   <v-flex xs6 sm2 class="pa-0 mb-1">
                     <h4>
-                      <b>Section</b>
+                      <b>Mobile No</b>
                     </h4>
                   </v-flex>
                   <v-flex sm10 xs6 class="pa-0 mb-3">
-                    <h4>: {{ studentData.sectionId.name}}</h4>
+                    <h4>: {{ teacherData.mobileNo}}</h4>
                   </v-flex>
-                </v-layout>-->
+                </v-layout>
               </v-flex>
-              <!-- <v-card flat>
+              <v-card flat>
                 <h3 class="py-2 text-xs-center grey lighten-1 white--text">
                   Attendence
                   <span class="ml-4">
@@ -257,8 +241,8 @@
                   :activeDates="activeDates"
                   prefixClass="your_customized_wrapper_class"
                   :activeClass="activeClass"
-                ></YearCalendactiveDatesar>
-              </v-card>-->
+                ></YearCalendar>
+              </v-card>
             </div>
           </v-flex>
         </v-layout>
@@ -405,27 +389,46 @@ export default {
 //           // this.$router.replace({ path: '/' });
 //         });
 //     },
-//     exportPdf(){
-//         this.hideData = false;
-//         this.showPdfData = true   
-//     },
-//      async  generatePDF2Canvas(){
-//             this.loadingPdf = true
-//             const el = this.$refs.printMe;
-//             // add option type to get the image version
-//             // if not provided the promise will return 
-//             // the canvas.
-//             const options = {
-//                 type: 'dataURL'
-//             }
-//             this.output = await this.$html2canvas(el, options);
-//             if(this.output) {
-//                this.loadingPdf = false
-//             }
-//             let doc = new jsPDF();
-//             doc.addImage(this.output, 'JPEG', 5, 10, 200, 280);
-//             doc.save("Attendance.pdf");
-//         }
+    exportPdf(){
+        this.hideData = false;
+        this.showPdfData = true   
+    },
+     async  generatePDF2Canvas(){
+            this.loadingPdf = true
+            const el = this.$refs.printMe;
+            // add option type to get the image version
+            // if not provided the promise will return 
+            // the canvas.
+            const options = {
+                type: 'dataURL'
+            }
+            this.output = await this.$html2canvas(el, options);
+            if(this.output) {
+               this.loadingPdf = false
+            }
+            let doc = new jsPDF();
+            doc.addImage(this.output, 'JPEG', 5, 10, 200, 280);
+            doc.save("Attendance.pdf");
+        }
   }
 };
 </script>
+<style scoped>
+.add-button {
+  background: #feb83c !important;
+  border-color: #feb83c !important;
+  text-transform: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+.card-style {
+  background: #7f62f8 !important;
+  border-color: #7f62f8 !important;
+  border-radius: 12px;
+}
+.open-dialog-button {
+  background: #827bfa !important;
+  border-color: #827bfa !important;
+  text-transform: none !important;
+}
+</style>
@@ -61,7 +61,7 @@
                       <v-card class="card pink-bgcolor">
                         <v-card-title primary-title class="titleCard white--text py-3">Students</v-card-title>
                         <img
-                          src="/static/icon/dashboard icons-09.png"
+                          src="/static/icon/student.png"
                           class="ml-2"
                           width="40"
                           alt="icons"
@@ -76,7 +76,7 @@
                       <v-card flat class="card elevation-2 firozi-bgcolor">
                         <v-card-title primary-title class="titleCard white--text py-3">Teachers</v-card-title>
                         <img
-                          src="/static/icon/dashboard icons-08.png"
+                          src="/static/icon/teacher.png"
                           class="ml-2"
                           width="40"
                           alt="icons"
@@ -92,7 +92,7 @@
                       <v-card flat class="card yellow darken-3">
                         <v-card-title primary-title class="titleCard white--text py-3">Parents</v-card-title>
                         <img
-                          src="/static/icon/dashboard icons-07.png"
+                          src="/static/icon/parents.png"
                           class="ml-3"
                           width="40px"
                           alt="icons"
@@ -107,7 +107,7 @@
                       <v-card flat class="card darkBlue-bgcolor">
                         <v-card-title primary-title class="titleCard white--text py-3">Class</v-card-title>
                         <img
-                          src="/static/icon/dashboard icons-03.png"
+                          src="/static/icon/class.png"
                           width="40"
                           alt="icons"
                           class="ml-2"
@@ -239,7 +239,7 @@
                   <b>Profile</b>
                 </h4>
                 <v-flex xs12 class="py-3">
-                  <v-layout wrap class="text-center">
+                  <v-layout wrap>
                     <v-flex xs12 sm12 md4>
                       <img src="/static/icon/user.png" v-if="!userData.schoolLogoUrl" width="80" />
                       <img
@@ -298,7 +298,13 @@
               <v-flex xs12 sm12>
                 <v-layout>
                   <v-flex xs12>
-                    <v-btn @click="submit" round dark :loading="loading" class="right add-button">Add Mark</v-btn>
+                    <v-btn
+                      @click="submit"
+                      round
+                      dark
+                      :loading="loading"
+                      class="right add-button"
+                    >Add Mark</v-btn>
                   </v-flex>
                 </v-layout>
               </v-flex>
@@ -559,6 +565,7 @@ export default {
           .then(response => {
             this.getStudentData = [];
             this.snackbar = true;
+            this.addMarkDialog = false;
             this.text = response.data.message;
             this.color = "green";
             this.loading = false;
@@ -21,124 +21,76 @@
       </v-layout>
       <v-flex xs12 sm12 id="printMe">
         <v-layout wrap>
-          <v-flex xs12 sm12 md3>
-            <v-card flat>
-              <v-flex xs12 class="card-styles white--text">
-                <v-card-actions class="pa-0">
-                  <v-spacer></v-spacer>
-                  <v-card-title class="pa-1">
-                    <h3>Profile</h3>
-                  </v-card-title>
-                  <v-spacer></v-spacer>
-                </v-card-actions>
-              </v-flex>
-              <v-layout
-                wrap
-                v-for="(value, id, index) in filterData"
-                v-if="index == 0"
-                :key="index"
-              >
-                <v-flex xs12 style="margin:16px;">
-                  <v-layout>
-                    <v-flex xs12>
-                      <v-avatar
-                        size="100px"
-                        class="mx-auto"
-                        style="margin: auto;display:block;margin-bottom:10px !important"
-                      >
-                        <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 style="text-align:center;">
-                      <h3>
-                        <b>{{ value[0].studentId.name }}</b>
-                      </h3>
-                      <p class="grey--text">Student</p>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout
-                    style="border: 1px solid lightgrey;padding: 4px;border-top-right-radius: 4px;
-                     border-top-left-radius: 4px;"
-                  >
-                    <v-flex xs6 sm3 class="py-1">
-                      <h4>
-                        <b>RollNo</b>
-                      </h4>
-                    </v-flex>
-                    <v-flex sm9 xs7 class="py-1">
-                      <h4>: {{ value[0].studentId.rollNo }}</h4>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout style="border: 1px solid lightgrey;padding: 4px;">
-                    <v-flex xs6 sm3 class="py-1">
-                      <h4>
-                        <b>Class</b>
-                      </h4>
-                    </v-flex>
-                    <v-flex sm9 xs8 class="py-1">
-                      <h4>: {{value[0].classId.classNum }}</h4>
-                    </v-flex>
-                  </v-layout>
-                  <v-layout
-                    style="border: 1px solid lightgrey;padding: 4px;border-bottom-right-radius: 4px;
-                     border-bottom-left-radius: 4px;"
-                  >
-                    <v-flex xs6 sm3 class>
-                      <h4>
-                        <b>Section</b>
-                      </h4>
-                    </v-flex>
-                    <v-flex sm9 xs6 class>
-                      <h4>: {{ value[0].sectionId.name}}</h4>
-                    </v-flex>
-                  </v-layout>
-                </v-flex>
-              </v-layout>
-              <v-layout v-if="markData == ''">
-                <v-flex xs12>
-                  <h5 class="text-xs-center pa-3">No Data Found</h5>
-                </v-flex>
-              </v-layout>
-            </v-card>
-          </v-flex>
-
-          <!-- ****** TABLE DATA TOTAL MARK  ****** -->
-
-          <v-flex xs12 sm12 md9 v-show="showMark">
-            <v-flex xs12 class="card-styles white--text" flat>
-              <v-card-actions class="pa-0">
-                <v-spacer></v-spacer>
-                <v-card-title class="pa-1">
-                  <h3>Mark</h3>
-                </v-card-title>
-                <v-spacer></v-spacer>
-              </v-card-actions>
-            </v-flex>
+          <!-- ****** TABLE DATA MARK  ****** -->
+          <v-flex xs12 sm12 md12>
             <v-card
               v-for="(value, id, index) in filterData"
               :key="index"
               flat
-              style="border: 1px solid lightgrey;margin-bottom:14px;"
+              style="border: 1px solid lightgrey;margin-bottom:14px;padding:20px"
             >
+              <v-layout v-if="index === 0">
+                <v-flex xs12 style="border-bottom: 1px solid #707478;padding-bottom:6px !important">
+                  <img :src="userData.schoolLogoUrl" v-if="userData.schoolLogoUrl" width="100" />
+                  <img src="/static/icon/user.png" v-else-if="!userData.schoolLogoUrl" width="100" />
+                </v-flex>
+              </v-layout>
+              <v-layout style="padding-top:10px" v-if="index === 0">
+                <v-flex xs5>
+                  <p style="margin:0px;margin-bottom:4px">
+                    <span style="font-size:20px">{{ userData.name }}</span>
+                    <br />
+                    <span style="font-size: 15px;color: #707478;">{{ userData.address }}</span>
+                  </p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >phone : {{ userData.mobile }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Email : {{ userData.email }}</p>
+                </v-flex>
+                <v-flex xs5>
+                  <p
+                    style="font-size:20px;margin:0px;margin-bottom:4px;"
+                  >{{ value[0].studentId.name }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Class : {{ value[0].classId.classNum }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Roll NO : {{ value[0].studentId.rollNo }}</p>
+                  <p
+                    style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
+                  >Section : {{ value[0].sectionId.name }}</p>
+                </v-flex>
+                <v-flex xs2>
+                  <v-avatar size="100">
+                    <img
+                      :src="value[0].studentId.profilePicUrl"
+                      v-if="value[0].studentId.profilePicUrl"
+                      width="100px"
+                    />
+                    <img
+                      src="/static/icon/user.png"
+                      v-else-if="!value[0].studentId.profilePicUrl"
+                      width="100px"
+                    />
+                  </v-avatar>
+                </v-flex>
+              </v-layout>
               <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
               <table
                 class="mb-5 tableRsponsive feeTypeTable"
                 style="border: 1px solid lightgrey;
                   border-collapse: collapse;!important
                   table-layout: auto !important;
-                  width: 100% !important;"
+                  width: 100% !important;
+                  overflow: hidden; 
+                  display: block;"
+                  
               >
                 <thead style="border: 1px solid lightgrey !important;">
-                  <tr
-                    class="info white--text"
-                    style="border: 1px solid lightgrey !important;padding:4px;"
-                  >
+                  <tr style="border: 1px solid lightgrey !important;padding:4px;">
                     <td
                       rowspan="2"
                       style="border: 1px solid lightgrey !important;padding: 10px;"
@@ -159,16 +111,16 @@
                   >
                     <template v-for="(exam, i) in subject.studentsMarks">
                       <td
-                        class="bg-sky white--text"
+                        
                         style="border: 1px solid lightgrey !important;padding: 10px;"
                       >Mark</td>
                       <td
-                        class="bg-sky-light white--text"
+                        
                         style="border: 1px solid lightgrey !important;padding: 10px;"
                       >Highest Mark</td>
                     </template>
                     <td
-                      class="bg-sky white--text"
+                      
                       style="border: 1px solid lightgrey !important;padding: 10px;"
                     >Mark</td>
                   </tr>
@@ -193,67 +145,6 @@
                 </tbody>
               </table>
             </v-card>
-            <v-card v-if="markData == ''">
-              <v-layout>
-                <v-flex xs12>
-                  <h5 class="text-xs-center pa-3">No Data Found</h5>
-                </v-flex>
-              </v-layout>
-            </v-card>
-          </v-flex>
-          <!-- ****** TABLE GRADE MARK  ****** -->
-          <v-flex xs12 sm12 md9 v-show="showGrade">
-            <v-card class="fixcolors white--text" flat>
-              <v-card-actions class="pa-0">
-                <v-spacer></v-spacer>
-                <v-card-title class="pa-2">
-                  <h3>Mark</h3>
-                </v-card-title>
-                <v-spacer></v-spacer>
-              </v-card-actions>
-            </v-card>
-            <v-card
-              v-for="(value, id, index) in filterData"
-              :key="index"
-              flat
-              style="border: 1px solid lightgrey;margin-bottom:14px;"
-            >
-              <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
-              <table
-                class="mb-5 tableRsponsive feeTypeTable"
-                style="border: 1px solid lightgrey;
-                  border-collapse: collapse;!important
-                  table-layout: auto !important;
-                  width: 100% !important;"
-              >
-                <thead style="border: 1px solid lightgrey !important;">
-                  <tr
-                    class="info white--text"
-                    style="border: 1px solid lightgrey !important;padding:4px;"
-                  >
-                    <td style="border: 1px solid lightgrey !important;padding: 10px;">Subject</td>
-                    <td style="border: 1px solid lightgrey !important;padding: 10px;">Grade</td>
-                  </tr>
-                </thead>
-                <tbody style="border: 1px solid lightgrey !important;">
-                  <tr v-for="subject in value" style="border: 1px solid lightgrey !important;">
-                    <td
-                      style="border: 1px solid lightgrey !important;padding: 10px;"
-                    >{{ subject.subjectName }}</td>
-                    <td
-                      style="border: 1px solid lightgrey !important;padding: 10px;"
-                    >{{ subject.grade }}</td>
-                  </tr>
-                </tbody>
-              </table>
-            </v-card>
-            <v-card v-if="markData == ''">
-              <v-layout>
-                <v-flex xs12>
-                  <h5 class="text-xs-center pa-3">No Data Found</h5>
-                </v-flex>
-              </v-layout>
-            </v-card>
           </v-flex>
         </v-layout>
       </v-flex>
@@ -289,11 +180,14 @@ export default {
     gradeC: "C",
     selectMarkList: "Mark",
     selectMark: ["Mark", "Grade"],
-    MarkData: ""
+    MarkData: "",
+    userData: {}
+
   }),
   mounted() {
     this.token = this.$store.state.token;
     this.getMarkList();
+    this.getUserData();
   },
   methods: {
     getMarkList() {
@@ -359,6 +253,20 @@ export default {
       // Pass the element id here
       this.$htmlToPaper("printMe");
     },
+    getUserData() {
+      http()
+        .get("/getParticularUserDetail")
+        .then(response => {
+          this.userData = response.data.data;
+        })
+        .catch(error => {
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+          }
+        });
+    },
     selectMarkData(select) {
       if (select == "Mark") {
         this.showMark = true;
@@ -151,7 +151,10 @@
                 style="border: 1px solid lightgrey;
                   border-collapse: collapse;!important
                   table-layout: auto !important;
-                  width: 100% !important;"
+                  width: 100% !important;
+                  overflow: hidden; 
+                  display: block;"
+                  
               >
                 <thead style="border: 1px solid lightgrey !important;">
                   <tr style="border: 1px solid lightgrey !important;padding:4px;">
@@ -264,9 +264,9 @@
                 <td
                   style="border: 1px solid lightgrey !important;padding: 6px;"
                 >{{ studentReport.name }}</td>
-                <td
+                <!-- <td
                   style="border: 1px solid lightgrey !important;padding: 6px;"
-                >{{ studentReport.rollNo }}</td>
+                >{{ studentReport.rollNo }}</td> -->
                 <td
                   style="border: 1px solid lightgrey !important;padding: 6px;"
                 >{{ studentReport.email }}</td>
@@ -815,9 +815,9 @@
         <v-icon class="white--text pr-1" size="20">add</v-icon>Add Student
       </v-btn>
       <v-card-actions class="hidden-xs-only hidden-sm-only">
-        <v-flex md12 lg12>
+        <v-flex md13 lg12>
           <v-layout>
-            <v-flex lg3 md3>
+            <v-flex lg3 md4>
               <v-select
                 :items="addclass"
                 label="Select Class"
@@ -831,7 +831,7 @@
                 class="ml-2"
               ></v-select>
             </v-flex>
-            <v-flex lg3 md3 class="ml-2">
+            <v-flex lg3 md4 class="ml-2">
               <v-layout>
                 <v-select
                   :items="addSection"
@@ -1529,10 +1529,9 @@
                                 <v-text-field
                                   v-model="addStudents.mobile"
                                   placeholder="fill your MobileNo"
-                                  :rules="mobileNoRule"
                                   name="mobileNo"
                                   type="number"
-                                  required
+                                  
                                 ></v-text-field>
                               </v-flex>
                             </v-layout>
@@ -1034,6 +1034,7 @@ export default {
             this.imageUrl = "";
             this.getUsersList();
             this.snackbar = true;
+            this.addUserDialog = false;
             this.text = response.data.message;
             this.color = "green";
             this.clear();
@@ -133,7 +133,7 @@ export default [{
     {
         path: '/noticeBoard',
         meta: {},
-        name: 'NoticeBoard',
+        name: 'Notice Board',
         props: (route) => ({ type: route.query.type }),
         component: () =>
             import (
...	...	@@ -7,7 +7,7 @@ const baseURL = `${baseDomain}`;
7	7
8	8	export default () => {
9	9	return axios.create({
10		- // baseURL: 'http://192.168.0.150:3002/v1',
	10	+ // baseURL: 'http://192.168.0.105:3002/v1',
11	11	baseURL,
12	12	headers: {
13	13	Authorization: `Bearer ${store.state.token}`
...	...
...	...	@@ -4,53 +4,53 @@ const adminMenu = [
4	4	title: 'Dashboard',
5	5	// group: 'apps',
6	6	name: 'Dashboard',
7		- icon: '/static/icon/dashboard icons-04.png',
	7	+ icon: '/static/icon/dashboard.png',
8	8	},
9	9	{
10	10	title: 'Class',
11	11	// group: 'apps',
12	12	name: 'Class',
13		- icon: '/static/icon/dashboard icons-03.png',
	13	+ icon: '/static/icon/class.png',
14	14	},
15	15	{
16	16	title: 'Section',
17	17	// group: 'apps',
18	18	name: 'Section',
19		- icon: '/static/icon/dashboard icons-05.png',
	19	+ icon: '/static/icon/section.png',
20	20	},
21	21	{
22	22	title: 'Subjects',
23	23	name: 'Subject',
24		- icon: '/static/icon/dashboard icons-02.png',
	24	+ icon: '/static/icon/subject.png',
25	25	},
26	26	{
27	27	title: 'Parents',
28	28	// group: 'apps',
29	29	name: 'Parents',
30		- icon: '/static/icon/dashboard icons-07.png',
	30	+ icon: '/static/icon/parents.png',
31	31	},
32	32	{
33	33	title: 'Teachers',
34	34	// group: '',
35	35	name: 'Teachers',
36		- icon: '/static/icon/dashboard icons-08.png',
	36	+ icon: '/static/icon/teacher.png',
37	37	},
38	38	{
39	39	title: 'Students',
40	40	// group: 'apps',
41	41	name: 'Students',
42		- icon: '/static/icon/dashboard icons-09.png',
	42	+ icon: '/static/icon/student.png',
43	43	},
44	44	{
45	45	title: 'User',
46	46	name: 'User',
47		- icon: '/static/icon/dashboard icons-06.png',
	47	+ icon: '/static/icon/users.png',
48	48	},
49	49	{
50	50	title: 'Attendance',
51	51	group: 'Attendance',
52	52	component: 'Attendance',
53		- icon: '/static/icon/dashboard icons-19.png',
	53	+ icon: '/static/icon/attendence.png',
54	54	items: [
55	55	{ name: 'StudentAttendence', title: 'Student Attendance', component: 'StudentAttendence', action: '', },
56	56	{ name: 'TeacherAttendence', title: 'Teacher Attendance', component: 'TeacherAttendence', action: '', }
...	...	@@ -61,7 +61,7 @@ const adminMenu = [
61	61	title: 'Exam',
62	62	group: 'Exam',
63	63	component: 'Exam',
64		- icon: '/static/icon/dashboard icons-21.png',
	64	+ icon: '/static/icon/exam.png',
65	65	items: [
66	66	{ name: 'Exam', title: 'Exam', component: 'Exam', action: '', },
67	67	{ name: 'ExamSchedule', title: 'Exam Schedule', component: 'ExamSchedule', action: '', },
...	...	@@ -70,10 +70,10 @@ const adminMenu = [
70	70	]
71	71	},
72	72	{
73		- title: 'Mark',
	73	+ title: 'Marks',
74	74	group: 'Mark',
75	75	component: 'Mark',
76		- icon: '/static/icon/dashboard icons-23.png',
	76	+ icon: '/static/icon/marks.png',
77	77	items: [
78	78	{ name: 'Mark', title: 'Mark', component: 'Mark', action: '', },
79	79	{ name: 'MarkDistribution', title: 'Mark Distribution', component: 'MarkDistribution', action: '', },
...	...	@@ -85,7 +85,7 @@ const adminMenu = [
85	85	title: 'Administrator',
86	86	group: 'Administrator',
87	87	component: 'Administrator',
88		- icon: '/static/icon/dashboard icons-25.png',
	88	+ icon: '/static/icon/adminstrator.png',
89	89	items: [
90	90	{ name: 'AcademicYear', title: 'Academic Year', component: 'AcademicYear', action: '', },
91	91	// { name: 'systemAdmin', title: 'System Admin', component: 'systemAdmin', action: '', },
...	...	@@ -98,12 +98,12 @@ const adminMenu = [
98	98	{
99	99	title: 'Notice Board',
100	100	name: 'NoticeBoard',
101		- icon: '/static/icon/dashboard icons-27.png',
	101	+ icon: '/static/icon/notice board.png',
102	102	},
103	103	{
104	104	title: 'News',
105	105	name: 'News',
106		- icon: '/static/icon/dashboard icons-41.png',
	106	+ icon: '/static/icon/news.png',
107	107	},
108	108	// {
109	109	// title: 'Reminder',
...	...	@@ -113,13 +113,13 @@ const adminMenu = [
113	113	{
114	114	title: 'Time Table',
115	115	name: 'TimeTable',
116		- icon: '/static/icon/dashboard icons-23.png',
	116	+ icon: '/static/icon/time table.png',
117	117	},
118	118	{
119	119	title: 'Library',
120	120	group: 'Library',
121	121	component: 'Library',
122		- icon: '/static/icon/dashboard icons-29.png',
	122	+ icon: '/static/icon/library.png',
123	123	items: [
124	124	{ name: 'LibraryMember', title: ' Library Member', component: 'LibraryMember', action: '', },
125	125	{ name: 'Books', title: 'Books', component: 'Books', action: '', },
...	...	@@ -132,7 +132,7 @@ const adminMenu = [
132	132	title: 'Report',
133	133	group: 'Report',
134	134	component: 'Report',
135		- icon: '/static/icon/dashboard icons-31.png',
	135	+ icon: '/static/icon/reports.png',
136	136	items: [
137	137	{ name: 'studentReport', title: 'Student Report', component: 'studentReport', action: '', },
138	138	{ name: 'ProgressCardReport', title: 'Progress Card Report', component: 'ProgressCardReport', action: '', }
...	...	@@ -141,7 +141,7 @@ const adminMenu = [
141	141	{
142	142	title: 'Notification',
143	143	name: 'Notification',
144		- icon: '/static/icon/dashboard icons-33.png',
	144	+ icon: '/static/icon/notification.png',
145	145	},
146	146	{
147	147	title: 'Social Media',
...	...	@@ -151,18 +151,18 @@ const adminMenu = [
151	151	{
152	152	title: 'Gallery',
153	153	name: 'Gallery',
154		- icon: '/static/icon/dashboard icons-37.png',
	154	+ icon: '/static/icon/gallery.png',
155	155	},
156	156	{
157	157	title: 'Event',
158	158	name: 'Event',
159		- icon: '/static/icon/dashboard icons-39.png',
	159	+ icon: '/static/icon/events.png',
160	160	},
161	161	{
162	162	title: 'Account',
163	163	group: 'Account',
164	164	component: 'Account',
165		- icon: '/static/icon/dashboard icons-43.png',
	165	+ icon: '/static/icon/accounts.png',
166	166	items: [
167	167	{ name: 'feeTypes', title: 'Fee Types', component: 'feeTypes', action: '', },
168	168	{ name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', },
...	...	@@ -175,12 +175,12 @@ const adminMenu = [
175	175	{
176	176	title: 'Holiday',
177	177	name: 'Holiday',
178		- icon: '/static/icon/dashboard icons-41.png',
	178	+ icon: '/static/icon/holiday.png',
179	179	},
180	180	{
181	181	title: 'General Setting',
182	182	name: 'GeneralSetting',
183		- icon: '/static/icon/dashboard icons-45.png',
	183	+ icon: '/static/icon/settings.png',
184	184	}
185	185	];
186	186
...	...
...	...	@@ -257,6 +257,7 @@ export default {
257	257	.post("/createRole", this.addrole)
258	258	.then(response => {
259	259	this.snackbar = true;
	260	+ this.addRoleDialog = false;
260	261	this.text = response.data.message;
261	262	this.getRole();
262	263	this.clear();
...	...
...	...	@@ -69,7 +69,7 @@
69	69	class="mr-3"
70	70	src="/static/icon/dashboard icons-47.png"
71	71	/>
72		- <span>Edit</span>
	72	+ <span>View</span>
73	73	</v-tooltip>
74	74	</router-link>
75	75	<v-tooltip top>
...	...
1	1	<template>
2	2	<v-container fluid grid-list-md>
3	3	<div v-show="hideData">
4		- <!-- <v-layout row>
5		- <v-btn color="grey" @click="exportPdf" class="right" dark>
	4	+ <v-layout row>
	5	+ <v-btn @click="exportPdf" round class="right open-dialog-button" dark>
6	6	Export Pdf
7	7	<v-icon dark right size="20">save_alt</v-icon>
8	8	</v-btn>
9	9	<v-dialog v-model="dialogExport" max-width="500px">
10		- <v-btn slot="activator" color="grey" class="right" dark>
	10	+ <!-- <v-btn round slot="activator" class="right open-dialog-button" dark>
11	11	Export csv
12	12	<v-icon dark right size="20">save_alt</v-icon>
13		- </v-btn>
14		- <v-card>
15		- <h3 class="text-xs-center py-2 grey lighten-1 white--text">Export</h3>
	13	+ </v-btn> -->
	14	+ <v-card flat class="card-style pa-2" dark>
	15	+ <h3 class=" title text-xs-center">Export</h3>
16	16	<v-card-text>
17	17	<v-container grid-list-md>
18	18	<v-layout wrap>
...	...	@@ -70,14 +70,14 @@
70	70	</v-card-text>
71	71	<v-card-actions>
72	72	<v-spacer></v-spacer>
73		- <v-btn color="blue darken-1" flat @click.native="dialogExport = false">Close</v-btn>
	73	+ <v-btn flat @click.native="dialogExport = false">Close</v-btn>
74	74	<download-csv :data="json_data">
75		- <v-btn color="blue darken-1" flat @click.native="exportData">Export</v-btn>
	75	+ <v-btn flat @click.native="exportData">Export</v-btn>
76	76	</download-csv>
77	77	</v-card-actions>
78	78	</v-card>
79	79	</v-dialog>
80		- </v-layout>-->
	80	+ </v-layout>
81	81	<v-layout wrap>
82	82	<v-flex xs12 sm12 md4>
83	83	<v-card flat>
...	...	@@ -170,16 +170,10 @@
170	170	<v-layout v-show="showPdfData">
171	171	<v-container>
172	172	<v-flex xs12 sm12 md8 offset-sm2>
173		- <!-- <v-btn
174		- color="grey"
175		- @click="generatePDF2Canvas()"
176		- :loading="loadingPdf"
177		- class="right"
178		- dark
179		- >
	173	+ <v-btn class="right add-button" @click="generatePDF2Canvas()" :loading="loadingPdf" dark>
180	174	Download
181	175	<v-icon dark right size="20">save_alt</v-icon>
182		- </v-btn>-->
	176	+ </v-btn>
183	177	</v-flex>
184	178	</v-container>
185	179	</v-layout>
...	...	@@ -189,58 +183,48 @@
189	183	<v-flex xs12 sm12 md8 offset-sm2>
190	184	<div ref="printMe">
191	185	<v-flex xs12 class="pl-3">
192		- <!-- <v-layout>
	186	+ <v-layout>
193	187	<v-flex xs6 sm2 class="pa-0 mb-1">
194	188	<h4>
195	189	<b>Name</b>
196	190	</h4>
197	191	</v-flex>
198	192	<v-flex sm10 xs6 class="pa-0">
199		- <h4>: {{ studentData.name }}</h4>
	193	+ <h4>: {{ teacherData.name }}</h4>
200	194	</v-flex>
201	195	</v-layout>
202	196	<v-layout>
203	197	<v-flex xs6 sm2 class="pa-0 mb-1">
204	198	<h4>
205		- <b>Type</b>
	199	+ <b>Email</b>
206	200	</h4>
207	201	</v-flex>
208	202	<v-flex sm10 xs6 class="pa-0 mb-1">
209		- <h4>: Student</h4>
	203	+ <h4>: {{ teacherData.email }}</h4>
210	204	</v-flex>
211	205	</v-layout>
212	206	<v-layout>
213	207	<v-flex xs6 sm2 class="pa-0 mb-1">
214	208	<h4>
215		- <b>Roll No</b>
	209	+ <b>City</b>
216	210	</h4>
217	211	</v-flex>
218		- <v-flex sm10 xs6 class="pa-0 mb-1">
219		- <h4>: {{ studentData.rollNo }}</h4>
220		- </v-flex>
221		- </v-layout>
222		- <v-layout>
223		- <v-flex xs6 sm2 class="pa-0 mb-1">
224		- <h4>
225		- <b>Class</b>
226		- </h4>
227		- </v-flex>
228		- <v-flex sm10 xs6 class="pa-0 mb-1">
229		- <h4>: {{ studentData.classId.classNum }}</h4>
	212	+ <v-flex sm10 xs6 class="pa-0 mb-3">
	213	+ <h4>: {{ teacherData.city}}</h4>
230	214	</v-flex>
231	215	</v-layout>
232	216	<v-layout>
233	217	<v-flex xs6 sm2 class="pa-0 mb-1">
234	218	<h4>
235		- <b>Section</b>
	219	+ <b>Mobile No</b>
236	220	</h4>
237	221	</v-flex>
238	222	<v-flex sm10 xs6 class="pa-0 mb-3">
239		- <h4>: {{ studentData.sectionId.name}}</h4>
	223	+ <h4>: {{ teacherData.mobileNo}}</h4>
240	224	</v-flex>
241		- </v-layout>-->
	225	+ </v-layout>
242	226	</v-flex>
243		- <!-- <v-card flat>
	227	+ <v-card flat>
244	228	<h3 class="py-2 text-xs-center grey lighten-1 white--text">
245	229	Attendence
246	230	<span class="ml-4">
...	...	@@ -257,8 +241,8 @@
257	241	:activeDates="activeDates"
258	242	prefixClass="your_customized_wrapper_class"
259	243	:activeClass="activeClass"
260		- ></YearCalendactiveDatesar>
261		- </v-card>-->
	244	+ ></YearCalendar>
	245	+ </v-card>
262	246	</div>
263	247	</v-flex>
264	248	</v-layout>
...	...	@@ -405,27 +389,46 @@ export default {
405	389	// // this.$router.replace({ path: '/' });
406	390	// });
407	391	// },
408		-// exportPdf(){
409		-// this.hideData = false;
410		-// this.showPdfData = true
411		-// },
412		-// async generatePDF2Canvas(){
413		-// this.loadingPdf = true
414		-// const el = this.$refs.printMe;
415		-// // add option type to get the image version
416		-// // if not provided the promise will return
417		-// // the canvas.
418		-// const options = {
419		-// type: 'dataURL'
420		-// }
421		-// this.output = await this.$html2canvas(el, options);
422		-// if(this.output) {
423		-// this.loadingPdf = false
424		-// }
425		-// let doc = new jsPDF();
426		-// doc.addImage(this.output, 'JPEG', 5, 10, 200, 280);
427		-// doc.save("Attendance.pdf");
428		-// }
	392	+ exportPdf(){
	393	+ this.hideData = false;
	394	+ this.showPdfData = true
	395	+ },
	396	+ async generatePDF2Canvas(){
	397	+ this.loadingPdf = true
	398	+ const el = this.$refs.printMe;
	399	+ // add option type to get the image version
	400	+ // if not provided the promise will return
	401	+ // the canvas.
	402	+ const options = {
	403	+ type: 'dataURL'
	404	+ }
	405	+ this.output = await this.$html2canvas(el, options);
	406	+ if(this.output) {
	407	+ this.loadingPdf = false
	408	+ }
	409	+ let doc = new jsPDF();
	410	+ doc.addImage(this.output, 'JPEG', 5, 10, 200, 280);
	411	+ doc.save("Attendance.pdf");
	412	+ }
429	413	}
430	414	};
431	415	</script>
	416	+<style scoped>
	417	+.add-button {
	418	+ background: #feb83c !important;
	419	+ border-color: #feb83c !important;
	420	+ text-transform: none !important;
	421	+ -webkit-box-shadow: none !important;
	422	+ box-shadow: none !important;
	423	+}
	424	+.card-style {
	425	+ background: #7f62f8 !important;
	426	+ border-color: #7f62f8 !important;
	427	+ border-radius: 12px;
	428	+}
	429	+.open-dialog-button {
	430	+ background: #827bfa !important;
	431	+ border-color: #827bfa !important;
	432	+ text-transform: none !important;
	433	+}
	434	+</style>
...	...
...	...	@@ -61,7 +61,7 @@
61	61	<v-card class="card pink-bgcolor">
62	62	<v-card-title primary-title class="titleCard white--text py-3">Students</v-card-title>
63	63	<img
64		- src="/static/icon/dashboard icons-09.png"
	64	+ src="/static/icon/student.png"
65	65	class="ml-2"
66	66	width="40"
67	67	alt="icons"
...	...	@@ -76,7 +76,7 @@
76	76	<v-card flat class="card elevation-2 firozi-bgcolor">
77	77	<v-card-title primary-title class="titleCard white--text py-3">Teachers</v-card-title>
78	78	<img
79		- src="/static/icon/dashboard icons-08.png"
	79	+ src="/static/icon/teacher.png"
80	80	class="ml-2"
81	81	width="40"
82	82	alt="icons"
...	...	@@ -92,7 +92,7 @@
92	92	<v-card flat class="card yellow darken-3">
93	93	<v-card-title primary-title class="titleCard white--text py-3">Parents</v-card-title>
94	94	<img
95		- src="/static/icon/dashboard icons-07.png"
	95	+ src="/static/icon/parents.png"
96	96	class="ml-3"
97	97	width="40px"
98	98	alt="icons"
...	...	@@ -107,7 +107,7 @@
107	107	<v-card flat class="card darkBlue-bgcolor">
108	108	<v-card-title primary-title class="titleCard white--text py-3">Class</v-card-title>
109	109	<img
110		- src="/static/icon/dashboard icons-03.png"
	110	+ src="/static/icon/class.png"
111	111	width="40"
112	112	alt="icons"
113	113	class="ml-2"
...	...	@@ -239,7 +239,7 @@
239	239	<b>Profile</b>
240	240	</h4>
241	241	<v-flex xs12 class="py-3">
242		- <v-layout wrap class="text-center">
	242	+ <v-layout wrap>
243	243	<v-flex xs12 sm12 md4>
244	244	<img src="/static/icon/user.png" v-if="!userData.schoolLogoUrl" width="80" />
245	245	<img
...	...
...	...	@@ -298,7 +298,13 @@
298	298	<v-flex xs12 sm12>
299	299	<v-layout>
300	300	<v-flex xs12>
301		- <v-btn @click="submit" round dark :loading="loading" class="right add-button">Add Mark</v-btn>
	301	+ <v-btn
	302	+ @click="submit"
	303	+ round
	304	+ dark
	305	+ :loading="loading"
	306	+ class="right add-button"
	307	+ >Add Mark</v-btn>
302	308	</v-flex>
303	309	</v-layout>
304	310	</v-flex>
...	...	@@ -559,6 +565,7 @@ export default {
559	565	.then(response => {
560	566	this.getStudentData = [];
561	567	this.snackbar = true;
	568	+ this.addMarkDialog = false;
562	569	this.text = response.data.message;
563	570	this.color = "green";
564	571	this.loading = false;
...	...
...	...	@@ -21,124 +21,76 @@
21	21	</v-layout>
22	22	<v-flex xs12 sm12 id="printMe">
23	23	<v-layout wrap>
24		- <v-flex xs12 sm12 md3>
25		- <v-card flat>
26		- <v-flex xs12 class="card-styles white--text">
27		- <v-card-actions class="pa-0">
28		- <v-spacer></v-spacer>
29		- <v-card-title class="pa-1">
30		- <h3>Profile</h3>
31		- </v-card-title>
32		- <v-spacer></v-spacer>
33		- </v-card-actions>
34		- </v-flex>
35		- <v-layout
36		- wrap
37		- v-for="(value, id, index) in filterData"
38		- v-if="index == 0"
39		- :key="index"
40		- >
41		- <v-flex xs12 style="margin:16px;">
42		- <v-layout>
43		- <v-flex xs12>
44		- <v-avatar
45		- size="100px"
46		- class="mx-auto"
47		- style="margin: auto;display:block;margin-bottom:10px !important"
48		- >
49		- <img src="/static/icon/user.png" v-if="!value[0].studentId.profilePicUrl" />
50		- <img
51		- :src="value[0].studentId.profilePicUrl"
52		- v-else-if="value[0].studentId.profilePicUrl"
53		- />
54		- </v-avatar>
55		- </v-flex>
56		- </v-layout>
57		- <v-layout>
58		- <v-flex xs12 style="text-align:center;">
59		- <h3>
60		- <b>{{ value[0].studentId.name }}</b>
61		- </h3>
62		- <p class="grey--text">Student</p>
63		- </v-flex>
64		- </v-layout>
65		- <v-layout
66		- style="border: 1px solid lightgrey;padding: 4px;border-top-right-radius: 4px;
67		- border-top-left-radius: 4px;"
68		- >
69		- <v-flex xs6 sm3 class="py-1">
70		- <h4>
71		- <b>RollNo</b>
72		- </h4>
73		- </v-flex>
74		- <v-flex sm9 xs7 class="py-1">
75		- <h4>: {{ value[0].studentId.rollNo }}</h4>
76		- </v-flex>
77		- </v-layout>
78		- <v-layout style="border: 1px solid lightgrey;padding: 4px;">
79		- <v-flex xs6 sm3 class="py-1">
80		- <h4>
81		- <b>Class</b>
82		- </h4>
83		- </v-flex>
84		- <v-flex sm9 xs8 class="py-1">
85		- <h4>: {{value[0].classId.classNum }}</h4>
86		- </v-flex>
87		- </v-layout>
88		- <v-layout
89		- style="border: 1px solid lightgrey;padding: 4px;border-bottom-right-radius: 4px;
90		- border-bottom-left-radius: 4px;"
91		- >
92		- <v-flex xs6 sm3 class>
93		- <h4>
94		- <b>Section</b>
95		- </h4>
96		- </v-flex>
97		- <v-flex sm9 xs6 class>
98		- <h4>: {{ value[0].sectionId.name}}</h4>
99		- </v-flex>
100		- </v-layout>
101		- </v-flex>
102		- </v-layout>
103		- <v-layout v-if="markData == ''">
104		- <v-flex xs12>
105		- <h5 class="text-xs-center pa-3">No Data Found</h5>
106		- </v-flex>
107		- </v-layout>
108		- </v-card>
109		- </v-flex>
110		-
111		- <!-- **** TABLE DATA TOTAL MARK **** -->
112		-
113		- <v-flex xs12 sm12 md9 v-show="showMark">
114		- <v-flex xs12 class="card-styles white--text" flat>
115		- <v-card-actions class="pa-0">
116		- <v-spacer></v-spacer>
117		- <v-card-title class="pa-1">
118		- <h3>Mark</h3>
119		- </v-card-title>
120		- <v-spacer></v-spacer>
121		- </v-card-actions>
122		- </v-flex>
	24	+ <!-- **** TABLE DATA MARK **** -->
	25	+ <v-flex xs12 sm12 md12>
123	26	<v-card
124	27	v-for="(value, id, index) in filterData"
125	28	:key="index"
126	29	flat
127		- style="border: 1px solid lightgrey;margin-bottom:14px;"
	30	+ style="border: 1px solid lightgrey;margin-bottom:14px;padding:20px"
128	31	>
	32	+ <v-layout v-if="index === 0">
	33	+ <v-flex xs12 style="border-bottom: 1px solid #707478;padding-bottom:6px !important">
	34	+ <img :src="userData.schoolLogoUrl" v-if="userData.schoolLogoUrl" width="100" />
	35	+ <img src="/static/icon/user.png" v-else-if="!userData.schoolLogoUrl" width="100" />
	36	+ </v-flex>
	37	+ </v-layout>
	38	+ <v-layout style="padding-top:10px" v-if="index === 0">
	39	+ <v-flex xs5>
	40	+ <p style="margin:0px;margin-bottom:4px">
	41	+ <span style="font-size:20px">{{ userData.name }}</span>
	42	+ <br />
	43	+ <span style="font-size: 15px;color: #707478;">{{ userData.address }}</span>
	44	+ </p>
	45	+ <p
	46	+ style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
	47	+ >phone : {{ userData.mobile }}</p>
	48	+ <p
	49	+ style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
	50	+ >Email : {{ userData.email }}</p>
	51	+ </v-flex>
	52	+ <v-flex xs5>
	53	+ <p
	54	+ style="font-size:20px;margin:0px;margin-bottom:4px;"
	55	+ >{{ value[0].studentId.name }}</p>
	56	+ <p
	57	+ style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
	58	+ >Class : {{ value[0].classId.classNum }}</p>
	59	+ <p
	60	+ style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
	61	+ >Roll NO : {{ value[0].studentId.rollNo }}</p>
	62	+ <p
	63	+ style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
	64	+ >Section : {{ value[0].sectionId.name }}</p>
	65	+ </v-flex>
	66	+ <v-flex xs2>
	67	+ <v-avatar size="100">
	68	+ <img
	69	+ :src="value[0].studentId.profilePicUrl"
	70	+ v-if="value[0].studentId.profilePicUrl"
	71	+ width="100px"
	72	+ />
	73	+ <img
	74	+ src="/static/icon/user.png"
	75	+ v-else-if="!value[0].studentId.profilePicUrl"
	76	+ width="100px"
	77	+ />
	78	+ </v-avatar>
	79	+ </v-flex>
	80	+ </v-layout>
129	81	<v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
130	82	<table
131	83	class="mb-5 tableRsponsive feeTypeTable"
132	84	style="border: 1px solid lightgrey;
133	85	border-collapse: collapse;!important
134	86	table-layout: auto !important;
135		- width: 100% !important;"
	87	+ width: 100% !important;
	88	+ overflow: hidden;
	89	+ display: block;"
	90	+
136	91	>
137	92	<thead style="border: 1px solid lightgrey !important;">
138		- <tr
139		- class="info white--text"
140		- style="border: 1px solid lightgrey !important;padding:4px;"
141		- >
	93	+ <tr style="border: 1px solid lightgrey !important;padding:4px;">
142	94	<td
143	95	rowspan="2"
144	96	style="border: 1px solid lightgrey !important;padding: 10px;"
...	...	@@ -159,16 +111,16 @@
159	111	>
160	112	<template v-for="(exam, i) in subject.studentsMarks">
161	113	<td
162		- class="bg-sky white--text"
	114	+
163	115	style="border: 1px solid lightgrey !important;padding: 10px;"
164	116	>Mark</td>
165	117	<td
166		- class="bg-sky-light white--text"
	118	+
167	119	style="border: 1px solid lightgrey !important;padding: 10px;"
168	120	>Highest Mark</td>
169	121	</template>
170	122	<td
171		- class="bg-sky white--text"
	123	+
172	124	style="border: 1px solid lightgrey !important;padding: 10px;"
173	125	>Mark</td>
174	126	</tr>
...	...	@@ -193,67 +145,6 @@
193	145	</tbody>
194	146	</table>
195	147	</v-card>
196		- <v-card v-if="markData == ''">
197		- <v-layout>
198		- <v-flex xs12>
199		- <h5 class="text-xs-center pa-3">No Data Found</h5>
200		- </v-flex>
201		- </v-layout>
202		- </v-card>
203		- </v-flex>
204		- <!-- **** TABLE GRADE MARK **** -->
205		- <v-flex xs12 sm12 md9 v-show="showGrade">
206		- <v-card class="fixcolors white--text" flat>
207		- <v-card-actions class="pa-0">
208		- <v-spacer></v-spacer>
209		- <v-card-title class="pa-2">
210		- <h3>Mark</h3>
211		- </v-card-title>
212		- <v-spacer></v-spacer>
213		- </v-card-actions>
214		- </v-card>
215		- <v-card
216		- v-for="(value, id, index) in filterData"
217		- :key="index"
218		- flat
219		- style="border: 1px solid lightgrey;margin-bottom:14px;"
220		- >
221		- <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
222		- <table
223		- class="mb-5 tableRsponsive feeTypeTable"
224		- style="border: 1px solid lightgrey;
225		- border-collapse: collapse;!important
226		- table-layout: auto !important;
227		- width: 100% !important;"
228		- >
229		- <thead style="border: 1px solid lightgrey !important;">
230		- <tr
231		- class="info white--text"
232		- style="border: 1px solid lightgrey !important;padding:4px;"
233		- >
234		- <td style="border: 1px solid lightgrey !important;padding: 10px;">Subject</td>
235		- <td style="border: 1px solid lightgrey !important;padding: 10px;">Grade</td>
236		- </tr>
237		- </thead>
238		- <tbody style="border: 1px solid lightgrey !important;">
239		- <tr v-for="subject in value" style="border: 1px solid lightgrey !important;">
240		- <td
241		- style="border: 1px solid lightgrey !important;padding: 10px;"
242		- >{{ subject.subjectName }}</td>
243		- <td
244		- style="border: 1px solid lightgrey !important;padding: 10px;"
245		- >{{ subject.grade }}</td>
246		- </tr>
247		- </tbody>
248		- </table>
249		- </v-card>
250		- <v-card v-if="markData == ''">
251		- <v-layout>
252		- <v-flex xs12>
253		- <h5 class="text-xs-center pa-3">No Data Found</h5>
254		- </v-flex>
255		- </v-layout>
256		- </v-card>
257	148	</v-flex>
258	149	</v-layout>
259	150	</v-flex>
...	...	@@ -289,11 +180,14 @@ export default {
289	180	gradeC: "C",
290	181	selectMarkList: "Mark",
291	182	selectMark: ["Mark", "Grade"],
292		- MarkData: ""
	183	+ MarkData: "",
	184	+ userData: {}
	185	+
293	186	}),
294	187	mounted() {
295	188	this.token = this.$store.state.token;
296	189	this.getMarkList();
	190	+ this.getUserData();
297	191	},
298	192	methods: {
299	193	getMarkList() {
...	...	@@ -359,6 +253,20 @@ export default {
359	253	// Pass the element id here
360	254	this.$htmlToPaper("printMe");
361	255	},
	256	+ getUserData() {
	257	+ http()
	258	+ .get("/getParticularUserDetail")
	259	+ .then(response => {
	260	+ this.userData = response.data.data;
	261	+ })
	262	+ .catch(error => {
	263	+ if (error.response.status === 401) {
	264	+ this.$router.replace({ path: "/" });
	265	+ this.$store.dispatch("setToken", null);
	266	+ this.$store.dispatch("Id", null);
	267	+ }
	268	+ });
	269	+ },
362	270	selectMarkData(select) {
363	271	if (select == "Mark") {
364	272	this.showMark = true;
...	...
...	...	@@ -151,7 +151,10 @@
151	151	style="border: 1px solid lightgrey;
152	152	border-collapse: collapse;!important
153	153	table-layout: auto !important;
154		- width: 100% !important;"
	154	+ width: 100% !important;
	155	+ overflow: hidden;
	156	+ display: block;"
	157	+
155	158	>
156	159	<thead style="border: 1px solid lightgrey !important;">
157	160	<tr style="border: 1px solid lightgrey !important;padding:4px;">
...	...
...	...	@@ -264,9 +264,9 @@
264	264	<td
265	265	style="border: 1px solid lightgrey !important;padding: 6px;"
266	266	>{{ studentReport.name }}</td>
267		- <td
	267	+ <!-- <td
268	268	style="border: 1px solid lightgrey !important;padding: 6px;"
269		- >{{ studentReport.rollNo }}</td>
	269	+ >{{ studentReport.rollNo }}</td> -->
270	270	<td
271	271	style="border: 1px solid lightgrey !important;padding: 6px;"
272	272	>{{ studentReport.email }}</td>
...	...