diff --git a/src/Services/ApiCalls.js b/src/Services/ApiCalls.js
index d70d284..0901a8a 100644
--- a/src/Services/ApiCalls.js
+++ b/src/Services/ApiCalls.js
@@ -109,10 +109,10 @@ export default {
                     // console.log("error in getMethod = ", error.response)
                     const message = this.generateError(error)
                     if (message == "Session expired") {
-                        this.$store.dispatch("setToken", null);
-                        this.$router.push({
-                            name: 'Login'
-                        });
+                        // this.$store.dispatch("setToken", null);
+                        // this.$router.push({
+                        //     name: 'Login'
+                        // });
                     } else {
                         throw new Error(message);
                     }
diff --git a/src/Services/GetApis.js b/src/Services/GetApis.js
index d4039ea..5598ae4 100644
--- a/src/Services/GetApis.js
+++ b/src/Services/GetApis.js
@@ -34,7 +34,36 @@ export default {
             } catch (error) {
                 console.log("error in getStudentCourses - ", error.message)
             }
-        }
+        },
+
+        /* getCourseDiscussionesList - used in courseDiscussionForum.vue */
+        async getCourseDiscussionesList(params) {
+            try {
+                let response = await this.getMethod("/getCourseDiscussionesList", {
+                    courseId: params.courseId,
+                    classId: params.classId,
+                })
+                this.courseDiscussionItems = response.data.data
+                // return response
+                console.log("response of getCourseDiscussionesList - ", response)
+            } catch (error) {
+                console.log("error in getCourseDiscussionesList - ", error.message)
+            }
+        },
+
+        /* studentMeetingEvents required in dashboard to display list of latest events */
+        async studentMeetingEvents(params) {
+            try {
+                let response = await this.getMethod("/studentMeetingEvents", {
+                    studentId: params.studentId
+                })
+                console.log("response of studentMeetingEvents - ", response);
+                return response
+            } catch (error) {
+                console.log("error in studentMeetingEvents - ", error.message)
+            }
+
+        },
 
     },
 }
\ No newline at end of file
diff --git a/src/pages/Annoucement/annoucement.vue b/src/pages/Annoucement/annoucement.vue
index aacb964..c34044e 100644
--- a/src/pages/Annoucement/annoucement.vue
+++ b/src/pages/Annoucement/annoucement.vue
@@ -64,9 +64,9 @@
                     <v-flex xs8 sm7 class="ml-3">
                       <v-select
                         :items="courseData"
-                        item-text="coursrName"
+                        item-text="courseName"
                         item-value="_id"
-                        v-model="editedItem.coursrName"
+                        v-model="editedItem.courseName"
                         placeholder="fill your Course name"
                         type="text"
                         :rules="courseRules"
@@ -196,7 +196,7 @@
                   :items="courseData"
                   label="Select Course"
                   v-model="selectAnnoucement.courseId"
-                  item-text="coursrName"
+                  item-text="courseName"
                   item-value="_id"
                   :rules="courseRules"
                   required
@@ -388,9 +388,9 @@
                         <v-flex xs8 sm8 class="ml-3">
                           <v-select
                             :items="courseData"
-                            item-text="coursrName"
+                            item-text="courseName"
                             item-value="_id"
-                            v-model="addAnnoucement.coursrName"
+                            v-model="addAnnoucement.courseName"
                             placeholder="fill your Course name"
                             type="text"
                             :rules="courseRules"
@@ -685,7 +685,7 @@ export default {
           classId: this.addAnnoucement.select,
           sectionId: this.addAnnoucement.selectSection,
           discussionType: this.addAnnoucement.discussionType,
-          courseId: this.addAnnoucement.coursrName
+          courseId: this.addAnnoucement.courseName
         };
         if (this.imageUrl) {
           var str = this.imageUrl;
@@ -720,7 +720,7 @@ export default {
         annoucementId: this.editedItem._id,
         discussionType: this.editedItem.discussionType,
         classId: this.editedItem.select,
-        courseId: this.editedItem.coursrName
+        courseId: this.editedItem.courseName
       };
       if (this.editImageUrl) {
         var str = this.editImageUrl;
diff --git a/src/pages/Course/course.vue b/src/pages/Course/course.vue
index ffb37f6..931d3c1 100644
--- a/src/pages/Course/course.vue
+++ b/src/pages/Course/course.vue
@@ -63,7 +63,7 @@
                     </v-flex>
                     <v-flex xs8 sm7 class="ml-3">
                       <v-text-field
-                        v-model="editedItem.coursrName"
+                        v-model="editedItem.courseName"
                         placeholder="fill your Course Name"
                         type="text"
                         required
@@ -126,7 +126,7 @@
                     </h5>
                   </v-flex>
                   <v-flex sm6 xs6>
-                    <h5 class="my-1 left">{{ editedItem.coursrName }}</h5>
+                    <h5 class="my-1 left">{{ editedItem.courseName }}</h5>
                   </v-flex>
                 </v-layout>
               </v-flex>
@@ -236,7 +236,7 @@
               <img src="/static/icon/user.png" v-else-if="!props.item.courseImageUrl" />
             </v-avatar>
           </td>
-          <td class="text-xs-center td td-row">{{ props.item.coursrName}}</td>
+          <td class="text-xs-center td td-row">{{ props.item.courseName}}</td>
           <td class="text-xs-center td td-row">
             <span>
               <v-tooltip top>
@@ -349,7 +349,7 @@
                         </v-flex>
                         <v-flex xs8 sm8 class="ml-3">
                           <v-text-field
-                            v-model="addCourses.coursrName"
+                            v-model="addCourses.courseName"
                             placeholder="fill your Course name"
                             type="text"
                             :rules="courseRules"
@@ -607,7 +607,7 @@ export default {
         let addCourse = {
           classId: this.addCourses.select,
           sectionId: this.addCourses.selectSection,
-          coursrName: this.addCourses.coursrName
+          courseName: this.addCourses.courseName
         };
         if (this.imageUrl) {
           var str = this.imageUrl;
@@ -640,7 +640,7 @@ export default {
     save() {
       let editCourse = {
         courseId: this.editedItem._id,
-        coursrName: this.editedItem.coursrName,
+        courseName: this.editedItem.courseName,
         classId: this.editedItem.select
       };
       if (this.editImageUrl) {
diff --git a/src/pages/Course/courseDetail.vue b/src/pages/Course/courseDetail.vue
index 7fd5e92..a069a7b 100644
--- a/src/pages/Course/courseDetail.vue
+++ b/src/pages/Course/courseDetail.vue
@@ -42,7 +42,7 @@
                     :items="courseData"
                     label="Select Course"
                     v-model="editedCourse.courseId"
-                    item-text="coursrName"
+                    item-text="courseName"
                     item-value="_id"
                     required
                     class="ml-2"
@@ -362,7 +362,7 @@
           :items="courseData"
           label="Select Course"
           v-model="getCourse.courseId"
-          item-text="coursrName"
+          item-text="courseName"
           item-value="_id"
           required
           class="ml-2"
@@ -395,7 +395,7 @@
         <tr class="tr" @click="courseTableRow(props.item._id)">
           <td class="td td-row">{{ props.index + 1}}</td>
           <td class="td td-row text-xs-center">{{ props.item.classId.classNum }}</td>
-          <td class="td td-row text-xs-center">{{ props.item.courseId.coursrName }}</td>
+          <td class="td td-row text-xs-center">{{ props.item.courseId.courseName }}</td>
           <td class="td td-row text-xs-center">
             <span>
               <v-tooltip top>
@@ -535,7 +535,7 @@
                     :items="courseData"
                     label="Select Course"
                     v-model="addCourseDetail.courseId"
-                    item-text="coursrName"
+                    item-text="courseName"
                     item-value="_id"
                     :rules="courseRules"
                     required
diff --git a/src/pages/Course/enrollStudents.vue b/src/pages/Course/enrollStudents.vue
index 820efb3..50392c5 100644
--- a/src/pages/Course/enrollStudents.vue
+++ b/src/pages/Course/enrollStudents.vue
@@ -22,7 +22,7 @@
           :items="courseData"
           label="Select Course"
           v-model="getReport.courseId"
-          item-text="coursrName"
+          item-text="courseName"
           item-value="_id"
           required
           class="ml-2"
diff --git a/src/pages/Dashboard/Announcement.vue b/src/pages/Dashboard/Announcement.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/Dashboard/ChapterInfo.vue b/src/pages/Dashboard/ChapterInfo.vue
index 0dbe5d9..88e6833 100644
--- a/src/pages/Dashboard/ChapterInfo.vue
+++ b/src/pages/Dashboard/ChapterInfo.vue
@@ -94,7 +94,7 @@
                 >
                   <div style="width: 100%;text-align: left;">
                     <v-icon style="color: red;padding-bottom: 3px;" size="15">play_arrow</v-icon>
-                    {{course.coursrName}}
+                    {{course.courseName}}
                   </div>
                 </v-btn>
               </div>
diff --git a/src/pages/Dashboard/CourseDetails.vue b/src/pages/Dashboard/CourseDetails.vue
index c105eef..715ebeb 100644
--- a/src/pages/Dashboard/CourseDetails.vue
+++ b/src/pages/Dashboard/CourseDetails.vue
@@ -24,7 +24,7 @@
         <v-flex xs8>
           <div
             class="title side-bar-color font-weight-bold"
-          >Welcome to the {{courseDetails[0].courseId.coursrName}} Course for {{courseDetails[0].classId.classNum}} class</div>
+          >Welcome to the {{courseDetails[0].courseId.courseName}} Course for {{courseDetails[0].classId.classNum}} class</div>
           <v-flex xs12 class="subheading mt-2">
             Lorem Ipsum sdjjkhsdf sdklfjs dkfjskdjfk fjsdklf sdjfksljf sdfkls fljlkj kl
             jkhjkfhjksd sdfjkhsdjk fsdjkl sfkljkl ldkfjkl kjlfs dlkjlskd fljsldk fklj
@@ -32,7 +32,10 @@
           </v-flex>
 
           <div class="mt-5">
-            <span class="grey--text lighten-1">
+            <span
+              class="grey--text lighten-1"
+              @click="$router.push({name: 'Announcement', query:{courseId: $route.query.courseId}})"
+            >
               <v-icon>question_answer</v-icon>
               <span class="ml-2">Announcement</span>
             </span>
@@ -88,14 +91,14 @@
                 >
                   <div style="width: 100%;text-align: left;">
                     <v-icon style="color: red;padding-bottom: 3px;" size="15">play_arrow</v-icon>
-                    {{course.coursrName}}
+                    {{course.courseName}}
                   </div>
                 </v-btn>
               </div>
               <!-- <v-expansion-panel focusable class="elevation-0">
                 <v-expansion-panel-content v-for="(item,i) in courseData" :key="i">
                   <template v-slot:header>
-                    <div class="subheading">{{item.coursrName}}</div>
+                    <div class="subheading">{{item.courseName}}</div>
                   </template>
                 </v-expansion-panel-content>
               </v-expansion-panel>-->
diff --git a/src/pages/Dashboard/CourseDiscussionForum.vue b/src/pages/Dashboard/CourseDiscussionForum.vue
index bb22c6e..921ab6b 100644
--- a/src/pages/Dashboard/CourseDiscussionForum.vue
+++ b/src/pages/Dashboard/CourseDiscussionForum.vue
@@ -164,7 +164,29 @@
             </v-flex>
 
             <!-- DATA TABLE -->
-            <v-flex></v-flex>
+            <v-flex>
+              <v-data-table
+                :headers="courseDiscussionHeaders"
+                :items="courseDiscussionItems"
+                :pagination.sync="pagination"
+                :search="search"
+              >
+                <template slot="items" slot-scope="props">
+                  <tr class="tr">
+                    <td class="td td-row text-xs-center">{{ props.item.courseId.courseName}}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.studentId.name }}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.courseId.courseName}}</td>
+                    <td class="td td-row text-xs-center">{{ props.item.studentId.name }}</td>
+                  </tr>
+                </template>
+                <v-alert
+                  slot="no-results"
+                  :value="true"
+                  color="error"
+                  icon="warning"
+                >Your search for "{{ search }}" found no results.</v-alert>
+              </v-data-table>
+            </v-flex>
           </v-layout>
 
           <!-- NEXT CHAPTER -->
@@ -201,7 +223,7 @@
                 >
                   <div style="width: 100%;text-align: left;">
                     <v-icon style="color: red;padding-bottom: 3px;" size="15">play_arrow</v-icon>
-                    {{course.coursrName}}
+                    {{course.courseName}}
                   </div>
                 </v-btn>
               </div>
@@ -226,7 +248,30 @@ export default {
       imageName: "",
       imageUrl: "",
       imageFile: "",
-      imageData: {}
+      imageData: {},
+
+      // DATA TABLE
+      search: "",
+      pagination: {
+        rowsPerPage: 10
+      },
+      courseDiscussionHeaders: [
+        {
+          text: "Discussion",
+          align: "",
+          sortable: false,
+          value: ""
+        },
+        {
+          text: "Started",
+          value: "",
+          sortable: false,
+          align: "center"
+        },
+        { text: "Last Pot", value: "", sortable: false, align: "center" },
+        { text: "Replies", value: "", sortable: false, align: "center" }
+      ],
+      courseDiscussionItems: []
     };
   },
   methods: {
@@ -313,6 +358,12 @@ export default {
       classId: localStorage.getItem("parentClassId"),
       studentId: localStorage.getItem("parentStudentId")
     });
+
+    /* getCourseDiscussionesList - to populate the data table */
+    await this.getCourseDiscussionesList({
+      courseId: this.$route.query.courseId,
+      classId: localStorage.getItem("parentClassId")
+    });
   }
 };
 </script>
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 2d5857d..04bca67 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -260,7 +260,7 @@
                                 <v-list-tile-title
                                   style="cursor: pointer;"
                                   @click="routeToCourseDetails(course._id)"
-                                >{{ course.coursrName }}</v-list-tile-title>
+                                >{{ course.courseName }}</v-list-tile-title>
                               </v-list-tile-content>
                             </v-list-tile>
                           </template>
@@ -388,15 +388,22 @@
                 </v-flex>
                 <hr />
                 <div class="text-xs-center py-3 subheading font-weight-bold">Calender</div>
-                <vue-event-calendar :events="demoEvents"></vue-event-calendar>
+                <vue-event-calendar :events="activityEvents"></vue-event-calendar>
                 <!-- LATEST ACTIVITY -->
                 <v-card class="my-3 elevation-0">
                   <v-card-text>
-                    <div class="text-xs-center subheading font-weight-bold">Latest Activity</div>
-                    <div>
+                    <v-card-title class="justify-center subheading font-weight-bold">Latest Activity</v-card-title>
+                    <div v-for="(activity,index) in activityList" :key="index" class="mt-2">
                       <span
-                        style="background-color:yellow ;height: 12px;width: 12px;border-radius: 50%;display: inline-block;"
+                        :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"
+                        >{{moment(activity.meetingEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                        <div class="body-2">{{activity.meetingEvent.title}}</div>
+                      </div>
                     </div>
                   </v-card-text>
                 </v-card>
@@ -457,19 +464,9 @@ export default {
       // calendarData: {},
       // calendar: {},
 
-      colorsArray: ["#ff8a89", "#71d9ea", "#7852cc", "#F9A825"],
-      demoEvents: [
-        {
-          date: "2020/01/10", // Required
-          title: "Foo" // Required
-        },
-        {
-          date: "2020/01/12",
-          title: "Bar",
-          desc: "description",
-          customClass: "disabled highlight" // Custom classes to an calendar cell
-        }
-      ],
+      // CALENDER
+      moment: moment,
+      activityEvents: [],
       onlineUser: [
         {
           user: "Student Demo"
@@ -609,7 +606,11 @@ export default {
             }
           }
         }
-      }
+      },
+
+      // LATEST ACTIVITY
+      colorsArray: ["#ff8a89", "#71d9ea", "#7852cc", "#F9A825"],
+      activityList: []
     };
   },
   mounted() {
@@ -657,22 +658,7 @@ export default {
         this.seeSnackbar("No Data Available", "warning");
       }
     },
-    studentMeetingEvents() {
-      http()
-        .get("/studentMeetingEvents", {
-          params: {
-            studentId: localStorage.getItem("parentStudentId")
-          }
-        })
-        .then(response => {
-          console.log("response of studentMeetingEvents - ", response);
-          this.showLoader = false;
-        })
-        .catch(err => {
-          console.log("err====>", err);
-          this.showLoader = false;
-        });
-    },
+
     closeNotice() {
       this.dialogNotice = false;
     },
@@ -685,6 +671,9 @@ export default {
     date: function(date) {
       return moment(date).format("MMMM DD, YYYY  HH:mm");
     },
+    activityDate(date) {
+      return moment(date).format("MMMM DD, YYYY");
+    },
     refreshEvents() {
       this.$refs.calendar.$emit("refetch-events");
     },
@@ -922,9 +911,20 @@ export default {
         });
     }
   },
-  created() {
+  async created() {
     /* get Latest events list */
-    this.studentMeetingEvents();
+    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);
+    }
   }
 };
 </script>
diff --git a/src/pages/meetingEvent/meetingEvent.vue b/src/pages/meetingEvent/meetingEvent.vue
index 78417bc..a7dae02 100644
--- a/src/pages/meetingEvent/meetingEvent.vue
+++ b/src/pages/meetingEvent/meetingEvent.vue
@@ -419,7 +419,7 @@
                     :items="courseData"
                     label="Select Course"
                     v-model="meetEvent.courseId"
-                    item-text="coursrName"
+                    item-text="courseName"
                     item-value="_id"
                     required
                   ></v-select>
diff --git a/src/router/paths.js b/src/router/paths.js
index 6b927c6..9df20f6 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -292,6 +292,20 @@ export default [{
             )
     },
     {
+        path: '/Announcement',
+        meta: {},
+        name: 'Announcement',
+        props: (route) => ({
+            type: route.query.type
+        }),
+        component: () =>
+            import(
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/Dashboard/Announcement.vue`
+            )
+    },
+    {
         path: '/socialMedia',
         meta: {},
         name: 'Social Media',