Commit b3f2f7ad75b124cb1e535600880955f4023d6224
1 parent
1e285a1d6f
Exists in
master
and in
3 other branches
show exam name
Showing
1 changed file
with
34 additions
and
30 deletions
Show diff stats
src/pages/Report/admitCard.vue
... | ... | @@ -157,7 +157,7 @@ |
157 | 157 | <h2>{{ userData.name }}</h2> |
158 | 158 | <v-flex class="school-address"> |
159 | 159 | <p>{{ userData.address }}, {{ userData.pinCode }}</p> |
160 | - <h4>First Terminal Exam Admit Card - (2019-2020)</h4> | |
160 | + <h4>{{ examName }} Exam Admit Card - (2019-2020)</h4> | |
161 | 161 | </v-flex> |
162 | 162 | </div> |
163 | 163 | <!-- <div class="student-logo"> |
... | ... | @@ -218,44 +218,46 @@ |
218 | 218 | <img src="/static/icon/dashboard icons-18.png" width="140" v-else-if="!userData.profilePicUrl" /> |
219 | 219 | <p class="title">{{ userData.name }}</p> |
220 | 220 | <p>{{ userData.address }}, {{ userData.pinCode }}</p> |
221 | - <h4>First Terminal Exam Admit Card - (2019-2020)</h4> | |
221 | + <div> | |
222 | + <h4>First Terminal Exam Admit Card - (2019-2020)</h4> | |
223 | + </div> | |
222 | 224 | </v-flex> |
223 | 225 | </v-layout> |
224 | 226 | <table |
225 | 227 | class="mb-5 tableRsponsive feeTypeTable" |
226 | 228 | style="border: 1px solid lightgrey; |
227 | - border-collapse: collapse;!important | |
228 | - table-layout: auto !important; | |
229 | - width: 100% !important;" | |
229 | + border-collapse: collapse;!important | |
230 | + table-layout: auto !important; | |
231 | + width: 100% !important;" | |
230 | 232 | > |
231 | 233 | <thead style="border: 1px solid lightgrey !important;"> |
232 | - <tr style="border: 1px solid lightgrey !important;padding:4px;"> | |
233 | - <td style="border: 1px solid lightgrey !important;padding: 6px;">No</td> | |
234 | - <td style="border: 1px solid lightgrey !important;padding: 6px;">Exam Date</td> | |
235 | - <td style="border: 1px solid lightgrey !important;padding: 6px;">Start Time</td> | |
236 | - <td style="border: 1px solid lightgrey !important;padding: 6px;">End Time</td> | |
237 | - <td style="border: 1px solid lightgrey !important;padding: 6px;">Subject Name</td> | |
238 | - </tr> | |
234 | + <tr style="border: 1px solid lightgrey !important;padding:4px;"> | |
235 | + <td style="border: 1px solid lightgrey !important;padding: 6px;">No</td> | |
236 | + <td style="border: 1px solid lightgrey !important;padding: 6px;">Exam Date</td> | |
237 | + <td style="border: 1px solid lightgrey !important;padding: 6px;">Start Time</td> | |
238 | + <td style="border: 1px solid lightgrey !important;padding: 6px;">End Time</td> | |
239 | + <td style="border: 1px solid lightgrey !important;padding: 6px;">Subject Name</td> | |
240 | + </tr> | |
239 | 241 | </thead> |
240 | 242 | <tbody |
241 | - style="border: 1px solid lightgrey !important;"> | |
242 | - <tr v-for="(scheduleData,index) in getScheduleListArray"> | |
243 | - <td | |
244 | - style="border: 1px soild lightgrey !importand;padding:6px;" | |
245 | - >{{ index + 1 }}</td> | |
246 | - <td | |
247 | - style="border: 1px solid lightgrey !important;padding: 6px;" | |
248 | - >{{ scheduleData.date }}</td> | |
249 | - <td | |
250 | - style="border: 1px solid lightgrey !important;padding: 6px;" | |
251 | - >{{ scheduleData.timeFrom }}</td> | |
252 | - <td | |
253 | - style="border: 1px solid lightgrey !important;padding: 6px;" | |
254 | - >{{ scheduleData.timeTo }}</td> | |
255 | - <td | |
256 | - style="border: 1px solid lightgrey !important;padding: 6px;" | |
257 | - >{{ scheduleData.subjectName }}</td> | |
258 | - </tr> | |
243 | + style="border: 1px solid lightgrey !important;"> | |
244 | + <tr v-for="(scheduleData,index) in getScheduleListArray"> | |
245 | + <td | |
246 | + style="border: 1px soild lightgrey !importand;padding:6px;" | |
247 | + >{{ index + 1 }}</td> | |
248 | + <td | |
249 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
250 | + >{{ scheduleData.date }}</td> | |
251 | + <td | |
252 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
253 | + >{{ scheduleData.timeFrom }}</td> | |
254 | + <td | |
255 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
256 | + >{{ scheduleData.timeTo }}</td> | |
257 | + <td | |
258 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
259 | + >{{ scheduleData.subjectName }}</td> | |
260 | + </tr> | |
259 | 261 | </tbody> |
260 | 262 | </table> |
261 | 263 | </v-flex> |
... | ... | @@ -359,6 +361,7 @@ export default { |
359 | 361 | getStudentsList: [], |
360 | 362 | getScheduleList: [], |
361 | 363 | getScheduleListArray: [], |
364 | + examName: [], | |
362 | 365 | typeList: [ |
363 | 366 | { |
364 | 367 | name: "Front Part", |
... | ... | @@ -513,6 +516,7 @@ export default { |
513 | 516 | .then(response => { |
514 | 517 | this.getScheduleList = response.data.data; |
515 | 518 | this.getScheduleListArray = response.data.data.scheduleData; |
519 | + this.examName = response.data.data.scheduleData[0].examId.examName; | |
516 | 520 | this.showTable = true; |
517 | 521 | this.showData = true; |
518 | 522 | this.showLoader = false; | ... | ... |