viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit dbcbd11f41e7dfbb5a68187d4ee1870e2bb5aa73

Authored by Shikha Mishra
1 parent 1e1e364f19
Exists in master and in 2 other branches amber-development, ui-design

improve filename path in syllabus and assignment screen

Showing 2 changed files with 11 additions and 7 deletions   Show diff stats
src/pages/Academic/assignment.vue
Diff comments   View file @dbcbd11
... ... @@ -257,14 +257,14 @@
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="props.item.teacherId"
261 261 >{{ props.item.teacherId.name }}</td>
262 262 <td
263 263 class="text-xs-center td td-row"
264   - v-if="role === 'ADMIN'"
  264 + v-if="!props.item.teacherId"
265 265 >{{ props.item.schoolId.name }}</td>
266 266 <td class="text-xs-center td td-row">
267   - <a :href="props.item.fileName" target="_blank" style="text-decoration: none!important;">
  267 + <a :href="props.item.file" target="_blank" style="text-decoration: none!important;">
268 268 <v-btn flat block @click="generatePDF2Canvas(props.item)" :loading="loadingPdf">
269 269 <span>
270 270 <h5>{{props.item.fileName}}</h5>
... ...
src/pages/Academic/syllabus.vue
Diff comments   View file @dbcbd11
... ... @@ -196,7 +196,7 @@
196 196 <td class="text-xs-center td td-row">{{ props.item.description }}</td>
197 197 <td class="text-xs-center td td-row">{{ dates(props.item.created) }}</td>
198 198 <td
199   - class="text-xs-center td td-row"
  199 + class="text-xs-center td tgeneratePDF2Canvasd-row"
200 200 v-if="props.item.teacherId"
201 201 >{{ props.item.teacherId.name }}</td>
202 202 <td class="text-xs-center td td-row" v-else>{{ props.item.schoolId.name }}</td>
... ... @@ -206,9 +206,13 @@
206 206 @click="generatePDF2Canvas(props.item)"
207 207 :loading="loadingPdf"
208 208 dark
209   - >{{ props.item.fileName }}</v-btn>-->
210   - <a :href="props.item.fileName" target="_blank" style="text-decoration: none!important;">
211   - <v-btn flat block @click="generatePDF2Canvas(props.item)" :loading="loadingPdf">
  209 + >{{ props.item.fileType }}</v-btn>-->
  210 + <a
  211 + :href="props.item.documentUrl"
  212 + target="_blank"
  213 + style="text-decoration: none!important;"
  214 + >
  215 + <v-btn flat block>
212 216 <span>
213 217 <h5>{{props.item.fileName}}</h5>
214 218 </span>
... ...