From 0cd2fbfba4d050be584a1a84b5180128293fa2da Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Wed, 11 Dec 2019 18:41:00 +0530
Subject: [PATCH] implement create teacher antendece and view teahers
 attendence

---
 src/api/menu.js                                |   2 +-
 src/pages/Attendence/teacherAttendence.vue     | 297 ++++++++++++++----
 src/pages/Attendence/viewTeacherAttendence.vue | 417 +++++++++++++++++++++++++
 src/pages/Mark/mark.vue                        |   9 -
 src/pages/Students/students.vue                |  43 +--
 src/pages/Teachers/teachers.vue                |  24 +-
 src/router/paths.js                            |  36 ++-
 7 files changed, 716 insertions(+), 112 deletions(-)
 create mode 100644 src/pages/Attendence/viewTeacherAttendence.vue

diff --git a/src/api/menu.js b/src/api/menu.js
index 9d2eb82..08cc76f 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -53,7 +53,7 @@ const adminMenu = [
         icon: '/static/schoolIcons/Attendance.png',
         items: [
             { name: 'studentAttendence', title: 'Student Attendance', component: 'studentAttendence', action: '', },
-            // { name: 'teacherAttendence', title: 'Teacher Attendance', component: 'teacherAttendence', action: '', },
+            { name: 'teacherAttendence', title: 'Teacher Attendance', component: 'teacherAttendence', action: '', }
             // { name: 'userAttendence', title: 'User Attendance', component: 'userAttendence', action: '', },
         ]
     },
diff --git a/src/pages/Attendence/teacherAttendence.vue b/src/pages/Attendence/teacherAttendence.vue
index 0a555ed..7d03b65 100644
--- a/src/pages/Attendence/teacherAttendence.vue
+++ b/src/pages/Attendence/teacherAttendence.vue
@@ -1,51 +1,152 @@
 <template>
   <v-app id="pages-dasboard">
-    <!-- ****** EXISTING-Teachers TABLE DATA****** -->
-    <v-card flat>
-      <v-card-actions>
-        <v-layout>
-          <h4 class="right mt-2 ml-2">Teacher Attendence</h4>
-        </v-layout>
-        <v-spacer></v-spacer>
-      </v-card-actions>
-    </v-card>
-    <v-data-table
-      :headers="headers"
-      :items="desserts"
-      :pagination.sync="pagination"
-      :search="search"
-    >
-      <template slot="items" slot-scope="props">
-        <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
-        <td id="td" class="text-xs-center">
-          <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.email }}</td>
-        <td id="td" class="text-xs-center">{{ dates(props.item.dob) }}</td>
-        <td id="td" class="text-xs-center">{{ dates(props.item.joinDate)}}</td>
-        <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td>
-        <td class="text-xs-center">
-          <span>
-            <img
-              style="cursor:pointer; width:25px; height:18px; "
-              class="mr-5"
-              @click="profile(props.item)"
-              src="/static/icon/eye1.png"
-            />
-          </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>
+    <v-tabs grow slider-color="gray">
+      <v-tab
+        ripple
+        @click="activeTab('existing')"
+        v-bind:class="{ active: isActive }"
+        id="tab"
+        class="subheading"
+      >Existing Teacher Attendence</v-tab>
+      <v-tab
+        ripple
+        @click="activeTab('new')"
+        v-bind:class="{ active: newActive }"
+        id="tab1"
+        User
+        class="subheading"
+      >Add Teachers Attendence</v-tab>
+      <v-tab-item>
+        <!-- ****** EXISTING TACHERS-TABLE DATA****** -->
+        <v-data-table
+          :headers="headers"
+          :items="desserts"
+          :pagination.sync="pagination"
+          :search="search"
+        >
+          <template slot="items" slot-scope="props">
+            <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
+            <td id="td" class="text-xs-center">
+              <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.email }}</td>
+            <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td>
+            <td class="text-xs-center">
+              <router-link :to="{ name:'ViewTeacherAttendence',params: { teacherId:props.item._id } }">
+                <span>
+                  <v-tooltip top>
+                    <img
+                      slot="activator"
+                      style="cursor:pointer; width:25px; height:18px; "
+                      class="mr5"
+                      src="/static/icon/eye1.png"
+                    />
+                    <span>View</span>
+                  </v-tooltip>
+                </span>
+              </router-link>
+            </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>
+      </v-tab-item>
+      <!-- ****** Add Teachers Attendece****** -->
+      <v-tab-item>
+        <v-card flat>
+          <v-flex xs12>
+            <v-layout wrap>
+              <v-flex xs12 md6>
+                <v-layout>
+                  <v-flex xs4 sm4 md2>
+                    <label class="title right mr-3 mt-4">Date:</label>
+                  </v-flex>
+                  <v-flex xs6>
+                    <v-menu
+                      ref="menu"
+                      :close-on-content-click="false"
+                      v-model="menu"
+                      :nudge-right="40"
+                      lazy
+                      transition="scale-transition"
+                      offset-y
+                      full-width
+                      min-width="290px"
+                    >
+                      <v-text-field
+                        slot="activator"
+                        v-model="date"
+                        label="Select Date"
+                        append-icon="event"
+                        readonly
+                      ></v-text-field>
+                      <v-date-picker
+                        ref="picker"
+                        v-model="date"
+                        :max="new Date().toISOString().substr(0, 10)"
+                        min="1950-01-01"
+                        @change="save"
+                      ></v-date-picker>
+                    </v-menu>
+                  </v-flex>
+                </v-layout>
+              </v-flex>
+              <v-flex xs8 sm8 md6>
+                <v-btn class="right mt-3 black" dark round @click="showTable">Attendence</v-btn>
+              </v-flex>
+            </v-layout>
+          </v-flex>
+        </v-card>
+        <v-flex xs12 v-show="attendeceTable">
+          <v-data-table
+            :headers="headers"
+            :items="teachersData"
+            :pagination.sync="pagination"
+            :search="search"
+          >
+            <template slot="items" slot-scope="props">
+              <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
+              <td id="td" class="text-xs-center">
+                <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.email }}</td>
+              <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td>
+              <td class="text-xs-center">
+                <v-radio-group v-model="props.item.attendence" :mandatory="false" row>
+                  <v-radio
+                    v-for="attendences in attendenceType"
+                    :key="attendences.value"
+                    :label="`${attendences.label}`"
+                    :value="attendences.value"
+                  ></v-radio>
+                </v-radio-group>
+              </td>
+            </template>
+          </v-data-table>
+          <v-btn @click="submit()" class="right black" round dark>Submit</v-btn>
+        </v-flex>
+      </v-tab-item>
+    </v-tabs>
+    <v-snackbar
+      :timeout="timeout"
+      :top="y === 'top'"
+      :right="x === 'right'"
+      :vertical="mode === 'vertical'"
+      v-model="snackbar"
+      color="success"
+    >{{ text }}</v-snackbar>
     <div class="loader" v-if="showLoader">
       <v-progress-circular indeterminate color="white"></v-progress-circular>
     </div>
@@ -54,13 +155,43 @@
 
 <script>
 import http from "@/Services/http.js";
-import Util from "@/util";
 import moment from "moment";
 
 export default {
   data: () => ({
+    snackbar: false,
+    y: "top",
+    x: "right",
+    mode: "",
+    timeout: 3000,
+    text: "",
+    date: null,
+    menu: false,
+    attendeceTable: false,
     showLoader: false,
+    loading: false,
     search: "",
+    valid: true,
+    isActive: true,
+    newActive: false,
+    attendenceType: [
+      {
+        label: "Present",
+        value: "present"
+      },
+      {
+        label: "Late Present With Excuset",
+        value: "latePresentWithExcuse"
+      },
+      {
+        label: "Late Present",
+        value: "latePresent"
+      },
+      {
+        label: "Absent",
+        value: "absent"
+      }
+    ],
     pagination: {
       rowsPerPage: 15
     },
@@ -79,26 +210,31 @@ export default {
       },
       { text: "Name", value: "name", sortable: false, align: "center" },
       { text: "Email", value: "email", sortable: false, align: "center" },
-      { text: "DOB", value: "dob", sortable: false, align: "center" },
-      {
-        text: "Join Date",
-        value: "joinDate",
-        sortable: false,
-        align: "center"
-      },
       {
         text: "Mobile No",
         value: "mobileNo",
         sortable: false,
         align: "center"
       },
-      { text: "Action", value: "", sortable: false, align: "center" }
+      { text: "Attendance", value: "", sortable: false, align: "center" }
     ],
-    desserts: []
+    desserts: [],
+    teachersData: [],
+    addTeachers: {}
   }),
+  watch: {
+    menu(val) {
+      val && this.$nextTick(() => (this.$refs.picker.activePicker = "DAY"));
+    }
+  },
   methods: {
-    dates: function(date) {
-      return moment(date).format("MMMM DD, YYYY");
+    save(date) {
+      this.$refs.menu.save(date);
+    },
+    showTable() {
+      this.attendeceTable = true;
+      this.getTeacherList();
+      console.log("date", this.date);
     },
     getTeacherList() {
       this.showLoader = true;
@@ -108,7 +244,12 @@ export default {
           headers: { Authorization: "Bearer " + token }
         })
         .then(response => {
+          this.teachersData = response.data.data;
           this.desserts = response.data.data;
+          var attendence = "";
+          for (let i = 0; i < this.teachersData.length; i++) {
+            this.teachersData[i].attendence = "present";
+          }
           this.showLoader = false;
           // console.log("getTeacherList=====>",this.desserts)
         })
@@ -120,6 +261,46 @@ export default {
             this.$store.dispatch("Id", null);
           }
         });
+    },
+    activeTab(type) {
+      switch (type) {
+        case "existing":
+          this.newActive = false;
+          this.isActive = true;
+          break;
+
+        default:
+          this.newActive = true;
+          this.isActive = false;
+          break;
+      }
+    },
+    submit() {
+      var teachersAttendence = [];
+      for (var j = 0; j < this.teachersData.length; j++) {
+        teachersAttendence.push({
+          teacherId: this.teachersData[j]._id,
+          attendanceType: this.teachersData[j].attendence
+        });
+      }
+      let attendanceData = {
+        date: this.date,
+        teachers: teachersAttendence
+      };
+      http()
+        .post("/createTeacherAttendance", attendanceData)
+        .then(response => {
+          this.snackbar = true;
+          this.text = response.data.message;
+        })
+        .catch(error => {
+          this.snackbar = true;
+          this.text = error.response.data.message;
+        });
+    },
+    clear() {
+      this.$refs.form.reset();
+      this.imageUrl = "";
     }
   },
   mounted() {
diff --git a/src/pages/Attendence/viewTeacherAttendence.vue b/src/pages/Attendence/viewTeacherAttendence.vue
new file mode 100644
index 0000000..2878f51
--- /dev/null
+++ b/src/pages/Attendence/viewTeacherAttendence.vue
@@ -0,0 +1,417 @@
+<template>
+  <v-container fluid grid-list-md>
+    <!-- <div v-show="hideData"> -->
+      <!-- <v-layout row>
+        <v-btn color="grey" @click="exportPdf" class="right" 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>
+            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-card-text>
+              <v-container grid-list-md>
+                <v-layout wrap>
+                  <v-flex xs12>
+                    <v-menu
+                      ref="menuStartDate"
+                      :close-on-content-click="false"
+                      v-model="menuStartDate"
+                      :nudge-right="40"
+                      :return-value.sync="startDate"
+                      lazy
+                      transition="scale-transition"
+                      offset-y
+                      full-width
+                      min-width="290px"
+                    >
+                      <v-text-field
+                        slot="activator"
+                        v-model="startDate"
+                        label="Select Start Date"
+                        prepend-icon="event"
+                        readonly
+                      ></v-text-field>
+                      <v-date-picker
+                        v-model="startDate"
+                        @input="$refs.menuStartDate.save(startDate)"
+                      ></v-date-picker>
+                    </v-menu>
+                  </v-flex>
+                  <v-flex xs12>
+                    <v-menu
+                      ref="menuEndDate"
+                      :close-on-content-click="false"
+                      v-model="menuEndDate"
+                      :nudge-right="40"
+                      :return-value.sync="endDate"
+                      lazy
+                      transition="scale-transition"
+                      offset-y
+                      full-width
+                      min-width="290px"
+                    >
+                      <v-text-field
+                        slot="activator"
+                        v-model="endDate"
+                        label="Select End Date"
+                        prepend-icon="event"
+                        readonly
+                      ></v-text-field>
+                      <v-date-picker v-model="endDate" @input="$refs.menuEndDate.save(endDate)"></v-date-picker>
+                    </v-menu>
+                  </v-flex>
+                </v-layout>
+              </v-container>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn color="blue darken-1" 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>
+              </download-csv>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
+      </v-layout> -->
+      <v-layout wrap>
+        <v-flex xs12 sm12 md4>
+          <v-card flat>
+            <h3 class="text-xs-center py-2 grey lighten-1 white--text">Profile</h3>
+            <v-card-text>
+              <v-container>
+                <v-layout wrap>
+                  <v-flex xs12>
+                    <v-layout>
+                      <v-flex
+                        xs12
+                        class="text-xs-center text-sm-center text-md-center text-lg-center"
+                      >
+                        <v-avatar size="160px">
+                          <img src="/static/icon/user.png" v-if="!teacherData.teacherData.profilePicUrl" />
+                          <img
+                            :src="teacherData.teacherData.profilePicUrl"
+                            v-else-if="teacherData.teacherData.profilePicUrl"
+                          />
+                        </v-avatar>
+                      </v-flex>
+                    </v-layout>
+                    <v-layout>
+                      <v-flex xs12 sm12>
+                        <h3 class="text-xs-center">
+                          <b>{{ teacherData.teacherData.name }}</b>
+                        </h3>
+                        <p class="text-xs-center grey--text">Teacher</p>
+                      </v-flex>
+                    </v-layout>
+                    <!-- <v-layout style="border: 1px solid lightgrey;">
+                      <v-flex xs6 sm6 class="pa-0">
+                        <h4 class="right">
+                          <b>Gender :</b>
+                        </h4>
+                      </v-flex>
+                      <v-flex sm6 xs6 class="pa-0">
+                        <h4>{{ teacherData.teacherData.gender }}</h4>
+                      </v-flex>
+                    </v-layout> -->
+                    <v-layout style="border: 1px solid lightgrey;">
+                      <v-flex xs6 sm6 class="pa-0">
+                        <h4 class="right">
+                          <b>D.O.B:</b>
+                        </h4>
+                      </v-flex>
+                      <v-flex sm6 xs6 class="right pa-0">
+                        <h4>{{ dates(teacherData.teacherData.dob) }}</h4>
+                      </v-flex>
+                    </v-layout>
+                    <v-layout style="border: 1px solid lightgrey;">
+                      <v-flex xs6 sm6 class="right pa-0">
+                        <h4 class="right">
+                          <b>Phone :</b>
+                        </h4>
+                      </v-flex>
+                      <v-flex sm6 xs6 class="right pa-0">
+                        <h4>{{ teacherData.teacherData.mobileNo}}</h4>
+                      </v-flex>
+                    </v-layout>
+                  </v-flex>
+                </v-layout>
+              </v-container>
+            </v-card-text>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 sm12 md8>
+          <v-card flat>
+            <h3 class="py-2 text-xs-center grey lighten-1 white--text">
+              Attendence
+              <span class="ml-4">
+                <v-avatar class="green caption" size="12"></v-avatar>
+                <span class="subheading">Present</span>
+              </span>
+              <span class="ml-4">
+                <v-avatar color="red caption" size="12" class></v-avatar>
+                <span class="subheading">Absent</span>
+              </span>
+            </h3>
+            <!-- <YearCalendar
+              v-model="year"
+              :activeDates="activeDates"
+              prefixClass="your_customized_wrapper_class"
+              :activeClass="activeClass"
+            ></YearCalendar> -->
+          </v-card>
+        </v-flex>
+      </v-layout>
+    </div>
+    <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
+          >
+            Download
+            <v-icon dark right size="20">save_alt</v-icon>
+          </v-btn> -->
+        </v-flex>
+      </v-container>
+    </v-layout>
+    <v-layout v-show="showPdfData">
+      <v-container>
+        <v-layout v-show="showPdfData">
+          <v-flex xs12 sm12 md8 offset-sm2>
+            <div ref="printMe">
+              <v-flex xs12 class="pl-3">
+                <!-- <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>
+                  </v-flex>
+                </v-layout>
+                <v-layout>
+                  <v-flex xs6 sm2 class="pa-0 mb-1">
+                    <h4>
+                      <b>Type</b>
+                    </h4>
+                  </v-flex>
+                  <v-flex sm10 xs6 class="pa-0 mb-1">
+                    <h4>: Student</h4>
+                  </v-flex>
+                </v-layout>
+                <v-layout>
+                  <v-flex xs6 sm2 class="pa-0 mb-1">
+                    <h4>
+                      <b>Roll No</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>
+                </v-layout>
+                <v-layout>
+                  <v-flex xs6 sm2 class="pa-0 mb-1">
+                    <h4>
+                      <b>Section</b>
+                    </h4>
+                  </v-flex>
+                  <v-flex sm10 xs6 class="pa-0 mb-3">
+                    <h4>: {{ studentData.sectionId.name}}</h4>
+                  </v-flex>
+                </v-layout> -->
+              </v-flex>
+              <!-- <v-card flat>
+                <h3 class="py-2 text-xs-center grey lighten-1 white--text">
+                  Attendence
+                  <span class="ml-4">
+                    <v-avatar class="green caption" size="12"></v-avatar>
+                    <span class="subheading">Present</span>
+                  </span>
+                  <span class="ml-4">
+                    <v-avatar color="red caption" size="12" class></v-avatar>
+                    <span class="subheading">Absent</span>
+                  </span>
+                </h3>
+                <YearCalendar
+                  v-model="year"
+                  :activeDates="activeDates"
+                  prefixClass="your_customized_wrapper_class"
+                  :activeClass="activeClass"
+                ></YearCalendar>
+              </v-card> -->
+            </div>
+          </v-flex>
+        </v-layout>
+      </v-container>
+    </v-layout>
+    <!-- <img :src="output" v-show="false"/> -->
+    <div class="loader" v-if="showLoader">
+      <v-progress-circular indeterminate color="white"></v-progress-circular>
+    </div>
+  </v-container>
+</template>
+
+<script lang="js">
+import moment from "moment";
+import http from "@/Services/http.js";
+import YearCalendar from "vue-material-year-calendar";
+import jsPDF from 'jspdf';
+    // eslint-disable-next-line
+import autoTable from 'jspdf-autotable';
+
+export default {
+  components: { YearCalendar },
+  data() {
+    return {
+      showPdfData:false,
+      hideData:true,
+      loadingPdf:false,
+      output:null,
+      studentsList: [],
+      json_data: [],
+      dialogExport: false,
+      startDate: "",
+      endDate: "",
+      menuEndDate: false,
+      menuStartDate: false,
+      showLoader: false,
+      token: "",
+      year: new Date().getFullYear(),
+      activeDates: [],
+      activeClass: "",
+      teacherData: {}
+    };
+  },
+  mounted() {
+    this.token = this.$store.state.token;
+    this.getTeacherAttendence();
+    // this.getStudentData();
+  },
+  methods: {
+    dates: function(date) {
+      return moment(date).format("MMMM DD, YYYY");
+    },
+    getTeacherAttendence() {
+      this.showLoader = true;
+      http()
+        .get(
+          "/teacherAttendance",
+          { params: { teacherId: this.$route.params.teacherId } },
+          {
+            headers: { Authorization: "Bearer " + this.token }
+          }
+        )
+        .then(response => {
+          this.showLoader = false;
+          this.teacherData = response.data.data;
+        //   let array = [];
+        //   for (let i = 0; i < response.data.data.length; i++) {
+        //     if (response.data.data[i].students[0].isPresent == true) {
+        //       array.push({
+        //         date: response.data.data[i].date,
+        //         className: "green"
+        //       });
+        //     } else if (response.data.data[i].students[0].isPresent == false) {
+        //       array.push({
+        //         date: response.data.data[i].date,
+        //         className: "red"
+        //       });
+        //     }
+        //   }
+        //   this.activeDates = array;
+        })
+        .catch(error => {
+          this.showLoader = false;
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+            this.$store.dispatch("Role", null);
+          }
+        });
+    },
+//     getStudentData() {
+//       http()
+//         .get(
+//           "/getParticularStudentDetail",
+//           { params: { studentId: this.$route.params.id } },
+//           {
+//             headers: { Authorization: "Bearer " + this.token }
+//           }
+//         )
+//         .then(response => {
+//           this.studentData = response.data.data;
+//         })
+//         .catch(err => {
+//           console.log("err====>", err);
+//           // this.$router.replace({ path: '/' });
+//         });
+//     },
+//     exportData() {
+//       http()
+//         .get(
+//           "/studentAttendanceByMonth",
+//           {
+//             params: {
+//               studentId: this.$route.params.id,
+//               startDate: this.startDate,
+//               endDate: this.endDate
+//             }
+//           },
+//           {
+//             headers: { Authorization: "Bearer " + this.token }
+//           }
+//         )
+//         .then(response => {
+//           this.json_data = response.data.data;
+//           this.dialogExport = true;
+//         })
+//         .catch(err => {
+//           console.log("err====>", err);
+//           // 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");
+//         }
+  }
+};
+</script>
diff --git a/src/pages/Mark/mark.vue b/src/pages/Mark/mark.vue
index 8520201..a18d9d0 100644
--- a/src/pages/Mark/mark.vue
+++ b/src/pages/Mark/mark.vue
@@ -455,12 +455,6 @@ export default {
     },
     findStudents() {
       this.getStudentData = [];
-      // for (let k = 0; k < this.headerOfMark.length; k++) {
-      //   this.headerOfMark[k].slice(5);
-      //   console.log(this.headerOfMark);
-      // }
-      // console.log(this.headerOfMark);
-
       if (this.$refs.form.validate()) {
         this.showLoader = true;
         http()
@@ -471,8 +465,6 @@ export default {
             }
           })
           .then(response => {
-            console.log(" bbbbbbbbbbbbbbbbbbb", this.headerOfMark);
-
             this.getStudentData = response.data.data;
             this.showLoader = false;
             this.showLoader = true;
@@ -483,7 +475,6 @@ export default {
               .then(response => {
                 this.showLoader = false;
                 this.headerOfMark.length = 4;
-                // console.log("getSectionsList=====>", response.data.data);
                 for (var i = 0; i < response.data.data.length; i++) {
                   this.headerOfMark.push({
                     text:
diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue
index 3c40919..9823ce4 100644
--- a/src/pages/Students/students.vue
+++ b/src/pages/Students/students.vue
@@ -28,7 +28,7 @@
           v-model="snackbar"
           color="success"
         >{{ text }}</v-snackbar>
-        <v-dialog v-model="dialog" max-width="1500px" scrollable>
+        <v-dialog v-model="dialog" max-width="170 0px" scrollable>
           <v-card flat>
             <v-toolbar color="grey lighten-2" flat>
               <v-spacer></v-spacer>
@@ -37,13 +37,13 @@
               </v-toolbar-title>
               <v-spacer></v-spacer>
             </v-toolbar>
-            <v-card-text style="height: 586px;">
+            <v-card-text style="height: 680px;">
               <v-form ref="form">
                 <v-container fluid>
                   <v-layout>
                     <v-flex
                       xs12
-                      class="text-xs-center text-sm-center text-md-center text-lg-center mr-4"
+                      class="text-xs-center text-sm-center text-md-center text-lg-center"
                     >
                       <v-avatar size="160px">
                         <img
@@ -281,7 +281,7 @@
                       <v-layout>
                         <v-flex xs4 class="pt-4 subheading">
                           <label class="right hidden-xs-only hidden-sm-only">Uplaod Image:</label>
-                          <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod :</label>
+                          <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod:</label>
                         </v-flex>
                         <v-flex xs8 class="ml-3">
                           <v-text-field
@@ -395,31 +395,35 @@
                     </v-flex>
                   </v-layout>
                   <v-layout class="hidden-xs-only hidden-sm-only">
-                    <v-flex xs12 sm12>
+                    <v-flex xs12 sm4>
                       <v-layout>
-                        <v-flex xs4 sm2 class="pt-4 subheading ml-5">
-                          <label class="right pr-4">Present Address:</label>
+                        <v-flex xs4 sm4 class="pt-4 subheading">
+                          <label class="right hidden-xs-only hidden-sm-only">Permanent Address:</label>
+                          <label
+                            class="right hidden-lg-only hidden-md-only hidden-xl-only"
+                          >Permanent Address:</label>
                         </v-flex>
-                        <v-flex xs8 sm12>
+                        <v-flex xs12 sm8  class="ml-3">
                           <v-text-field
-                            name="input-4-3"
-                            v-model="editedItem.presentAddress"
-                            placeholder="fill Your present Address"
+                            v-model="editedItem.permanentAddress"
+                            placeholder="fill Your Permanent Address"
                             required
                           ></v-text-field>
                         </v-flex>
                       </v-layout>
                     </v-flex>
-                    <v-flex xs12 sm12>
+                    <v-flex xs12 sm4>
                       <v-layout>
-                        <v-flex xs4 sm2 class="pt-4 subheading ml-5 addressForm">
-                          <label class>Permanent Address:</label>
+                        <v-flex xs4 class="pt-4 subheading">
+                          <label class="right hidden-xs-only hidden-sm-only">Present Address:</label>
+                          <label
+                            class="right hidden-lg-only hidden-md-only hidden-xl-only"
+                          >Present Address:</label>
                         </v-flex>
-                        <v-flex xs12 sm12>
+                        <v-flex xs8 class="ml-3">
                           <v-text-field
-                            name="input-4-3"
-                            v-model="editedItem.permanentAddress"
-                            placeholder="fill Your Permanent Address"
+                            v-model="editedItem.presentAddress"
+                            placeholder="Select Country Name"
                             required
                           ></v-text-field>
                         </v-flex>
@@ -436,7 +440,6 @@
                       <v-layout>
                         <v-flex xs12 sm12>
                           <v-textarea
-                            name="input-4-3"
                             v-model="editedItem.presentAddress"
                             placeholder="fill Your present Address"
                             required
@@ -1697,7 +1700,7 @@
 import http from "@/Services/http.js";
 import moment from "moment";
 import countryList from "@/script/country.js";
-import parent from '@/script/parents.js'
+import parent from "@/script/parents.js";
 
 export default {
   data: () => ({
diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue
index 29faf18..10d828c 100644
--- a/src/pages/Teachers/teachers.vue
+++ b/src/pages/Teachers/teachers.vue
@@ -26,14 +26,14 @@
           v-model="snackbar"
           color="success"
         >{{ text }}</v-snackbar>
-        <v-dialog v-model="dialog" max-width="1100px" scrollable>
+        <v-dialog v-model="dialog" max-width="1400px" scrollable>
           <v-card flat>
             <v-toolbar color="grey lighten-2" flat>
               <v-spacer></v-spacer>
               <v-toolbar-title>Edit Teacher Profile</v-toolbar-title>
               <v-spacer></v-spacer>
             </v-toolbar>
-            <v-card-text style="height: 800px;">
+            <v-card-text style="height: 740px;">
               <v-layout>
                 <v-flex
                   xs12
@@ -263,12 +263,12 @@
                 </v-flex>
               </v-layout>
               <v-layout class="hidden-xs-only hidden-sm-only" wrap>
-                <v-flex xs12 sm12>
+                <v-flex xs12 sm6>
                   <v-layout>
-                    <v-flex xs4 sm2 class="pt-4 subheading ml-5">
-                      <label class="right pr-2">Present Address:</label>
+                    <v-flex xs4 sm4 class="pt-4 subheading">
+                      <label class="right">Present Address:</label>
                     </v-flex>
-                    <v-flex xs8 sm10>
+                    <v-flex xs8 sm6 class="ml-3">
                       <v-text-field
                         name="input-4-3"
                         v-model="editedItem.presentAddress"
@@ -278,12 +278,12 @@
                     </v-flex>
                   </v-layout>
                 </v-flex>
-                <v-flex xs12 sm12>
+                <v-flex xs12 sm6>
                   <v-layout>
-                    <v-flex xs4 sm2 class="pt-4 subheading ml-5 addressForm">
-                      <label class="pr-2">Permanent Address:</label>
+                    <v-flex xs4 sm4 class="pt-4 subheading">
+                      <label class="right">Permanent Address:</label>
                     </v-flex>
-                    <v-flex xs12 sm10>
+                    <v-flex xs12 sm6 class="ml-3">
                       <v-text-field
                         name="input-4-3"
                         v-model="editedItem.permanentAddress"
@@ -331,7 +331,7 @@
                 </v-flex>
               </v-layout>
               <v-layout>
-                <v-flex xs12 sm12>
+                <v-flex xs12 sm10 offset-sm1>
                   <v-layout>
                     <v-flex xs6>
                       <v-btn round dark @click.native="close">Cancel</v-btn>
@@ -1217,7 +1217,7 @@ export default {
         name: this.editedItem.name,
         email: this.editedItem.email,
         role: this.editedItem.role,
-        dob: this.editedItem.date,
+        dob: this.editedItem.dob,
         city: this.editedItem.city,
         pincode: this.editedItem.pincode,
         country: this.editedItem.country,
diff --git a/src/router/paths.js b/src/router/paths.js
index 95c9350..7f7cb0b 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -297,18 +297,18 @@ export default [{
                 `@/pages/Attendence/teacherAttendence.vue`
             )
     },
-    {
-        path: '/AttendenceUser',
-        meta: {},
-        name: 'userAttendence',
-        props: (route) => ({ type: route.query.type }),
-        component: () =>
-            import (
-                /* webpackChunkName: "routes" */
-                /* webpackMode: "lazy-once" */
-                `@/pages/Attendence/userAttendence.vue`
-            )
-    },
+    // {
+    //     path: '/AttendenceUser',
+    //     meta: {},
+    //     name: 'userAttendence',
+    //     props: (route) => ({ type: route.query.type }),
+    //     component: () =>
+    //         import (
+    //             /* webpackChunkName: "routes" */
+    //             /* webpackMode: "lazy-once" */
+    //             `@/pages/Attendence/userAttendence.vue`
+    //         )
+    // },
     {
         path: '/feeTypes',
         meta: {},
@@ -442,6 +442,18 @@ export default [{
             )
     },
     {
+        path: '/TeacherAttendence/:teacherId',
+        meta: {},
+        name: 'ViewTeacherAttendence',
+        props: (route) => ({ type: route.query.type }),
+        component: () =>
+            import (
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/Attendence/viewTeacherAttendence.vue`
+            )
+    },
+    {
         path: '/viewInvoice/:viewInvoiceId',
         meta: {},
         name: 'ViewInvoice',
-- 
2.0.0