viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 107ec8845f94912dbc5388b3455b61b75e4896d2

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

change icon while routing courses in parent login

Showing 1 changed file with 40 additions and 26 deletions   Show diff stats
src/pages/Dashboard/dashboard.vue
Diff comments   View file @107ec88
... ... @@ -374,11 +374,22 @@
374 374 <template>
375 375 <v-list-tile v-for="(course,i) in courseData" :key="i">
376 376 <v-list-tile-avatar>
377   - <v-icon
  377 + <!-- <v-icon
378 378 class="account-circle darkBlue-color"
379 379 style="cursor: pointer;"
380 380 @click="routeToCourseDetails(course._id)"
381   - >panorama_fish_eye</v-icon>
  381 + >panorama_fish_eye</v-icon>-->
  382 + <span>
  383 + <v-tooltip top>
  384 + <img
  385 + slot="activator"
  386 + style="cursor:pointer; width:25px; height:25px; "
  387 + src="/static/icon/view.png"
  388 + @click="routeToCourseDetails(course._id)"
  389 + />
  390 + <span>View</span>
  391 + </v-tooltip>
  392 + </span>
382 393 </v-list-tile-avatar>
383 394 <v-list-tile-content>
384 395 <v-list-tile-title
... ... @@ -557,9 +568,9 @@
557 568 <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
558 569 </div>
559 570 </v-card-text>
560   - <v-card-text>
561   - <!-- <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title> -->
562   - <!-- <div
  571 + <v-card-text v-if="$store.state.role != 'ADMIN'">
  572 + <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
  573 + <div
563 574 v-for="(activity,index) in activityList"
564 575 :key="index"
565 576 class="mt-2"
... ... @@ -569,30 +580,33 @@
569 580 <span
570 581 :style="{ 'background-color': colorsArray[index%colorsArray.length] }"
571 582 style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
572   - ></span>-->
573   - <div style="display: inline-block;" class="ml-2">
574   - <!-- LATEST EVENTS FOR PARENT -->
575   - <div v-if="$store.state.role === 'PARENT' ">
576   - <div
577   - class="grey--text lighten-1 caption"
578   - v-if="activity.meetingEvent"
579   - >{{moment(activity.meetingEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
580   - <div class="body-2" v-if="activity.meetingEvent">{{activity.meetingEvent.title}}</div>
581   - </div>
  583 + ></span>
  584 + <div style="display: inline-block;" class="ml-2">
  585 + <!-- LATEST EVENTS FOR PARENT -->
  586 + <div v-if="$store.state.role === 'PARENT' ">
  587 + <div
  588 + class="grey--text lighten-1 caption"
  589 + v-if="activity.meetingEvent"
  590 + >{{moment(activity.meetingEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
  591 + <div
  592 + class="body-2"
  593 + v-if="activity.meetingEvent"
  594 + >{{activity.meetingEvent.title}}</div>
  595 + </div>
582 596  
583   - <!-- LATEST EVENTS FOR TEACHER -->
584   - <div v-if="role === 'TEACHER'">
585   - <div
586   - class="grey--text lighten-1 caption"
587   - v-if="activity.dateOfEvent"
588   - >{{moment(activity.dateOfEvent).format("DD MMMM, YYYY")}}</div>
589   - <div class="body-2" v-if="activity.title">{{activity.title}}</div>
  597 + <!-- LATEST EVENTS FOR TEACHER -->
  598 + <div v-if="role === 'TEACHER'">
  599 + <div
  600 + class="grey--text lighten-1 caption"
  601 + v-if="activity.dateOfEvent"
  602 + >{{moment(activity.dateOfEvent).format("DD MMMM, YYYY")}}</div>
  603 + <div class="body-2" v-if="activity.title">{{activity.title}}</div>
  604 + </div>
  605 + </div>
  606 + <div v-if="activityList.length == 0">
  607 + <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
590 608 </div>
591 609 </div>
592   - <div v-if="activityList.length == 0">
593   - <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
594   - </div>
595   - <!-- </div> -->
596 610 </v-card-text>
597 611 </v-card>
598 612 </v-card-text>
... ...