From 819c223ec08cc985738f4d27e53b5664a7b68dfa Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Thu, 13 Feb 2020 18:41:18 +0530
Subject: [PATCH] improve school and persons logo and details

---
 src/pages/Mark/viewMark.vue             | 23 +++++++----------------
 src/pages/Report/progressCardReport.vue | 15 +++++++--------
 src/pages/Report/studentReport.vue      | 20 ++++++++++++++++++--
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue
index 7e5a994..bde2ead 100644
--- a/src/pages/Mark/viewMark.vue
+++ b/src/pages/Mark/viewMark.vue
@@ -23,7 +23,7 @@
         <v-layout wrap>
           <!-- ****** TABLE DATA MARK  ****** -->
           <v-flex xs12 sm12 md12>
-            <v-card
+            <v-card 
               v-for="(value, id, index) in filterData"
               :key="index"
               flat
@@ -36,33 +36,24 @@
                   <p>{{ userData.address }}</p>
                 </v-flex>
                 <v-flex xs12 sm12 md12 class="text-xs-center">
-                  <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 size="80px">
+                    <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>
                   <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>
+                  > 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>
+                  > Section : {{ value[0].sectionId.name }}</p>
                   <p
                     style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                  >Section : {{ value[0].sectionId.name }}</p>
+                  > Roll No : {{ value[0].studentId.rollNo }}</p>
                 </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;
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index cc689e9..7502a69 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -117,21 +117,20 @@
                           >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>
+                          >Section : {{ value[0].sectionId.name }}</p>
                           <p
                             style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
-                          >Section : {{ value[0].sectionId.name }}</p>
+                          >Roll NO : {{ value[0].studentId.rollNo }}</p>
                       </v-flex>
                     </v-layout>
-                    <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
+                    <!-- <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;
-                        overflow: hidden; 
-                        display: block;"
+                        overflow: hidden;"
                     >
                       <thead style="border: 1px solid lightgrey !important;">
                         <tr style="border: 1px solid lightgrey !important;padding:4px;">
@@ -144,13 +143,13 @@
                             colspan="2"
                             style="border: 1px solid lightgrey !important;padding: 10px;"
                           >{{ exam.markDistributionId.distributionType }}</td>
-                          <template v-for="studentData in  value">
+                          <!-- <template v-for="studentData in  value">
                             <td
                               colspan="2"
                               v-for="studentMark in studentData.studentsMarks"
                             >{{ studentMark.markDistributionId.distributionType }}</td>
-                          </template>
-                          <td>{{value[0].studentsMarks[1].markDistributionId.distributionType}}</td>
+                          </template> -->
+                          <!-- <td>{{value[0].studentsMarks[1].markDistributionId.distributionType}}</td> -->
 
                           <td style="border: 1px solid lightgrey !important;padding: 10px;">Total</td>
                         </tr>
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index c8cd8f4..f4255c7 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -197,7 +197,23 @@
               <p class="title">{{ userData.name }}</p>
               <p>{{ userData.address }}</p>
             </v-flex>
-            <v-flex xs12 sm12 md12 class="text-xs-center">
+            <v-flex xs12 sm12 md12 class="text-xs-center" v-for="(studentReport,i) in getStudentsReportList" :key="i">
+              <v-avatar>
+                <img :src="studentReport.profilePicUrl" v-if="studentReport.profilePicUrl" />
+                <img src="/static/icon/user.png" v-else-if="!studentReport.profilePicUrl" />
+              </v-avatar>
+              <p
+                style="font-size:20px;margin:0px;margin-bottom:4px;"
+              >{{ studentReport.name }}</p>
+              <p
+                style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
+              > Class : {{ studentReport.classId.classNum }}</p>
+              <p
+                style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
+              > Section : {{ studentReport.sectionId.name }}</p>
+              <p
+                style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
+              > RollNo : {{ studentReport.rollNo }}</p>
             </v-flex>
           </v-layout>
           <v-data-table
@@ -596,4 +612,4 @@ export default {
 .activebtn {
   color: black !important;
 }
-</style>s
\ No newline at end of file
+</style>
\ No newline at end of file
-- 
2.0.0