diff --git a/src/pages/Annoucement/annoucementForum.vue b/src/pages/Annoucement/annoucementForum.vue
index 71d3131..5ed0ac9 100644
--- a/src/pages/Annoucement/annoucementForum.vue
+++ b/src/pages/Annoucement/annoucementForum.vue
@@ -14,11 +14,12 @@
               </v-list-tile-avatar>
               <v-list-tile-content>
                 <v-list-tile-title>{{ annoucementData.discussionType }}</v-list-tile-title>
-                <!-- <v-list-tile-sub-title>
+                <v-list-tile-sub-title>
                   By
-                  <span class="info--text">{{ annoucementData.studentId.name }}</span>
+                  <span class="info--text" v-if="annoucementData.studentId">{{ annoucementData.studentId.name }}</span>
+                  <span class="info--text" v-if="annoucementData.teacherId">{{ annoucementData.teacherId.name }}</span>
                   - {{dates(annoucementData.created ) }}
-                </v-list-tile-sub-title>-->
+                </v-list-tile-sub-title>
               </v-list-tile-content>
               <v-list-tile-action>
                 <div>
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index d809f2b..150fa82 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -386,9 +386,16 @@
             <div class="text-xs-center py-3 subheading font-weight-bold">Calender</div>
             <vue-event-calendar :events="activityEvents"></vue-event-calendar>
             <!-- LATEST ACTIVITY -->
-            <v-card class="my-3 elevation-0" v-if="role == 'PARENT'">
+            <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"
+                  v-if="role != 'TEACHER'"
+                >Latest Activity</v-card-title>
+                <v-card-title
+                  class="justify-center subheading font-weight-bold"
+                  v-if="role == 'TEACHER'"
+                >Latest Event</v-card-title>
                 <div v-for="(activity,index) in activityList" :key="index" class="mt-2">
                   <span
                     :style="{ 'background-color': colorsArray[index%colorsArray.length] }"
@@ -397,10 +404,21 @@
                   <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">{{activity.meetingEvent.title}}</div>
+                    <div class="body-2" v-if="activity.meetingEvent">{{activity.meetingEvent.title}}</div>
+                    <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>
+                <div v-if="activityList.length == 0">
+                  <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
+                </div>
               </v-card-text>
             </v-card>
           </v-card-text>
@@ -636,6 +654,7 @@ export default {
     this.getFeesAndCollectionsData();
     this.getExpensesData();
     this.getparentStudents();
+    this.getMeetingEventes();
     // this.getUsersList();
   },
   methods: {
@@ -907,23 +926,44 @@ export default {
           console.log("err====>", err);
           this.showLoader = false;
         });
+    },
+    getMeetingEventes() {
+      if (this.role == "TEACHER") {
+        this.showLoader = true;
+        http()
+          .get("/getMeetingEventesList", {
+            headers: {
+              Authorization: "Bearer " + this.token
+            }
+          })
+          .then(response => {
+            var activityList = response.data.data;
+            this.activityList = activityList;
+            this.showLoader = false;
+          })
+          .catch(error => {
+            this.showLoader = false;
+          });
+      }
     }
   },
   async created() {
     /* get Latest events list */
-    let response = await this.studentMeetingEvents({
-      studentId: localStorage.getItem("parentStudentId")
-    });
-    this.activityList = response.data.data;
+    if (this.$store.state.role != "TEACHER") {
+      let response = await this.studentMeetingEvents({
+        studentId: localStorage.getItem("parentStudentId")
+      });
+      this.activityList = response.data.data;
 
-    /* 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].meetingEvent.dateOfEvent).format(
-        "YYYY/MM/DD"
-      );
-      obj.title = this.activityList[i].meetingEvent.title;
-      this.activityEvents.push(obj);
+      /* 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].meetingEvent.dateOfEvent).format(
+          "YYYY/MM/DD"
+        );
+        obj.title = this.activityList[i].meetingEvent.title;
+        this.activityEvents.push(obj);
+      }
     }
   }
 };