From e5699315cd8e31dbf038aa32a45b1804e079ba9e Mon Sep 17 00:00:00 2001
From: Shikha Mishra <smshikhamishra25@gmail.com>
Date: Wed, 19 Aug 2020 17:17:54 +0530
Subject: [PATCH] Show latest event in dashboard while admin login

---
 src/pages/Dashboard/dashboard.vue | 67 +++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index e410521..453753b 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -530,7 +530,7 @@
 
             <!-- LATEST EVENTS -->
             <v-card class="my-3 elevation-0" v-if="role != 'TEACHER'">
-              <v-card-text>
+              <v-card-text v-if="$store.state.role === 'ADMIN' ">
                 <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
                 <div
                   v-for="(activity,index) in activityList"
@@ -544,20 +544,7 @@
                     style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
                   ></span>
                   <div style="display: inline-block;" class="ml-2">
-                    <!-- LATEST EVENTS FOR PARENT -->
-                    <div v-if="$store.state.role === 'PARENT' ">
-                      <div
-                        class="grey--text lighten-1 caption"
-                        v-if="activity.meetingEvent"
-                      >{{moment(activity.meetingEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
-                      <div
-                        class="body-2"
-                        v-if="activity.meetingEvent"
-                      >{{activity.meetingEvent.title}}</div>
-                    </div>
-
-                    <!-- LATEST EVENTS FOR TEACHER -->
-                    <div v-if="role == 'TEACHER'">
+                    <div>
                       <div
                         class="grey--text lighten-1 caption"
                         v-if="activity.dateOfEvent"
@@ -570,6 +557,43 @@
                   <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
                 </div>
               </v-card-text>
+              <v-card-text>
+                <!-- <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title> -->
+                <!-- <div
+                  v-for="(activity,index) in activityList"
+                  :key="index"
+                  class="mt-2"
+                  style="cursor: pointer;"
+                  @click="seeEventDetails(activity)"
+                >
+                  <span
+                    :style="{ 'background-color': colorsArray[index%colorsArray.length] }"
+                    style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
+                ></span>-->
+                <div style="display: inline-block;" class="ml-2">
+                  <!-- LATEST EVENTS FOR PARENT -->
+                  <div v-if="$store.state.role === 'PARENT' ">
+                    <div
+                      class="grey--text lighten-1 caption"
+                      v-if="activity.meetingEvent"
+                    >{{moment(activity.meetingEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                    <div class="body-2" v-if="activity.meetingEvent">{{activity.meetingEvent.title}}</div>
+                  </div>
+
+                  <!-- LATEST EVENTS FOR TEACHER -->
+                  <div v-if="role === 'TEACHER'">
+                    <div
+                      class="grey--text lighten-1 caption"
+                      v-if="activity.dateOfEvent"
+                    >{{moment(activity.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                    <div class="body-2" v-if="activity.title">{{activity.title}}</div>
+                  </div>
+                </div>
+                <div v-if="activityList.length == 0">
+                  <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
+                </div>
+                <!-- </div> -->
+              </v-card-text>
             </v-card>
           </v-card-text>
         </v-card>
@@ -801,6 +825,12 @@ export default {
         });
         this.viewEventDetails = true;
       }
+      if (this.$store.state.role === "ADMIN") {
+        await this.getParticularMeetingEvent({
+          meetingEventId: activity._id,
+        });
+        this.viewEventDetails = true;
+      }
     },
     async routeToCourseDetails(courseId) {
       /* getParticularCourseDetail- To get courseDetail - defined in GetApis.js*/
@@ -1017,7 +1047,7 @@ export default {
         });
     },
     async getMeetingEventes() {
-      if (this.role == "TEACHER") {
+      if (this.role == "TEACHER" || this.role === "ADMIN") {
         this.showLoader = true;
         await http()
           .get("/getMeetingEventesList")
@@ -1102,7 +1132,7 @@ export default {
     }
 
     /* get Latest events list for teacher login*/
-    if (this.role == "TEACHER") {
+    if (this.role == "TEACHER" || this.role == "ADMIN") {
       await this.getMeetingEventes();
     }
   },
@@ -1115,7 +1145,4 @@ export default {
 a {
   color: white;
 }
-
-#pages-dasboard {
-}
 </style>
\ No newline at end of file
-- 
2.0.0