From 558365e7b3466ea60f90d7024a3a28a4c998416b Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Fri, 28 Feb 2020 19:01:21 +0530
Subject: [PATCH] graph change in dashboard and set field of admit card
 according to requirement

---
 src/pages/Dashboard/dashboard.vue | 8 ++++----
 src/pages/Report/admitCard.vue    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index a2afa6c..5550cea 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -145,17 +145,18 @@
                         </v-list>
                       </v-flex>
                       <v-flex xs12 sm12 md9 lg9>
-                        <!-- <div id="chart"> -->
-                        <div v-if="this.series" title="Swarn Singh">
+                        <div id="chart">
+                        <div v-if="this.series">
                           <apexchart
                             type="bar"
                             height="250"
                             style="max-width: 800px !important"
                             :options="chartOptions"
                             :series="series"
+                            v-show="true"
                           ></apexchart>
                         </div>
-                        <!-- </div> -->
+                        </div>
                       </v-flex>
                     </v-layout>
                   </v-card>
@@ -646,7 +647,6 @@ export default {
           this.expenseData = response.data.data;
           // var array = response.data.data.sum;
           this.series[0].data[2] = this.expenseData.sum;
-          // console.log("this.series.data", this.series[0].data);
           // this.series = [
           //   {
           //     name: "Total",
diff --git a/src/pages/Report/admitCard.vue b/src/pages/Report/admitCard.vue
index bbef7bc..6a355fd 100644
--- a/src/pages/Report/admitCard.vue
+++ b/src/pages/Report/admitCard.vue
@@ -25,7 +25,7 @@
               </v-layout>
             </v-flex>
 
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.examId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Class:</label>
@@ -45,7 +45,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.classId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Section:</label>
@@ -65,7 +65,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
-            <v-flex xs12 sm12 lg3>
+            <v-flex xs12 sm12 lg3 v-if="getReport.sectionId">
               <v-layout>
                 <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Student:</label>
-- 
2.0.0