viithiisys / School-Management-dashboard

Browse Code »

Commit 748acd1a6e445bc41d28bf50db67414171fb3fb1

Authored by Neeraj Sharma 2020-01-16 05:25:33 -0500

1 parent ea5696f777

Exists in master and in 3 other branches

solve bugs in progressCardReport

Showing 3 changed files with 144 additions and 146 deletions Show diff stats

src/pages/Administrator/bulkImport.vue

Diff comments View file @748acd1

 <template>
   <v-container fluid grid-list-md>
     <v-card flat>
       <v-toolbar class="fixcolors" dark flat>
         <v-spacer></v-spacer>
         <v-toolbar-title>Import</v-toolbar-title>
         <v-spacer></v-spacer>
       </v-toolbar>
       <v-container fluid>
         <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs6 sm5 lg2 class="pt-4">
                 <label class="title right">Add Teacher:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field v-model="teacherFileName" placeholder="Choose file" :disabled="true"></v-text-field>
                 <input
                   type="file"
                   style="display: none"
                   ref="file"
                   @change="convertFile"
                   id="fileInput"
                 />
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="pickFile">
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="importTeacher()" :loading="loading">import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <download-csv :data="teacherData">
                   <v-btn class="blue lighten-2" dark block>
                     <v-icon small class="pr-1">archive</v-icon>sample download
                   </v-btn>
                 </download-csv>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>
         <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs6 sm5 lg2 class="pt-4">
                 <label class="title right">Add Parent:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field v-model="parentFileName" placeholder="Choose file" :disabled="true"></v-text-field>
                 <input
                   type="file"
                   style="display: none"
                   ref="parentfile"
                   @change="parentFile"
                   id="parentInput"
                 />
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="pickParentFile">
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
-              <v-flex xs6 sm4 lg2 class="mt-1" @click="importParent">
+              <v-flex xs6 sm4 lg2 class="mt-1" @click="importParent" :loading="parentLoading">
                 <v-btn class="grey" dark block>import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <download-csv :data="parentData">
                   <v-btn class="blue lighten-2" dark block>
                     <v-icon small class="pr-1">archive</v-icon>sample download
                   </v-btn>
                 </download-csv>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>
         <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs6 sm5 lg2 class="pt-4">
                 <label class="title right">Add User:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field placeholder="Choose file" v-model="userFileName" :disabled="true"></v-text-field>
                 <input
                   type="file"
                   style="display: none"
                   ref="userfile"
                   @change="userFile"
                   id="userInput"
                 />
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="pickUserFile">
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
-                <v-btn class="grey" dark block @click="importUser">import</v-btn>
+                <v-btn class="grey" dark block @click="importUser" :loading="userLoading">import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <download-csv :data="userData">
                   <v-btn class="blue lighten-2" dark block>
                     <v-icon small class="pr-1">archive</v-icon>sample download
                   </v-btn>
                 </download-csv>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>
         <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs6 sm5 lg2 class="pt-4">
                 <label class="title right">Add Book:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field placeholder="Choose file" v-model="bookFileName" :disabled="true"></v-text-field>
                 <input
                   type="file"
                   style="display: none"
                   ref="bookfile"
                   @change="bookFile"
                   id="bookInput"
                 />
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="pickBookFile">
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
-                <v-btn class="grey" dark block @click="importBook">import</v-btn>
+                <v-btn class="grey" dark block @click="importBook" :loading="BookLoading">import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <download-csv :data="bookData">
                   <v-btn class="blue lighten-2" dark block>
                     <v-icon small class="pr-1">archive</v-icon>sample download
                   </v-btn>
                 </download-csv>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>
         <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs6 sm5 lg2 class="pt-4">
                 <label class="title right">Add Student:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field placeholder="Choose file" v-model="bookStudentName" :disabled="true"></v-text-field>
                 <input
                   type="file"
                   style="display: none"
                   ref="studentfile"
                   @change="studentFile"
                   id="studentInput"
                 />
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block @click="pickStudentFile">
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
-                <v-btn class="grey" dark block @click="importStudent()">import</v-btn>
+                <v-btn
+                  class="grey"
+                  dark
+                  block
+                  @click="importStudent()"
+                  :loading="studentLoading"
+                >import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <download-csv :data="studentData">
                   <v-btn class="blue lighten-2" dark block>
                     <v-icon small class="pr-1">archive</v-icon>sample download
                   </v-btn>
                 </download-csv>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>
         <!-- <v-layout>
           <v-flex xs12>
             <v-layout wrap>
               <v-flex xs9 sm5 lg2 class="pt-4">
                 <label class="title right">Students & Parents:</label>
               </v-flex>
               <v-flex xs12 sm6 lg3>
                 <v-text-field placeholder="Choose file" :disabled="true"></v-text-field>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block>
                   <v-icon small class="pr-1">refresh</v-icon>Upload
                 </v-btn>
               </v-flex>
               <v-flex xs6 sm4 lg2 class="mt-1">
                 <v-btn class="grey" dark block>import</v-btn>
               </v-flex>
               <v-flex xs12 sm4 lg2 class="mt-1">
                 <v-btn class="blue lighten-2" dark block>
                   <v-icon small class="pr-1">archive</v-icon>sample download
                 </v-btn>
               </v-flex>
             </v-layout>
           </v-flex>
         </v-layout>-->
       </v-container>
     </v-card>
     <v-snackbar
       :timeout="timeout"
       :top="y === 'top'"
       :right="x === 'right'"
       :vertical="mode === 'vertical'"
       v-model="snackbar"
-      :color= color
+      :color="color"
     >{{ text }}</v-snackbar>
   </v-container>
 </template>
 <script>
 import http from "@/Services/http.js";
 import moment from "moment";
 import teacherData from "@/script/teachers.js";
 import studentData from "@/script/students.js";
 import parentData from "@/script/parents.js";
 import userData from "@/script/users.js";
 import bookData from "@/script/books.js";
+import XLSX from "xlsx";
 export default {
   data: () => ({
     loading: false,
+    parentLoading: false,
+    userLoading: false,
+    BookLoading: false,
+    studentLoading: false,
     snackbar: false,
     y: "top",
     x: "right",
     mode: "",
     timeout: 3000,
     text: "",
     color: "",
     teacherData: [],
     studentData: [],
     parentData: [],
     userData: [],
     bookData: [],
     teacherFileJson: [],
     parentFileJson: [],
     userFileJson: [],
     bookFileJson: [],
     studentFileJson: [],
     teacherFileName: "",
     parentFileName: "",
     userFileName: "",
     bookFileName: "",
     bookStudentName: "",
     token: ""
   }),
   methods: {
     pickFile() {
       this.$refs.file.click();
     },
     pickParentFile() {
       this.$refs.parentfile.click();
     },
     pickUserFile() {
       this.$refs.userfile.click();
     },
     pickBookFile() {
       this.$refs.bookfile.click();
     },
     pickStudentFile() {
       this.$refs.studentfile.click();
     },
-    convertFile() {
+    convertFile(e) {
       const input = document.getElementById("fileInput");
-      const reader = new FileReader();
-      reader.onload = () => {
-        let text = reader.result;
-        //convert text to json here
-        var json = this.csvJSON(text);
-      };
-      reader.readAsText(input.files[0]);
       this.teacherFileName = input.files[0].name;
+      // const reader = new FileReader();
+      // console.log("reader", reader);
+      // reader.onload = () => {
+      //   let text = reader.result;
+      //   //convert text to json here
+      //   console.log("text", text);
+      //   var json = this.csvJSON(text);
+      // };
+      // reader.readAsText(input.files[0]);
+      var files = e.target.files,
+        f = files[0];
+      var reader = new FileReader();
+      let array = [];
+      let _this = this;
+      reader.onload = function(e) {
+        var data = new Uint8Array(e.target.result);
+        var workbook = XLSX.read(data, { type: "array" });
+        let sheetName = workbook.SheetNames[0];
+        // /* DO SOMETHING WITH workbook HERE */
+        let worksheet = workbook.Sheets[sheetName];
+        array = XLSX.utils.sheet_to_json(worksheet);
+        _this.teacherFileJson = array;
+      };
+      reader.readAsArrayBuffer(f);
     },
-    parentFile() {
+    parentFile(e) {
       const input = document.getElementById("parentInput");
-      const reader = new FileReader();
-      reader.onload = () => {
-        let text = reader.result;
-        //convert text to json here
-        var json = this.csvParentJSON(text);
-      };
-      reader.readAsText(input.files[0]);
       this.parentFileName = input.files[0].name;
+      console.log("this.parentFileName", this.parentFileName);
+      var files = e.target.files,
+        f = files[0];
+      var reader = new FileReader();
+      let array = [];
+      let _this = this;
+      reader.onload = function(e) {
+        var data = new Uint8Array(e.target.result);
+        var workbook = XLSX.read(data, { type: "array" });
+        let sheetName = workbook.SheetNames[0];
+        // /* DO SOMETHING WITH workbook HERE */
+        let worksheet = workbook.Sheets[sheetName];
+        array = XLSX.utils.sheet_to_json(worksheet);
+        _this.parentFileJson = array;
+      };
+      reader.readAsArrayBuffer(f);
     },
-    userFile() {
+    userFile(e) {
       const input = document.getElementById("userInput");
-      const reader = new FileReader();
-      reader.onload = () => {
-        let text = reader.result;
-        //convert text to json here
-        var json = this.csvUserJSON(text);
-      };
-      reader.readAsText(input.files[0]);
       this.userFileName = input.files[0].name;
+      var files = e.target.files,
+        f = files[0];
+      var reader = new FileReader();
+      let array = [];
+      let _this = this;
+      reader.onload = function(e) {
+        var data = new Uint8Array(e.target.result);
+        var workbook = XLSX.read(data, { type: "array" });
+        let sheetName = workbook.SheetNames[0];
+        // /* DO SOMETHING WITH workbook HERE */
+        let worksheet = workbook.Sheets[sheetName];
+        array = XLSX.utils.sheet_to_json(worksheet);
+        _this.userFileJson = array;
+      };
+      reader.readAsArrayBuffer(f);
     },
-    bookFile() {
+    bookFile(e) {
       const input = document.getElementById("bookInput");
-      const reader = new FileReader();
-      reader.onload = () => {
-        let text = reader.result;
-        //convert text to json here
-        var json = this.csvBookJSON(text);
-      };
-      reader.readAsText(input.files[0]);
       this.bookFileName = input.files[0].name;
+      console.log("this.bookFileName", this.bookFileName);
+      var files = e.target.files,
+        f = files[0];
+      console.log("this.bookFileName", files);
+      var reader = new FileReader();
+      console.log("reader================", reader);
+      let array = [];
+      let _this = this;
+      reader.onload = function(e) {
+        console.log("data", e.target.result);
+        var data = new Uint8Array(e.target.result);
+        console.log("data", data);
+        var workbook = XLSX.read(data, { type: "array" });
+        let sheetName = workbook.SheetNames[0];
+        // /* DO SOMETHING WITH workbook HERE */
+        let worksheet = workbook.Sheets[sheetName];
+        array = XLSX.utils.sheet_to_json(worksheet);
+        _this.bookFileJson = array;
+        console.log("this.bookFileJson ", _this.bookFileJson);
+      };
+      reader.readAsArrayBuffer(f);
     },
-    studentFile() {
+    studentFile(e) {
       const input = document.getElementById("studentInput");
-      const reader = new FileReader();
-      reader.onload = () => {
-        let text = reader.result;
-        //convert text to json here
-        var json = this.csvStudentJSON(text);
-      };
-      reader.readAsText(input.files[0]);
       this.bookStudentName = input.files[0].name;
+      var files = e.target.files,
+        f = files[0];
+      var reader = new FileReader();
+      let array = [];
+      let _this = this;
+      reader.onload = function(e) {
+        var data = new Uint8Array(e.target.result);
+        var workbook = XLSX.read(data, { type: "array" });
+        let sheetName = workbook.SheetNames[0];
+        // /* DO SOMETHING WITH workbook HERE */
+        let worksheet = workbook.Sheets[sheetName];
+        array = XLSX.utils.sheet_to_json(worksheet);
+        _this.studentFileJson = array;
+      };
+      reader.readAsArrayBuffer(f);
     },
-    csvJSON(csv) {
+    // csvJSON(csv) {
-      var lines = csv.split("\n");
+    //   var lines = csv.split("\n");
-      var result = [];
-      var headers = lines[0].split(",");
-      for (var i = 1; i < lines.length; i++) {
-        var obj = {};
-        var currentline = lines[i].split(",");
-        for (var j = 0; j < headers.length; j++) {
-          obj[headers[j]] = currentline[j];
-        }
-        this.teacherFileJson.push(obj);
-      }
-    },
-    csvParentJSON(csvParent) {
-      var lines = csvParent.split("\n");
-      var result = [];
-      var headers = lines[0].split(",");
-      for (var i = 1; i < lines.length; i++) {
-        var obj = {};
-        var currentline = lines[i].split(",");
-        for (var j = 0; j < headers.length; j++) {
-          obj[headers[j]] = currentline[j];
-        }
-        this.parentFileJson.push(obj);
-      }
-    },
-    csvUserJSON(cvsUser) {
-      var lines = cvsUser.split("\n");
-      var result = [];
-      var headers = lines[0].split(",");
-      for (var i = 1; i < lines.length; i++) {
-        var obj = {};
-        var currentline = lines[i].split(",");
-        for (var j = 0; j < headers.length; j++) {
-          obj[headers[j]] = currentline[j];
-        }
-        this.userFileJson.push(obj);
-      }
-    },
-    csvBookJSON(cvsBook) {
-      var lines = cvsBook.split("\n");
-      var result = [];
-      var headers = lines[0].split(",");
-      for (var i = 1; i < lines.length; i++) {
-        var obj = {};
-        var currentline = lines[i].split(",");
-        for (var j = 0; j < headers.length; j++) {
-          obj[headers[j]] = currentline[j];
-        }
-        this.bookFileJson.push(obj);
-      }
-    },
-    csvStudentJSON(cvsBook) {
-      var lines = cvsBook.split("\n");
-      var result = [];
-      var headers = lines[0].split(",");
+    //   var result = [];
+    //   var headers = lines[0].split(",");
-      for (var i = 1; i < lines.length; i++) {
+    //   for (var i = 1; i < lines.length; i++) {
-        var obj = {};
+    //     var obj = {};
-        var currentline = lines[i].split(",");
+    //     var currentline = lines[i].split(",");
-        for (var j = 0; j < headers.length; j++) {
+    //     for (var j = 0; j < headers.length; j++) {
-          obj[headers[j]] = currentline[j];
+    //       obj[headers[j]] = currentline[j];
-        }
+    //     }
-        this.studentFileJson.push(obj);
+    //     this.teacherFileJson.push(obj);
-      }
+    //   }
-    },
+    // },
     importTeacher() {
       this.loading = true;
       var teacherfile = {};
       teacherfile.teacherData = this.teacherFileJson;
       http()
         .post("/importTeacherData", teacherfile, {
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
           this.snackbar = true;
           this.text = response.data.message;
           this.color = "green";
           this.loading = false;
         })
         .catch(error => {
           this.snackbar = true;
           this.text = error.response.data.message;
           this.color = "red";
           this.loading = false;
         });
     },
     importParent() {
-      this.loading = true;
+      this.parentLoading = true;
       var parentfile = {};
       parentfile.parentData = this.parentFileJson;
       http()
         .post("/importParentData", parentfile, {
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
           this.snackbar = true;

src/pages/Report/progressCardReport.vue

Diff comments View file @748acd1

 <template>
   <v-app id="pages-dasboard">
     <!-- ******  Progress Card Report Table****** -->
     <v-card flat>
       <v-card-actions>
         <v-layout>
           <h4 class="ml-2">Progress Card Report</h4>
         </v-layout>
       </v-card-actions>
     </v-card>
     <v-card flat>
       <v-form ref="form" v-model="valid" lazy-validation>
         <v-flex xs12 sm12 lg12>
           <v-layout wrap>
             <v-flex xs12 sm12 lg3>
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Class:</label>
                 </v-flex>
                 <v-flex xs9 sm6 lg8 class="ml-2">
                   <v-select
                     v-model="getReport.classId"
                     label="Select your class"
                     type="text"
                     :items="classList"
                     item-text="classNum"
                     item-value="_id"
                     :rules="classRules"
                     @change="getSections(getReport.classId)"
                     required
                   ></v-select>
                 </v-flex>
               </v-layout>
             </v-flex>
             <v-flex xs12 sm12 lg3>
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Section:</label>
                 </v-flex>
                 <v-flex xs9 sm6 lg8 class="ml-2">
                   <v-select
                     :items="addSection"
                     label="Select your Section"
                     v-model="getReport.sectionId"
                     item-text="name"
                     item-value="_id"
                     name="Select Section"
                     @change="getStudents"
                     :rules="sectionRules"
                     required
                   ></v-select>
                 </v-flex>
               </v-layout>
             </v-flex>
             <v-flex xs12 sm12 lg3>
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Student:</label>
                 </v-flex>
                 <v-flex xs9 sm6 lg8 class="ml-2">
                   <v-select
                     :items="getStudentsList"
                     label="Select your student"
                     v-model="getReport.studentId"
                     item-text="name"
                     item-value="_id"
                     :rules="studentRules"
                     required
                   ></v-select>
                 </v-flex>
               </v-layout>
             </v-flex>
             <v-flex xs12 sm12 lg3>
               <v-btn
                 @click="getMarkReportList"
                 round
                 dark
                 :loading="loading"
                 class="right mt-3"
               >Get Report</v-btn>
             </v-flex>
           </v-layout>
         </v-flex>
       </v-form>
     </v-card>
     <v-container grid-list-md v-show="showReport">
       <!-- {{ filterData }} -->
       <v-layout>
         <v-flex xs12 sm12 v-if="filterData != {}">
           <v-btn class="grey" dark @click="print()">
             Print
             <v-icon right dark>print</v-icon>
           </v-btn>
         </v-flex>
       </v-layout>
       <v-flex xs12 sm12 id="printMe">
         <v-layout wrap>
           <!-- ****** TABLE DATA MARK  ****** -->
           <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;padding:20px"
             >
-              <!-- {{ value[index] }} -->
+              <v-layout v-if="index === 0">
-              <v-layout v-if="value[0] === 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="value[0] === 0">
+              <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;"
               >
                 <thead style="border: 1px solid lightgrey !important;">
                   <tr style="border: 1px solid lightgrey !important;padding:4px;">
                     <td
                       rowspan="2"
                       style="border: 1px solid lightgrey !important;padding: 10px;"
                     >Subject</td>
                     <!-- <template v-for="(exam,i) in value[index].studentsMarks">
                       <td
                         colspan="2"
                         style="border: 1px solid lightgrey !important;padding: 10px;"
                       >{{ exam.markDistributionId.distributionType }}</td>
                     </template>-->
-                    <template v-for="values in  value">
+                    <template v-for="studentData in  value">
                       <td
                         colspan="2"
-                        v-for="studentData in values.studentsMarks"
+                        v-for="studentMark in studentData.studentsMarks"
-                      >{{ studentData.markDistributionId.distributionType }}</td>
+                      >{{ studentMark.markDistributionId.distributionType }}</td>
                     </template>
                     <!-- <td>{{value[0].studentsMarks[1].markDistributionId.distributionType}}</td> -->
                     <td style="border: 1px solid lightgrey !important;padding: 10px;">Total</td>
                   </tr>
                   <tr
                     v-for="(subject, ind) in value"
                     v-if="ind == 0"
                     style="border: 1px solid lightgrey !important;"
                   >
                     <template v-for="(exam, i) in subject.studentsMarks">
                       <td style="border: 1px solid lightgrey !important;padding: 10px;">Mark</td>
                       <td style="border: 1px solid lightgrey !important;padding: 10px;">Highest Mark</td>
                     </template>
                     <td style="border: 1px solid lightgrey !important;padding: 10px;">Mark</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>
                     <template v-for="(exam, i) in subject.studentsMarks">
                       <td
                         style="border: 1px solid lightgrey !important;padding: 10px;"
                       >{{exam.marksScored}}</td>
                       <td
                         style="border: 1px solid lightgrey !important;padding: 10px;"
                       >{{exam.markDistributionId.markValue}}</td>
                     </template>
                     <td
                       style="border: 1px solid lightgrey !important;padding: 10px;"
                     >{{subject.totalMarks}}</td>
                   </tr>
                 </tbody>
                 <!-- <tfoot>
                   <tr>
                     <td colspan="4">
                       <span class="right subheding">Total Amount (RS) :</span>
                     </td>
                     <td>{{ feeType.subTotal }}</td>
                   </tr>
                   <tr>
                     <td colspan="4">
                       <span class="right subheding">Paid (RS) :</span>
                     </td>
                     <td>{{ feeType.totalPaidAmount ? feeType.totalPaidAmount : 0 }}</td>
                   </tr>
                   <tr>
                     <td colspan="4">
                       <span class="right subheding">Balance (RS) :</span>
                     </td>
                     <td>{{ feeType.totalPaidAmount ? feeType.subTotal - feeType.totalPaidAmount : feeType.subTotal }}</td>
                   </tr>
                 </tfoot>-->
               </table>
             </v-card>
           </v-flex>
         </v-layout>
       </v-flex>
     </v-container>
     <div class="loader" v-if="showLoader">
       <v-progress-circular indeterminate color="white"></v-progress-circular>
     </div>
   </v-app>
 </template>
 <script>
 import http from "@/Services/http.js";
 import moment from "moment";
 import _ from "underscore";
 export default {
   data: () => ({
     showLoader: false,
     markData: [],
     token: "",
     markDistributions: [],
     markParticularDistributionData: [],
     loading: false,
     valid: true,
     loading: false,
     showReport: false,
     addSection: [],
     filterData: [],
     getStudentsList: [],
     classRules: [v => !!v || "Class is required"],
     sectionRules: [v => !!v || "Class is required"],
     studentRules: [v => !!v || "Student is required"],
     getReport: {},
     classList: [],
     output: null,
     userData: {}
   }),
   mounted() {
     this.token = this.$store.state.token;
     this.getClass();
     this.getUserData();
   },
   methods: {
     clear() {
       this.$refs.form.reset();
     },
     getClass() {
       this.showLoader = true;
       http()
         .get("/getClassesList", {
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
           this.classList = response.data.data;
           this.showLoader = false;
         })
         .catch(error => {
           this.showLoader = false;
           // console.log("err====>", err);
         });
     },
     getSections(_id) {
       this.showLoader = true;
       http()
         .get(
           "/getSectionsList",
           { params: { classId: _id } },
           {
             headers: { Authorization: "Bearer " + this.token }
           }
         )
         .then(response => {
           this.addSection = response.data.data;
           this.showLoader = false;
         })
         .catch(err => {
           this.showLoader = false;
           // console.log("err====>", err);
         });
     },
     getStudents() {
       this.showLoader = true;
       http()
         .get("/getStudentWithClass", {
           params: {
             classId: this.getReport.classId,
             sectionId: this.getReport.sectionId
           }
         })
         .then(response => {
           this.getStudentsList = response.data.data;
           this.showLoader = false;
           // console.log("getSectionsList=====>", response.data.data);
         })
         .catch(error => {
           console.log("err====>", error);
           this.showLoader = false;
         });
     },
     getMarkReportList() {
       // this.showLoader = true;
       this.showReport = true;
       http()
         .get("/getParticularMark", {
           params: { studentId: this.getReport.studentId },
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
           this.showLoader = false;
           let newData = response.data.data;
           // console.log("response", newData);
           for (var i = 0; i < newData.length; i++) {
             newData[i].examination = newData[i].examId._id;
             // console.log("newData[i].examination", newData[i].examination);
           }
           this.filterData = _.groupBy(newData, ["examination"]);
           for (let data in this.filterData) {
             // console.log("data+++++++++++++++++++++++++++++++++++", data);
             for (let item in this.filterData[data]) {
               console.log(
                 "filterData[data]==========================>",
                 this.filterData[data]
               );
               console.log("filterData[item]==========================>", item);
               var totalMarks = 0;
               for (
                 let i = 0;
                 i < this.filterData[data][item].studentsMarks.length;
                 i++
               ) {
                 totalMarks += this.filterData[data][item].studentsMarks[i]
                   .marksScored;
               }
               this.filterData[data][item].totalMarks = totalMarks;
               // var total = 0;
               // total += this.filterData[data][item].totalMarks  ;
               // console.log("total", total);
             }
           }
         })
         .catch(error => {
           // console.log("err====>", err);
           this.showLoader = false;
           this.snackbar = true;
           this.text = error.response.data.message;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
             this.$store.dispatch("setToken", null);
             this.$store.dispatch("Id", null);
           }
         });
     },
     print() {
       // 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);
           }
         });
     }
   }
 };
 </script>
 <style scoped>
 table {
   border-collapse: collapse;
   border: 1px solid #e2e7eb;
 }
 th,
 td {
   border: 1px solid #e2e7eb;
   padding: 10px;
   text-align: center;
 }
 table.feeTypeTable {
   table-layout: auto !important;
   width: 100% !important;
 }
 .bg-sky {
   background-color: #98b2cc !important;
 }
 .bg-sky-light {
   background-color: #89a0b8;
 }
 .bg-purple {
   background-color: #9583ac;
 }
 .bg-skyDark {
   background-color: #956785;
 }
 @media screen and (max-width: 380px) {
   .tableRsponsive {
     display: block;
     position: relative;
     overflow: scroll;
   }
 }
 </style> s

src/script/users.js

Diff comments View file @748acd1

 export default () => {
     const users = [{
             "name": "Neeraj",
             "email": "neeraj.sharma@viithiisys.com",
             "dob": "1995-01-14",
             "gender": "Male",
+            "role": "LIBRARIAN",
             "religion": "Hindu",
             "address": "Mohali",
             "phone": "1234567890",
             "joiningDate": "2016-08-17",
         },
         {
             "name": "Rishav",
             "email": "rishav.singla@viithiisys.com",
             "dob": "1995-01-14",
             "gender": "Male",
+            "role": "ACCOUNTANT",
             "religion": "Hindu",
             "address": "Punjab",
             "phone": "9878768790",
             "joiningDate": "2016-08-17",
         }
     ]
     return users;
 }