From 57a3ca1d663b902debb7b73d61908369cd08b684 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <smshikhamishra25@gmail.com>
Date: Wed, 19 Aug 2020 13:38:36 +0530
Subject: [PATCH] show uploader name and solve bug related to uploader in
 assignment, solve bug related to school details and set design of edit card
 in school

---
 src/pages/Academic/assignment.vue |  6 +++---
 src/pages/Report/admitCard.vue    | 10 ++++++++--
 src/pages/School/school.vue       |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/pages/Academic/assignment.vue b/src/pages/Academic/assignment.vue
index 2559909..ae2c00b 100644
--- a/src/pages/Academic/assignment.vue
+++ b/src/pages/Academic/assignment.vue
@@ -257,12 +257,12 @@
           <td class="text-xs-center td td-row">{{ props.item.sectionId.name }}</td>
           <td
             class="text-xs-center td td-row"
-            v-if="role !=  'TEACHER' "
+            v-if="role === 'TEACHER'"
           >{{ props.item.teacherId.name }}</td>
           <td
             class="text-xs-center td td-row"
-            v-if="role !=  'ADMIN'"
-          >{{ props.item.schoolId .name }}</td>
+            v-if="role === 'ADMIN'"
+          >{{ props.item.schoolId.name }}</td>
           <td class="text-xs-center td td-row">
             <v-btn
               class="add-button"
diff --git a/src/pages/Report/admitCard.vue b/src/pages/Report/admitCard.vue
index e353344..f193d5e 100644
--- a/src/pages/Report/admitCard.vue
+++ b/src/pages/Report/admitCard.vue
@@ -136,12 +136,17 @@
                   style="widht:80px;height:80px;"
                   v-else-if="!userData.schoolLogoUrl"
                 />
+                <div class="school-name">
+                  <h3>{{ schoolData.address }}</h3>
+                  <p>{{ schoolData.mobile }}</p>
+                </div>
               </v-flex>
               <v-flex xs5 style="text-align:center;margin-bottom:0px">
                 <p
                   style="font-size:24px;color: #700CE8;letter-spacing:1px;margin-bottom: 4px"
-                >{{ userData.name }}</p>
-                <p>{{ userData.address }} {{ userData.pinCode }}</p>
+                >{{ schoolData.name }}</p>
+                <p>{{ schoolData.email }}</p>
+
                 <div>
                   <h4>{{ getScheduleList.scheduleData[0].examId.examName }} Exam Admit Card</h4>
                 </div>
@@ -543,6 +548,7 @@ export default {
           .then((response) => {
             this.showTable = true;
             this.getScheduleList = response.data.data;
+            this.schoolData = response.data.data.studentData.schoolId;
             if (response.data.data.scheduleData.length === 0) {
               this.showLoader = false;
               this.snackbar = true;
diff --git a/src/pages/School/school.vue b/src/pages/School/school.vue
index 5f053d4..02b37a1 100644
--- a/src/pages/School/school.vue
+++ b/src/pages/School/school.vue
@@ -36,6 +36,7 @@
                 <h3>Edit School</h3>
               </v-toolbar-title>
               <v-spacer></v-spacer>
+              <v-icon size="24" class="right" @click="dialog = false">cancel</v-icon>
             </v-toolbar>
             <v-card-text style="height: 686px;">
               <v-form ref="form">
-- 
2.0.0