show uploader name and solve bug related to uploader in assignment, solve bug re…

…lated to school details and set design of edit card in school

show uploader name and solve bug related to uploader in assignment, solve bug re…
…lated to school details and set design of edit card in school
Shikha Mishra
1 parent eadd79e624
Showing 3 changed files with 12 additions and 5 deletions Show diff stats
src/pages/Academic/assignment.vue
src/pages/Report/admitCard.vue
src/pages/School/school.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"
@@ -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;
@@ -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">
...	...	@@ -257,12 +257,12 @@
257	257	<td class="text-xs-center td td-row">{{ props.item.sectionId.name }}</td>
258	258	<td
259	259	class="text-xs-center td td-row"
260		- v-if="role != 'TEACHER' "
	260	+ v-if="role === 'TEACHER'"
261	261	>{{ props.item.teacherId.name }}</td>
262	262	<td
263	263	class="text-xs-center td td-row"
264		- v-if="role != 'ADMIN'"
265		- >{{ props.item.schoolId .name }}</td>
	264	+ v-if="role === 'ADMIN'"
	265	+ >{{ props.item.schoolId.name }}</td>
266	266	<td class="text-xs-center td td-row">
267	267	<v-btn
268	268	class="add-button"
...	...
...	...	@@ -136,12 +136,17 @@
136	136	style="widht:80px;height:80px;"
137	137	v-else-if="!userData.schoolLogoUrl"
138	138	/>
	139	+ <div class="school-name">
	140	+ <h3>{{ schoolData.address }}</h3>
	141	+ <p>{{ schoolData.mobile }}</p>
	142	+ </div>
139	143	</v-flex>
140	144	<v-flex xs5 style="text-align:center;margin-bottom:0px">
141	145	<p
142	146	style="font-size:24px;color: #700CE8;letter-spacing:1px;margin-bottom: 4px"
143		- >{{ userData.name }}</p>
144		- <p>{{ userData.address }} {{ userData.pinCode }}</p>
	147	+ >{{ schoolData.name }}</p>
	148	+ <p>{{ schoolData.email }}</p>
	149	+
145	150	<div>
146	151	<h4>{{ getScheduleList.scheduleData[0].examId.examName }} Exam Admit Card</h4>
147	152	</div>
...	...	@@ -543,6 +548,7 @@ export default {
543	548	.then((response) => {
544	549	this.showTable = true;
545	550	this.getScheduleList = response.data.data;
	551	+ this.schoolData = response.data.data.studentData.schoolId;
546	552	if (response.data.data.scheduleData.length === 0) {
547	553	this.showLoader = false;
548	554	this.snackbar = true;
...	...
...	...	@@ -36,6 +36,7 @@
36	36	<h3>Edit School</h3>
37	37	</v-toolbar-title>
38	38	<v-spacer></v-spacer>
	39	+ <v-icon size="24" class="right" @click="dialog = false">cancel</v-icon>
39	40	</v-toolbar>
40	41	<v-card-text style="height: 686px;">
41	42	<v-form ref="form">
...	...