diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 8a822d6..8e35023 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -102,7 +102,7 @@
       <v-flex xs12 sm12 md9>
         <v-container fluid grid-list-xl>
           <!-- ***** Total Students ***** -->
-          <!-- <v-flex xs12 sm12 md12>
+          <v-flex xs12 sm12 md12 v-if="$store.state.role == 'TEACHER' ">
             <v-layout wrap class>
               <v-flex xs12 sm12 md3>
                 <router-link :to="{ name:'Students' }">
@@ -112,9 +112,9 @@
                     <v-card-title class="headline py-1 white--text">{{ students.length }}</v-card-title>
                   </v-card>
                 </router-link>
-          </v-flex>-->
-          <!-- ***** Total Teachers***** -->
-          <!-- <v-flex xs12 sm12 md3>
+              </v-flex>
+              <!-- ***** Total Teachers***** -->
+              <v-flex xs12 sm12 md3>
                 <router-link :to="{ name:'Teachers' }">
                   <v-card flat class="card elevation-2 firozi-bgcolor">
                     <v-card-title primary-title class="titleCard white--text py-3">Teachers</v-card-title>
@@ -123,9 +123,9 @@
                     <v-card-title class="headline py-1 white--text">{{ teachers.length }}</v-card-title>
                   </v-card>
                 </router-link>
-          </v-flex>-->
-          <!-- ***** Total Parents ***** -->
-          <!-- <v-flex xs12 sm12 md3>
+              </v-flex>
+              <!-- ***** Total Parents ***** -->
+              <v-flex xs12 sm12 md3>
                 <router-link :to="{ name:'Parents' }">
                   <v-card flat class="card yellow darken-3">
                     <v-card-title primary-title class="titleCard white--text py-3">Parents</v-card-title>
@@ -133,9 +133,9 @@
                     <v-card-title class="headline py-1 white--text">{{ parents.length }}</v-card-title>
                   </v-card>
                 </router-link>
-          </v-flex>-->
-          <!-- ***** Total Class***** -->
-          <!-- <v-flex xs12 sm12 md3>
+              </v-flex>
+              <!-- ***** Total Class***** -->
+              <v-flex xs12 sm12 md3>
                 <router-link :to="{ name:'Class' }">
                   <v-card flat class="card darkBlue-bgcolor">
                     <v-card-title primary-title class="titleCard white--text py-3">Class</v-card-title>
@@ -145,7 +145,7 @@
                 </router-link>
               </v-flex>
             </v-layout>
-          </v-flex>-->
+          </v-flex>
           <p
             v-if="studentsData.length === 0 && role == 'PARENT'"
             class="text-center title grey lighten-4 error--text"
@@ -418,25 +418,31 @@
             <!-- LATEST ACTIVITY -->
             <v-card class="my-3 elevation-0">
               <v-card-text>
-                <v-card-title class="justify-center subheading font-weight-bold">Latest Activity</v-card-title>
+                <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({meetingEventId: activity.meetingEvent._id})"
+                  @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">
-                    <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 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"
@@ -667,9 +673,17 @@ export default {
       });
       this.viewEventDetails = true;
     },
-    async seeEventDetails(params) {
-      await this.getParticularMeetingEvent(params);
-      this.viewEventDetails = true;
+    async seeEventDetails(activity) {
+      if (this.$store.state.role === "TEACHER") {
+        await this.getParticularMeetingEvent({ meetingEventId: activity._id });
+        this.viewEventDetails = true;
+      }
+      if (this.$store.state.role === "PARENT") {
+        await this.getParticularMeetingEvent({
+          meetingEventId: activity.meetingEvent._id
+        });
+        this.viewEventDetails = true;
+      }
     },
     async routeToCourseDetails(courseId) {
       /* getParticularCourseDetail- To get courseDetail - defined in GetApis.js*/
@@ -953,6 +967,17 @@ export default {
             var activityList = response.data.data;
             this.activityList = activityList;
             this.showLoader = false;
+
+            /* set activityEvents array to highlight event dates in calender */
+            for (var i = 0; i < this.activityList.length; i++) {
+              let obj = {};
+              obj.date = moment(this.activityList[i].dateOfEvent).format(
+                "YYYY/MM/DD"
+              );
+              obj.title = this.activityList[i].title;
+              obj._id = this.activityList[i]._id;
+              this.activityEvents.push(obj);
+            }
           })
           .catch(error => {
             this.showLoader = false;
@@ -994,7 +1019,7 @@ export default {
   },
 
   async created() {
-    /* get Latest events list */
+    /* get Latest events list for student login*/
     if (this.$store.state.role != "TEACHER") {
       let response = await this.studentMeetingEvents({
         studentId: localStorage.getItem("parentStudentId")
@@ -1012,6 +1037,10 @@ export default {
         this.activityEvents.push(obj);
       }
     }
+    /* get Latest events list for teacher login*/
+    //  if(this.$store.state.role == "TEACHER"){
+
+    //  }
   }
 };
 </script>