From c0b01ae20e75a0c20e5bac2cdaa07f64bf9803dd Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Thu, 16 Jan 2020 00:37:00 +0530
Subject: [PATCH] solve bugs in progressCardReport

---
 src/pages/Report/progressCardReport.vue | 253 ++++++++++++++++----------------
 1 file changed, 129 insertions(+), 124 deletions(-)

diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index d6f0571..36b3883 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -84,11 +84,10 @@
         </v-flex>
       </v-form>
     </v-card>
-    <!-- ****** PROFILE MARK  ****** -->
-
-    <v-container fluid grid-list-md v-show="showReport">
+    <v-container grid-list-md v-show="showReport">
+      <!-- {{ filterData }} -->
       <v-layout>
-        <v-flex xs12 sm12>
+        <v-flex xs12 sm12 v-if="filterData != {}">
           <v-btn class="grey" dark @click="print()">
             Print
             <v-icon right dark>print</v-icon>
@@ -97,106 +96,64 @@
       </v-layout>
       <v-flex xs12 sm12 id="printMe">
         <v-layout wrap>
-          <v-flex xs12 sm12 md3>
-            <v-card class="fixcolors white--text" flat>
-              <v-card-actions class="pa-0">
-                <v-spacer></v-spacer>
-                <v-card-title class="pa-2">
-                  <h3>Profile</h3>
-                </v-card-title>
-                <v-spacer></v-spacer>
-              </v-card-actions>
-            </v-card>
-            <v-card flat>
-              <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 xs6 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 xs6 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-card>
-          </v-flex>
-
           <!-- ****** TABLE DATA MARK  ****** -->
-
-          <v-flex xs12 sm12 md9>
-            <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-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"
             >
+              <!-- {{ value[index] }} -->
+              <v-layout>
+                <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-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"
@@ -206,19 +163,25 @@
                   width: 100% !important;"
               >
                 <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;"
                     >Subject</td>
-                    <td
-                      colspan="2"
-                      v-for="exam in value[index].studentsMarks"
-                      style="border: 1px solid lightgrey !important;padding: 10px;"
-                    >{{exam.markDistributionId.distributionType}}</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">
+                      <td
+                        colspan="2"
+                        v-for="studentData in values.studentsMarks"
+                      >{{ studentData.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
@@ -227,19 +190,10 @@
                     style="border: 1px solid lightgrey !important;"
                   >
                     <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>
+                      <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
-                      class="bg-sky white--text"
-                      style="border: 1px solid lightgrey !important;padding: 10px;"
-                    >Mark</td>
+                    <td style="border: 1px solid lightgrey !important;padding: 10px;">Mark</td>
                   </tr>
                 </thead>
                 <tbody style="border: 1px solid lightgrey !important;">
@@ -260,6 +214,26 @@
                     >{{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>
@@ -296,11 +270,13 @@ export default {
     studentRules: [v => !!v || "Student is required"],
     getReport: {},
     classList: [],
-    output: null
+    output: null,
+    userData: {}
   }),
   mounted() {
     this.token = this.$store.state.token;
     this.getClass();
+    this.getUserData();
   },
   methods: {
     clear() {
@@ -316,12 +292,13 @@ export default {
           this.classList = response.data.data;
           this.showLoader = false;
         })
-        .catch(err => {
+        .catch(error => {
           this.showLoader = false;
           // console.log("err====>", err);
         });
     },
     getSections(_id) {
+      this.showLoader = true;
       http()
         .get(
           "/getSectionsList",
@@ -332,8 +309,10 @@ export default {
         )
         .then(response => {
           this.addSection = response.data.data;
+          this.showLoader = false;
         })
         .catch(err => {
+          this.showLoader = false;
           // console.log("err====>", err);
         });
     },
@@ -349,7 +328,7 @@ export default {
         .then(response => {
           this.getStudentsList = response.data.data;
           this.showLoader = false;
-          console.log("getSectionsList=====>", response.data.data);
+          // console.log("getSectionsList=====>", response.data.data);
         })
         .catch(error => {
           console.log("err====>", error);
@@ -357,7 +336,7 @@ export default {
         });
     },
     getMarkReportList() {
-      this.showLoader = true;
+      // this.showLoader = true;
       this.showReport = true;
       http()
         .get("/getParticularMark", {
@@ -365,13 +344,23 @@ export default {
           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;
@@ -382,9 +371,11 @@ export default {
                   .marksScored;
               }
               this.filterData[data][item].totalMarks = totalMarks;
+              // var total = 0;
+              // total += this.filterData[data][item].totalMarks  ;
+              // console.log("total", total);
             }
           }
-          this.showLoader = false;
         })
         .catch(error => {
           // console.log("err====>", err);
@@ -401,6 +392,20 @@ export default {
     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);
+          }
+        });
     }
   }
 };
-- 
2.0.0