diff --git a/src/api/menu.js b/src/api/menu.js
index ad36837..affadf1 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -312,7 +312,7 @@ const teacherMenu = [{
             { name: 'Course', title: 'Course', component: 'Course', action: '', },
             { name: 'Enroll Students', title: 'Enroll Students', component: 'Enroll Students', action: '', },
             { name: 'Course Detail', title: 'Course Detail', component: 'Course Detail', action: '', },
-            // { name: 'Routine', title: 'Routine', component: 'Routine', action: '', },
+            { name: 'Course Discussion', title: 'Course Discussion', component: 'Course Discussion', action: '', },
         ]
     },
     {
diff --git a/src/pages/Course/courseDiscussion.vue b/src/pages/Course/courseDiscussion.vue
new file mode 100644
index 0000000..3f8dd28
--- /dev/null
+++ b/src/pages/Course/courseDiscussion.vue
@@ -0,0 +1,481 @@
+<template>
+  <v-container fluid class="body-color">
+    <v-dialog v-model="editDialog" max-width="600px" scrollable>
+      <v-card flat class="card-style pa-2" dark>
+        <v-layout>
+          <v-flex xs12>
+            <label class="title text-xs-center">Edit Course Discussion</label>
+            <v-icon size="24" class="right" @click="editDialog = false">cancel</v-icon>
+          </v-flex>
+        </v-layout>
+        <v-card-text>
+          <v-form ref="form">
+            <v-container fluid>
+              <v-layout>
+                <v-flex xs12 class="text-xs-center text-sm-center text-md-center text-lg-center">
+                  <v-avatar size="100px" v-if="!editedItem.attachementUrl && !editImageUrl">
+                    <img src="/static/icon/user.png" />
+                  </v-avatar>
+                  <img
+                    :src="editedItem.attachementUrl"
+                    v-else-if="editedItem.attachementUrl && !editImageUrl"
+                    height="150"
+                    style="border-radius:50%; width:150px"
+                  />
+                  <img
+                    v-if="editImageUrl"
+                    :src="editImageUrl"
+                    style="border-radius:50%; width:150px;height:150px"
+                  />
+                  <input
+                    type="file"
+                    style="display: none"
+                    ref="editDataImage"
+                    accept="image/*"
+                    @change="onEditFilePicked"
+                  />
+                </v-flex>
+              </v-layout>
+              <v-layout wrap>
+                <v-flex xs12 sm12>
+                  <v-layout>
+                    <v-flex xs4 sm5 class="pt-4 subheading">
+                      <label class="right hidden-xs-only hidden-sm-only">Select Class:</label>
+                      <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Class:</label>
+                    </v-flex>
+                    <v-flex xs8 sm7 class="ml-3">
+                      <v-select
+                        :items="addclass"
+                        v-model="editedItem.classId"
+                        item-text="classNum"
+                        item-value="_id"
+                        name="Select Class"
+                        required
+                        @change="editGetCourses(editedItem.classId)"
+                      ></v-select>
+                    </v-flex>
+                  </v-layout>
+                  <v-layout>
+                    <v-flex xs12 sm12>
+                      <v-layout>
+                        <v-flex xs4 sm5 class="pt-4 subheading">
+                          <label class="right">Select Course:</label>
+                        </v-flex>
+                        <v-flex xs8 sm7 class="ml-3">
+                          <v-select
+                            :items="editCourseData"
+                            label="Select Course"
+                            v-model="editedItem.courseId"
+                            item-text="courseName"
+                            item-value="_id"
+                            required
+                            class="ml-2"
+                          ></v-select>
+                        </v-flex>
+                      </v-layout>
+                    </v-flex>
+                  </v-layout>
+                  <v-layout>
+                    <v-flex xs4 sm5 class="pt-4 subheading">
+                      <label class="right">Subject:</label>
+                    </v-flex>
+                    <v-flex xs8 sm7 class="ml-3">
+                      <v-text-field v-model="editedItem.subject" type="text" required></v-text-field>
+                    </v-flex>
+                  </v-layout>
+                  <v-layout>
+                    <v-flex xs4 sm5 class="pt-4 subheading">
+                      <label class="right">Description:</label>
+                    </v-flex>
+                    <v-flex xs8 sm7 class="ml-3">
+                      <v-text-field v-model="editedItem.description" type="text" required></v-text-field>
+                    </v-flex>
+                  </v-layout>
+                  <v-layout>
+                    <v-flex xs4 sm5 class="pt-4 subheading">
+                      <label class="right hidden-xs-only hidden-sm-only">Upload Image:</label>
+                      <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Upload:</label>
+                    </v-flex>
+                    <v-flex xs8 sm7 class="ml-3">
+                      <v-text-field
+                        @click="pickEditFile"
+                        v-model="editImageName"
+                        append-icon="attach_file"
+                      ></v-text-field>
+                    </v-flex>
+                  </v-layout>
+                </v-flex>
+              </v-layout>
+              <v-layout>
+                <v-flex xs12 sm12 class="px-0 mx-0">
+                  <v-layout class="right">
+                    <v-btn @click="save" round dark :loading="editLoading" class="add-button">Save</v-btn>
+                  </v-layout>
+                </v-flex>
+              </v-layout>
+            </v-container>
+          </v-form>
+        </v-card-text>
+      </v-card>
+    </v-dialog>
+    <!-- ****** DIsCUSIION TABLE ****** -->
+    <v-toolbar color="transparent" flat>
+      <v-spacer></v-spacer>
+      <v-flex xs12 sm4 md2>
+        <v-select
+          small
+          :items="addclass"
+          label="Select Class"
+          v-model="getSelectedData.classId"
+          item-text="classNum"
+          item-value="_id"
+          name="Select Class"
+          @change="getCourses(getSelectedData.classId)"
+          class="mr-2"
+          required
+        ></v-select>
+      </v-flex>
+      <v-flex xs12 sm4 md2>
+        <v-select
+          :items="courseData"
+          label="Select Course"
+          v-model="getSelectedData.courseId"
+          item-text="courseName"
+          item-value="_id"
+          required
+          class="ml-2"
+          @change="getCourseDiscussionTable(getSelectedData.courseId)"
+        ></v-select>
+      </v-flex>
+      <v-card-title class="body-1" v-show="show">
+        <v-btn icon large flat @click="displaySearch">
+          <v-avatar size="27">
+            <img src="/static/icon/search.png" alt="icon" />
+          </v-avatar>
+        </v-btn>
+      </v-card-title>
+      <v-flex xs8 sm8 md3 lg2 v-show="showSearch">
+        <v-layout>
+          <v-text-field v-model="search" label="Search" prepend-inner-icon="search" color="primary"></v-text-field>
+          <v-icon @click="closeSearch" color="error">close</v-icon>
+        </v-layout>
+      </v-flex>
+    </v-toolbar>
+    <v-data-table
+      :headers="headers"
+      :items="courseDiscussionData"
+      :pagination.sync="pagination"
+      :search="search"
+    >
+      <template slot="items" slot-scope="props">
+        <tr class="tr">
+          <td class="text-xs-center td td-row">
+            <v-avatar size="40">
+              <img :src="props.item.attachementUrl" v-if="props.item.attachementUrl" />
+              <img src="/static/icon/user.png" v-else-if="!props.item.attachementUrl" />
+            </v-avatar>
+          </td>
+          <td class="text-xs-center td td-row">
+            <router-link
+              :to="{ name:'Course Discussiones Form',params: { discussionId:props.item._id } }"
+            >{{ props.item.subject }}</router-link>
+          </td>
+          <td class="text-xs-center td td-row">{{ props.item.studentId.name}}</td>
+          <td class="text-xs-center td td-row">-</td>
+          <td class="text-xs-center td td-row">{{ props.item.forumThread.length }}</td>
+          <td class="text-xs-center td td-row">
+            <span>
+              <v-tooltip top>
+                <img
+                  slot="activator"
+                  style="cursor:pointer; width:20px; height:18px; "
+                  class="mr-3"
+                  @click="editItem(props.item)"
+                  src="/static/icon/edit.png"
+                />
+                <span>Edit</span>
+              </v-tooltip>
+              <v-tooltip top>
+                <img
+                  slot="activator"
+                  style="cursor:pointer; width:20px; height:20px; "
+                  class="mr-3"
+                  @click="deleteItem(props.item)"
+                  src="/static/icon/delete.png"
+                />
+                <span>Delete</span>
+              </v-tooltip>
+            </span>
+          </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-snackbar
+      :timeout="timeout"
+      :top="y === 'top'"
+      :right="x === 'right'"
+      :vertical="mode === 'vertical'"
+      v-model="snackbar"
+      color="success"
+    >{{ text }}</v-snackbar>
+    <div class="loader" v-if="showLoader">
+      <v-progress-circular indeterminate color="white"></v-progress-circular>
+    </div>
+  </v-container>
+</template>
+
+<script>
+import http from "@/Services/http.js";
+import moment from "moment";
+
+export default {
+  data: () => ({
+    snackbar: false,
+    y: "top",
+    x: "right",
+    mode: "",
+    timeout: 3000,
+    text: "",
+    show: true,
+    showSearch: false,
+    showLoader: false,
+    loading: false,
+    date: null,
+    search: "",
+    addclass: [],
+    pagination: {
+      rowsPerPage: 10
+    },
+    headers: [
+      {
+        text: "Image",
+        value: "subjattachementUrlect",
+        sortable: false,
+        align: "center"
+      },
+      {
+        text: "Discussion",
+        value: "subject",
+        sortable: false,
+        align: "center"
+      },
+      { text: "Started", value: "studentId", sortable: false, align: "center" },
+      {
+        text: "Last Post",
+        value: "forumThread",
+        sortable: false,
+        align: "center"
+      },
+      { text: "replies", value: "email", sortable: false, align: "center" },
+      { text: "Action", value: "", sortable: false, align: "center" }
+    ],
+    token: "",
+    selectStudents: {
+      select: "",
+      selectSection: ""
+    },
+
+    role: "",
+    schoolRole: "",
+    menu: false,
+    valid: true,
+
+    getSelectedData: {},
+    courseDiscussionData: [],
+    courseData: [],
+    editCourseData: [],
+    addSection: [],
+    editedItem: {},
+    editDialog: false,
+    editedIndex: -1,
+    editiImageFile: "",
+    editImageName: "",
+    editImageUrl: "",
+    editLoading: false
+  }),
+  methods: {
+    // save(date) {
+    //   this.$refs.menu.save(date);
+    // },
+    pickEditFile() {
+      this.$refs.editDataImage.click();
+    },
+    onEditFilePicked(e) {
+      console.log(e);
+      const files = e.target.files;
+      if (files[0] !== undefined) {
+        this.editImageName = files[0].name;
+        console.log("this.editImageName", this.editImageName);
+
+        if (this.editImageName.lastIndexOf(".") <= 0) {
+          return;
+        }
+        const fr = new FileReader();
+        fr.readAsDataURL(files[0]);
+        fr.addEventListener("load", () => {
+          this.editImageUrl = fr.result;
+          this.editiImageFile = files[0]; // this is an image file that can be sent to server...
+        });
+      } else {
+        this.editImageName = "";
+        this.editiImageFile = "";
+      }
+    },
+    getAllClass() {
+      http()
+        .get("/getClassesList", {
+          headers: { Authorization: "Bearer " + this.token }
+        })
+        .then(response => {
+          this.addclass = response.data.data;
+        })
+        .catch(error => {
+          // console.log("err====>", err);
+          // this.$router.replace({ path: "/" });
+        });
+    },
+    getCourses(classId) {
+      this.showLoader = true;
+      http()
+        .get("/getCourseesList", {
+          params: {
+            classId: classId
+          }
+        })
+        .then(response => {
+          this.courseData = response.data.data;
+          this.showLoader = false;
+        })
+        .catch(err => {
+          console.log("err====>", err);
+          this.showLoader = false;
+        });
+    },
+    editGetCourses(classId) {
+      this.showLoader = true;
+      http()
+        .get("/getCourseesList", {
+          params: {
+            classId: classId
+          }
+        })
+        .then(response => {
+          this.editCourseData = response.data.data;
+          this.showLoader = false;
+        })
+        .catch(err => {
+          console.log("err====>", err);
+          this.showLoader = false;
+        });
+    },
+    getCourseDiscussionTable(id) {
+      // console.log("id", this.getSelectedData.courseId);
+      this.showLoader = true;
+      http()
+        .get("/getCourseDiscussionesList", {
+          params: {
+            classId: this.getSelectedData.classId,
+            courseId: id
+          }
+        })
+        .then(response => {
+          //   console.log("response", response.data.data);
+          this.courseDiscussionData = response.data.data;
+          this.showLoader = false;
+        })
+        .catch(error => {
+          console.log("err====>", error);
+          this.showLoader = false;
+        });
+    },
+    editItem(item) {
+      this.editedIndex = this.courseDiscussionData.indexOf(item);
+      this.editedItem = Object.assign({}, item);
+      this.editDialog = true;
+    },
+    save() {
+      console.log("this.editedItem", this.editedItem);
+      let editCourseDiscuss = {
+        courseDiscussionId: this.editedItem._id,
+        courseId: this.editedItem.courseId,
+        studentId: this.editedItem.studentId._id,
+        subject: this.editedItem.subject,
+        description: this.editedItem.description
+      };
+      if (this.editedItem.classId._id) {
+        editCourseDiscuss.classId = this.editedItem.classId._id;
+      }
+      if (!this.editedItem.classId._id) {
+        editCourseDiscuss.classId = this.editedItem.classId;
+      }
+      if (this.editImageUrl) {
+        var str = this.editImageUrl;
+        const [baseUrl, editImageUrl] = str.split(/,/);
+        editCourse.upload = editImageUrl;
+      }
+      this.editLoading = true;
+      http()
+        .put("/updateCourseDiscussion", editCourseDiscuss)
+        .then(response => {
+          this.snackbar = true;
+          this.text = response.data.message;
+          this.color = "green";
+          this.imageUrl = "";
+          this.getCourseDiscussionTable();
+          this.editDialog = false;
+          this.editLoading = false;
+        })
+        .catch(error => {
+          this.editLoading = false;
+          this.snackbar = true;
+          this.text = error.response.data.statusText;
+          this.color = "error";
+        });
+    },
+    deleteItem(item) {
+      let deleteCourseDiscussion = {
+        courseDiscussionId: item._id
+      };
+      http()
+        .delete(
+          "/deleteCourseDiscussion",
+          confirm("Are you sure you want to delete this?") && {
+            params: deleteCourseDiscussion
+          }
+        )
+        .then(response => {
+          this.snackbar = true;
+          this.text = response.data.message;
+          this.color = "green";
+          this.getCourseDiscussionTable();
+        })
+        .catch(error => {
+          this.snackbar = true;
+          this.text = error.response.data.message;
+          this.color = "error";
+        });
+    },
+    displaySearch() {
+      this.show = false;
+      this.showSearch = true;
+    },
+    closeSearch() {
+      this.showSearch = false;
+      this.show = true;
+      this.search = "";
+    }
+  },
+  mounted() {
+    // this.getStudentList();
+    this.token = this.$store.state.token;
+    this.role = this.$store.state.role;
+    this.getAllClass();
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/pages/Course/discussion.vue b/src/pages/Course/discussion.vue
new file mode 100644
index 0000000..dc8fc5d
--- /dev/null
+++ b/src/pages/Course/discussion.vue
@@ -0,0 +1,309 @@
+<template>
+  <v-container fluid class="body-color">
+    <!-- ******COURSE DISCUSIION COMMENT ****** -->
+    <v-layout>
+      <v-flex xs12 v-for="(courseDiscussionData,i) in courseDiscussionData" :key="i">
+        <v-card class="elevation-0 grey lighten-3 pa-2" flat>
+          <v-list two-line subheader>
+            <v-list-tile>
+              <v-list-tile-avatar>
+                <v-avatar size="46">
+                  <img
+                    :src="courseDiscussionData.attachementUrl"
+                    v-if="courseDiscussionData.attachementUrl"
+                  />
+                  <img src="/static/icon/user.png" v-else-if="!courseDiscussionData.attachementUrl" />
+                </v-avatar>
+              </v-list-tile-avatar>
+              <v-list-tile-content>
+                <v-list-tile-title>{{ courseDiscussionData.subject }}</v-list-tile-title>
+                <v-list-tile-sub-title>
+                  By
+                  <span class="info--text">{{ courseDiscussionData.studentId.name }}</span>
+                  - {{dates(courseDiscussionData.created ) }}
+                </v-list-tile-sub-title>
+              </v-list-tile-content>
+              <v-list-tile-action>
+                <div>
+                  <v-btn flat round dark class="reply-btn" @click="showReplyBox = true">Reply</v-btn>
+                </div>
+              </v-list-tile-action>
+            </v-list-tile>
+          </v-list>
+        </v-card>
+        <v-flex
+          xs12
+          class="mt-4 pl-5 mx-auto"
+          v-for="(replyThread,i) in courseDiscussionData.forumThread"
+          :key="i"
+        >
+          <v-card class="elevation-0 grey lighten-3" flat>
+            <v-list two-line subheader class="grey lighten-3 pa-1">
+              <v-list-tile>
+                <v-list-tile-avatar>
+                  <v-avatar size="46">
+                    <img
+                      :src="courseDiscussionData.attachementUrl"
+                      v-if="courseDiscussionData.attachementUrl"
+                    />
+                    <img
+                      src="/static/icon/user.png"
+                      v-else-if="!courseDiscussionData.attachementUrl"
+                    />
+                  </v-avatar>
+                </v-list-tile-avatar>
+                <v-list-tile-content>
+                  <v-list-tile-title>Re: {{ courseDiscussionData.subject }}</v-list-tile-title>
+                  <v-list-tile-sub-title>
+                    By
+                    <span class="info--text">{{ replyThread.teacherId.name }}</span>
+                    - {{dates(replyThread.created ) }}
+                  </v-list-tile-sub-title>
+                </v-list-tile-content>
+              </v-list-tile>
+            </v-list>
+            <v-list class="pa-2 reply-desc">
+              <v-list-tile-content>
+                <v-list-tile-title
+                  v-show="replyThread.showDescriptionReplyThread"
+                >{{ replyThread.description }}</v-list-tile-title>
+                <v-flex xs12 sm12 md4 v-show="replyThread.showUpdateReplyThread == true">
+                  <v-text-field v-model="replyThread.description"></v-text-field>
+                  <v-btn
+                    flat
+                    round
+                    dark
+                    class="reply-btn right"
+                    @click="updateRelpyThreadDiscussion(replyThread)"
+                  >Save</v-btn>
+                </v-flex>
+              </v-list-tile-content>
+            </v-list>
+            <v-list class="grey lighten-4 pa-0">
+              <v-list-tile-action>
+                <v-spacer></v-spacer>
+                <div>
+                  <v-btn
+                    flat
+                    round
+                    dark
+                    class="reply-btn"
+                    @click="deleteRelpyThreadDiscussion(replyThread._id)"
+                  >Delete</v-btn>
+                  <v-btn
+                    flat
+                    round
+                    dark
+                    class="reply-btn mr-4"
+                    @click="showUpdateReplyThreadDiscussion(replyThread)"
+                  >Edit</v-btn>
+                </div>
+              </v-list-tile-action>
+            </v-list>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 class="mt-4" v-show="showReplyBox">
+          <v-textarea
+            name="input-7-1"
+            solo
+            label="Label Text"
+            multi-line
+            v-model="replyDescription"
+          ></v-textarea>
+          <v-btn round dark class="open-dialog-button" flat @click="showReplyBox = false">Cancel</v-btn>
+          <v-btn
+            round
+            dark
+            :loading="loading"
+            class="reply-btn"
+            @click="replyThreadDiscussion()"
+          >Submit</v-btn>
+        </v-flex>
+      </v-flex>
+    </v-layout>
+    <v-snackbar
+      :timeout="timeout"
+      :top="y === 'top'"
+      :right="x === 'right'"
+      :vertical="mode === 'vertical'"
+      v-model="snackbar"
+      color="success"
+    >{{ text }}</v-snackbar>
+    <div class="loader" v-if="showLoader">
+      <v-progress-circular indeterminate color="white"></v-progress-circular>
+    </div>
+  </v-container>
+</template>
+
+<script>
+import http from "@/Services/http.js";
+import moment from "moment";
+
+export default {
+  data: () => ({
+    snackbar: false,
+    y: "top",
+    x: "right",
+    mode: "",
+    timeout: 3000,
+    text: "",
+    showLoader: false,
+    loading: false,
+    date: null,
+    token: "",
+    role: "",
+    schoolRole: "",
+    menu: false,
+    courseDiscussionData: {},
+    showReplyBox: false,
+    replyDescription: "",
+    loginId: "",
+    editedIndex: -1
+  }),
+  methods: {
+    dates: function(date) {
+      return moment(date).format("MMMM DD, YYYY hh:mm A");
+    },
+    getDiscussionesThread() {
+      // console.log("id", this.getSelectedData.courseId);
+      this.showLoader = true;
+      http()
+        .get("/getParticularCourseDiscussion", {
+          params: {
+            courseDiscussionId: this.$route.params.discussionId
+          }
+        })
+        .then(response => {
+          //   console.log("response", response.data.data);
+          this.courseDiscussionData = response.data.data;
+          for (let i = 0; i < this.courseDiscussionData.length; i++) {
+            for (
+              let j = 0;
+              j < this.courseDiscussionData[i].forumThread.length;
+              j++
+            ) {
+              this.courseDiscussionData[i].forumThread[
+                j
+              ].showUpdateReplyThread = false;
+              this.courseDiscussionData[i].forumThread[
+                j
+              ].showDescriptionReplyThread = true;
+            }
+          }
+          this.showLoader = false;
+          this.showReplyBox = false;
+        })
+        .catch(error => {
+          console.log("err====>", error);
+          this.showLoader = false;
+        });
+    },
+    replyThreadDiscussion() {
+      this.showLoader = true;
+      var payloadData = {
+        courseDiscussionId: this.$route.params.discussionId,
+        teacherId: this.loginId,
+        description: this.replyDescription
+      };
+      http()
+        .put("/replyForumThread", payloadData)
+        .then(response => {
+          //   console.log("response", response.data.data);
+          this.showLoader = false;
+          this.getDiscussionesThread();
+        })
+        .catch(error => {
+          this.showLoader = false;
+        });
+    },
+    showUpdateReplyThreadDiscussion(item) {
+      this.editedIndex = this.courseDiscussionData.indexOf(item);
+      var editedItem = Object.assign({}, item);
+      var arrayOfcourseDiscussionData = [];
+      for (let i = 0; i < this.courseDiscussionData.length; i++) {
+        for (
+          let j = 0;
+          j < this.courseDiscussionData[i].forumThread.length;
+          j++
+        ) {
+          if (
+            editedItem._id == this.courseDiscussionData[i].forumThread[j]._id
+          ) {
+            this.courseDiscussionData[i].forumThread[
+              j
+            ].showUpdateReplyThread = true;
+            this.courseDiscussionData[i].forumThread[
+              j
+            ].showDescriptionReplyThread = false;
+          }
+        }
+        arrayOfcourseDiscussionData.push(this.courseDiscussionData[i]);
+      }
+      this.courseDiscussionData = arrayOfcourseDiscussionData;
+    },
+    updateRelpyThreadDiscussion(replyThread) {
+      this.showLoader = true;
+      var payloadData = {
+        forumThreadId: replyThread._id,
+        courseDiscussionId: this.$route.params.discussionId,
+        teacherId: this.loginId,
+        description: replyThread.description
+      };
+      http()
+        .put("/updateForumThread", payloadData)
+        .then(response => {
+          this.showLoader = false;
+          this.getDiscussionesThread();
+        })
+        .catch(error => {
+          this.showLoader = false;
+        });
+    },
+    deleteRelpyThreadDiscussion(id) {
+      this.showLoader = true;
+      var payloadData = {
+        forumThreadId: id,
+        courseDiscussionId: this.$route.params.discussionId
+      };
+      http()
+        .put(
+          "/deleteForumThread",
+          confirm("Are you sure you want to delete this?") && payloadData
+        )
+        .then(response => {
+          this.showLoader = false;
+          this.getDiscussionesThread();
+        })
+        .catch(error => {
+          this.showLoader = false;
+        });
+    }
+  },
+  mounted() {
+    // this.getStudentList();
+    this.token = this.$store.state.token;
+    this.role = this.$store.state.role;
+    this.loginId = this.$store.state.id;
+    this.getDiscussionesThread();
+  }
+};
+</script>
+
+<style>
+.reply-desc {
+  border: 1px solid #f2f2f2;
+}
+.open-dialog-button {
+  background: #827bfa !important;
+  border-color: #827bfa !important;
+  text-transform: none !important;
+}
+
+.reply-btn {
+  background: #feb83c !important;
+  border-color: #feb83c !important;
+  text-transform: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/Course/enrollStudents.vue b/src/pages/Course/enrollStudents.vue
index 50392c5..ed509ca 100644
--- a/src/pages/Course/enrollStudents.vue
+++ b/src/pages/Course/enrollStudents.vue
@@ -277,7 +277,7 @@ export default {
         .then(response => {
           this.snackbar = true;
           this.text = response.data.message;
-          this.getParticularCourse()
+          this.getParticularCourse();
         })
         .catch(error => {
           this.snackbar = true;
@@ -288,11 +288,8 @@ export default {
       console.log("selected", selected);
       let selectedStudentsArray = [];
       selectedStudentsArray.push({ studentId: selected._id });
-      if (
-        selected.enroll === true &&
-        selected.enroll === undefined &&
-        selected.enroll === null
-      ) {
+      // console.log("selected.enroll", selected.enroll);
+      if (selected.enroll === true) {
         var payload = {
           courseId: this.getReport.courseId,
           enrollStudents: selectedStudentsArray
@@ -302,6 +299,7 @@ export default {
           .then(response => {
             this.snackbar = true;
             this.text = response.data.message;
+            this.getParticularCourse();
           })
           .catch(error => {
             this.snackbar = true;
@@ -322,6 +320,7 @@ export default {
           .then(response => {
             this.snackbar = true;
             this.text = response.data.message;
+            this.getParticularCourse();
           })
           .catch(error => {
             this.snackbar = true;
@@ -343,7 +342,7 @@ export default {
             studentId = response.data.data.enrollStudents[i];
             for (let j = 0; j < this.studentsData.length; j++) {
               if (studentId.studentId == this.studentsData[j]._id) {
-                console.log("studentId._id", studentId._id);
+                // console.log("studentId._id", studentId._id);
                 this.studentsData[j].enroll = true;
                 this.studentsData[j].enrollId = studentId._id;
               }
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index da6cec2..d809f2b 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -386,7 +386,7 @@
             <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-card class="my-3 elevation-0" v-if="role == 'PARENT'">
               <v-card-text>
                 <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">
diff --git a/src/router/paths.js b/src/router/paths.js
index 9df20f6..3434401 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -14,7 +14,7 @@ export default [{
         },
         name: 'NotFound',
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/NotFound/NotFound.vue`
@@ -28,7 +28,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/dashboard.vue`
@@ -41,7 +41,7 @@ export default [{
         },
         name: 'ServerError',
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/NotFound/Error.vue`
@@ -55,7 +55,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Authentication/changepassword.vue`
@@ -68,7 +68,7 @@ export default [{
         },
         name: 'Teachers',
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Teachers/teachers.vue`
@@ -81,7 +81,7 @@ export default [{
         },
         name: 'Login',
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Authentication/Login.vue`
@@ -94,7 +94,7 @@ export default [{
         },
         name: 'forgetpassword',
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Authentication/forgetpassword.vue`
@@ -108,7 +108,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Students/students.vue`
@@ -122,7 +122,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Class/addclass.vue`
@@ -136,7 +136,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Section/section.vue`
@@ -150,7 +150,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/NoticeBoard/noticeBoard.vue`
@@ -164,7 +164,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/News/news.vue`
@@ -189,7 +189,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/TimeTable/timeTable.vue`
@@ -203,7 +203,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Notification/notification.vue`
@@ -217,7 +217,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Parent/parents.vue`
@@ -243,7 +243,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/dashboard.vue`
@@ -257,7 +257,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/CourseDetails.vue`
@@ -271,7 +271,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/ChapterInfo.vue`
@@ -285,13 +285,41 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/CourseDiscussionForum.vue`
             )
     },
     {
+        path: '/courseDiscussion',
+        meta: {},
+        name: 'Course Discussion',
+        props: (route) => ({
+            type: route.query.type
+        }),
+        component: () =>
+            import (
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/Course/courseDiscussion.vue`
+            )
+    },
+    {
+        path: '/courseDiscussionesForm/:discussionId',
+        meta: {},
+        name: 'Course Discussiones Form',
+        props: (route) => ({
+            type: route.query.type
+        }),
+        component: () =>
+            import (
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/Course/discussion.vue`
+            )
+    },
+    {
         path: '/Announcement',
         meta: {},
         name: 'Announcement',
@@ -299,7 +327,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Dashboard/Announcement.vue`
@@ -313,7 +341,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/socialMedia/socialMedia.vue`
@@ -327,7 +355,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Gallery/gallery.vue`
@@ -341,7 +369,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Event/event.vue`
@@ -355,7 +383,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Holiday/holiday.vue`
@@ -369,7 +397,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/User/user.vue`
@@ -383,7 +411,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Attendence/studentAttendence.vue`
@@ -397,7 +425,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Attendence/teacherAttendence.vue`
@@ -411,7 +439,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Payroll/salaryTemplate.vue`
             )
     },
@@ -423,7 +451,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Payroll/hourlyTemplate.vue`
             )
     },
@@ -435,7 +463,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Payroll/manageSalary.vue`
             )
     },
@@ -457,7 +485,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Attendence/userAttendence.vue`
@@ -471,7 +499,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/feeTypes.vue`
@@ -485,7 +513,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/invoice.vue`
@@ -499,7 +527,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/paymentHistory.vue`
@@ -513,7 +541,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/expense.vue`
@@ -527,7 +555,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/income.vue`
@@ -541,7 +569,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Library/member.vue`
@@ -555,7 +583,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Library/books.vue`
@@ -569,7 +597,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Library/issue.vue`
@@ -583,7 +611,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Library/eBook.vue`
@@ -595,7 +623,7 @@ export default [{
         name: 'Edit Invoice',
         // props: (route) => ({ type: route.query.type }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/editInvoice.vue`
@@ -609,7 +637,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Attendence/viewStudentsAttendence.vue`
@@ -623,7 +651,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Attendence/viewTeacherAttendence.vue`
@@ -637,7 +665,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/viewInvoice.vue`
@@ -651,7 +679,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/viewPaymentInvoice.vue`
@@ -665,7 +693,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Account/globalPayment.vue`
@@ -679,7 +707,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Exam/exam.vue`
@@ -693,7 +721,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Exam/grade.vue`
@@ -707,7 +735,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Exam/examSchedule.vue`
@@ -721,7 +749,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Exam/examAttendence.vue`
@@ -735,7 +763,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Mark/mark.vue`
@@ -749,7 +777,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Mark/viewMark.vue`
@@ -763,7 +791,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Mark/markDistribution.vue`
@@ -777,7 +805,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Meet/meet.vue`
@@ -791,7 +819,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Administrator/academicYear.vue`
@@ -805,7 +833,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Administrator/systemAdmin.vue`
@@ -819,7 +847,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Administrator/resetPassword.vue`
@@ -833,7 +861,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Administrator/role.vue`
@@ -847,7 +875,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Administrator/bulkImport.vue`
@@ -861,7 +889,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Report/studentReport.vue`
@@ -875,7 +903,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Report/progressCardReport.vue`
@@ -889,7 +917,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Report/idCard.vue`
             )
     },
@@ -901,7 +929,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Report/admitCard.vue`
             )
     },
@@ -913,7 +941,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/generalSetting/generalSetting.vue`
@@ -927,7 +955,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Academic/assignment.vue`
             )
     },
@@ -939,7 +967,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Academic/routine.vue`
             )
     },
@@ -951,7 +979,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Academic/subject.vue`
             )
     },
@@ -963,7 +991,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 `@/pages/Academic/syllabus.vue`
             )
     },
@@ -975,7 +1003,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Course/course.vue`
@@ -989,7 +1017,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Course/courseDetail.vue`
@@ -1003,7 +1031,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Course/enrollStudents.vue`
@@ -1017,7 +1045,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/changeStudents/changeStudents.vue`
@@ -1031,7 +1059,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/Annoucement/annoucement.vue`
@@ -1045,7 +1073,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/meetingEvent/meetingEvent.vue`
@@ -1061,7 +1089,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/School/school.vue`
@@ -1075,7 +1103,7 @@ export default [{
             type: route.query.type
         }),
         component: () =>
-            import(
+            import (
                 /* webpackChunkName: "routes" */
                 /* webpackMode: "lazy-once" */
                 `@/pages/School/viewSchoolDashboard.vue`