diff --git a/src/Services/AllApiCalls.js b/src/Services/AllApiCalls.js
index 19245aa..420a40e 100644
--- a/src/Services/AllApiCalls.js
+++ b/src/Services/AllApiCalls.js
@@ -15,6 +15,8 @@ export default {
             pdfFileName: "",
             courseData: [],
             teachersList: [],
+            schoolEvents: [],
+            particularEvent: {},
 
         }
     },
diff --git a/src/Services/GetApis.js b/src/Services/GetApis.js
index f5ddb4b..f86fd3e 100644
--- a/src/Services/GetApis.js
+++ b/src/Services/GetApis.js
@@ -3,10 +3,10 @@ export default {
     mixins: [ApiCalls],
     data() {
         return {
-            courseData: [],
+            // courseData: [],
 
             // dashboard.vue data properties
-            particularEvent: {},
+            
 
 
         }
@@ -81,12 +81,38 @@ export default {
                 let response = await this.getMethod("/getParticularMeetingEvent", {
                     meetingEventId: params.meetingEventId
                 })
-                this.particularEvent = response.data.data
+                // this.particularEvent.push = response.data.data
+                return response
+            } catch (error) {
+                console.log("Error in getParticularMeetingEvent - ", error.message)
+            }
+        },
+
+        async getParticularSchoolEvent(params) {
+            try {
+                let response = await this.getMethod("/getParticularSchoolEvent", {
+                    schoolEventId: params.schoolEventId
+                })
+                // this.particularEvent = response.data.data
+                return response
             } catch (error) {
                 console.log("Error in getParticularMeetingEvent - ", error.message)
             }
         },
 
+        async getSchoolEventsList(params) {
+            try {
+                let response = await this.getMethod("/getSchoolEventsList")
+                this.schoolEvents = response.data.data;
+                console.log("school events - ", this.schoolEvents)
+                return response
+            } catch (error) {
+                console.log("Error in getParticularMeetingEvent - ", error.message)
+            }
+
+        },
+       
+
         /************************************************************************************************************************ */
 
         /* APIS USED IN LiveOnlineClass.vue */
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 97e1cc2..efe536c 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -69,50 +69,115 @@
     </v-snackbar>
 
     <!-- DIALOG BOX EVENT DETAILS -->
-    <v-dialog v-model="viewEventDetails" max-width="500" persistent>
-      <v-card flat class="card-style pa-2" dark>
-        <!-- TITLE -->
+    <v-dialog v-model="viewEventDetails" max-width="500" persistent lazy>
+      <v-card flat class="card-style elevation-0" height="600" dark>
         <v-layout>
-          <v-layout>
-            <v-flex xs12>
-              <label class="title text-xs-center">{{particularEvent.title}}</label>
-              <v-icon size="24" class="right" @click="viewEventDetails = false">cancel</v-icon>
-            </v-flex>
-          </v-layout>
+          <v-flex xs12>
+            <v-icon
+              size="24"
+              class="right"
+              @click="active=0;displayEventsList=[];dialogSchoolEvents = [];dialogMeetingEvents=[];viewEventDetails = false"
+            >cancel</v-icon>
+          </v-flex>
         </v-layout>
+        <v-tabs v-model="active" color="#7f62f8" dark v-if="displayEventsList.length == 0">
+          <v-tabs-slider color="yellow"></v-tabs-slider>
+          <v-tab v-for="(tab,index) in tabs" :key="index">
+            <div class="subheading py-1">{{ tab.name }}</div>
+          </v-tab>
+          <!-- <v-tab href="#schoolTab" v-if="dialogSchoolEvents.length > 0">School Events</v-tab>
+          <v-tab href="#meetingTab" v-if="dialogMeetingEvents.length > 0">Meeting Events</v-tab>-->
 
-        <v-card-text>
-          <v-list dark class="card-style">
-            <v-list-tile>
-              <v-list-tile-content>
-                <v-list-tile-title>Date Of Event : {{moment(particularEvent.dateOfEvent).format("DD MMMM, YYYY")}}</v-list-tile-title>
-              </v-list-tile-content>
-            </v-list-tile>
-            <v-list-tile>
-              <v-list-tile-content>
-                <v-list-tile-title>Start Time : {{particularEvent.startTime}}</v-list-tile-title>
-              </v-list-tile-content>
-            </v-list-tile>
-            <v-list-tile>
-              <v-list-tile-content>
-                <v-list-tile-title>Duration : {{particularEvent.duration}}</v-list-tile-title>
-              </v-list-tile-content>
-            </v-list-tile>
-            <v-list-tile>
-              <v-list-tile-content>
-                <v-list-tile-title>
+          <!-- SCHOOL EVENTS-->
+          <v-tab-item>
+            <v-card flat class="card-style pa-2" dark v-if="dialogSchoolEvents.length > 0">
+              <v-container fluid>
+                <v-divider class="white"></v-divider>
+                <v-card
+                  v-for="(particularEvent,index) in dialogSchoolEvents"
+                  :key="index"
+                  class="mt-3 pa-2 card-style white--text elevation-0"
+                >
+                  <div>
+                    <div class="headline">{{particularEvent.title}}</div>
+                    <div>Date Of Event : {{moment(particularEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                    <div v-if="particularEvent.link">Start Time : {{particularEvent.startTime}}</div>
+                    <div v-if="particularEvent.link">Duration : {{particularEvent.duration}}</div>
+                    <div v-if="particularEvent.link">
+                      Link :
+                      <a :href="particularEvent.link">{{particularEvent.link}}</a>
+                    </div>
+                    <div
+                      v-if="particularEvent.description"
+                    >Description : {{particularEvent.description}}</div>
+                  </div>
+                  <v-divider class="white mt-3"></v-divider>
+                </v-card>
+              </v-container>
+            </v-card>
+          </v-tab-item>
+
+          <!-- MEETING EVENTS -->
+          <v-tab-item>
+            <v-card v-if="dialogMeetingEvents.length > 0" flat class="card-style pa-2" dark>
+              <v-container fluid>
+                <v-divider class="white"></v-divider>
+                <v-card
+                  v-for="(particularEvent,index) in dialogMeetingEvents"
+                  :key="index"
+                  class="mt-3 pa-2 card-style white--text elevation-0"
+                >
+                  <div>
+                    <div class="headline">{{particularEvent.title}}</div>
+                    <div>Date Of Event : {{moment(particularEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                    <div v-if="particularEvent.link">Start Time : {{particularEvent.startTime}}</div>
+                    <div v-if="particularEvent.link">Duration : {{particularEvent.duration}}</div>
+                    <div v-if="particularEvent.link">
+                      Link :
+                      <a :href="particularEvent.link">{{particularEvent.link}}</a>
+                    </div>
+                    <div
+                      v-if="particularEvent.description"
+                    >Description : {{particularEvent.description}}</div>
+                  </div>
+                  <v-divider class="white mt-3"></v-divider>
+                </v-card>
+              </v-container>
+            </v-card>
+          </v-tab-item>
+        </v-tabs>
+
+        <!-- IF NO MULTIPLE EVENTS ON SAME DATE -->
+        <v-card flat class="card-style pa-2 elevation-0" dark v-else>
+          <v-container fluid>
+            <v-divider class="white"></v-divider>
+            <v-card
+              v-for="(particularEvent,index) in displayEventsList"
+              :key="index"
+              class="mt-3 pa-2 card-style white--text elevation-0"
+            >
+              <div>
+                <div class="headline">{{particularEvent.title}}</div>
+                <div>Date Of Event : {{moment(particularEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                <div v-if="particularEvent.link">Start Time : {{particularEvent.startTime}}</div>
+                <div v-if="particularEvent.link">Duration : {{particularEvent.duration}}</div>
+                <div v-if="particularEvent.link">
                   Link :
                   <a :href="particularEvent.link">{{particularEvent.link}}</a>
-                </v-list-tile-title>
-              </v-list-tile-content>
-            </v-list-tile>
-          </v-list>
-        </v-card-text>
+                </div>
+                <div
+                  v-if="particularEvent.description"
+                >Description : {{particularEvent.description}}</div>
+              </div>
+              <v-divider class="white mt-3"></v-divider>
+            </v-card>
+          </v-container>
+        </v-card>
       </v-card>
     </v-dialog>
 
     <v-layout wrap row>
-      <v-flex xs12 sm12 md9>
+      <v-flex xs12 sm12 md8>
         <v-container fluid grid-list-xl>
           <!-- ***** Total Students ***** -->
           <v-layout wrap class v-if="$store.state.role != 'PARENT' ">
@@ -228,58 +293,95 @@
           </v-layout>
 
           <!-- FOR ADMIN ROLE  -->
-          <v-card class="mt-2 card" v-if="role == 'ADMIN'">
-            <!-- <full-calendar
-                  ref="calendar"
-                  defaultView="month"
-                  droppable="false"
-                  :events="events"
-                  :config="config"
-            ></full-calendar>-->
-            <h4 class="pa-3">
-              <b>Notice</b>
-            </h4>
+          <v-layout row wrap>
+            <!-- NOTICE -->
+            <v-flex xs12 sm6>
+              <v-card class="card" v-if="role == 'ADMIN'">
+                <v-container>
+                  <v-card-title class="justify-center subheading font-weight-bold">Notice</v-card-title>
 
-            <v-data-table
-              :items="noticeData"
-              class="elevation-0"
-              flat
-              hide-actions
-              hide-headers
-              style="border-spacing: 0 !important;"
-            >
-              <template
-                slot="items"
-                slot-scope="props"
-                v-if="props.index < 5"
-                style="border-spacing: 0 !important;"
-              >
-                <tr class="td-notice">
-                  <td class="grey--text" style="width:18px">{{ props.index + 1}}</td>
-                  <td>
-                    <span class="grey--text caption">{{ date(props.item.created) }}</span>
-                    <br />
-                    <span class="body-2">{{ props.item.title}}</span>
-                  </td>
-                  <td class="grey--text mt-2">{{ props.item.description}}</td>
+                  <v-data-table
+                    :items="noticeData"
+                    class="elevation-0"
+                    flat
+                    hide-actions
+                    hide-headers
+                    style="border-spacing: 0 !important;"
+                  >
+                    <template
+                      slot="items"
+                      slot-scope="props"
+                      v-if="props.index < 5"
+                      style="border-spacing: 0 !important;"
+                    >
+                      <tr class="td-notice">
+                        <td class="grey--text" style="width:18px">{{ props.index + 1}}</td>
+                        <td>
+                          <span class="grey--text caption">{{ date(props.item.created) }}</span>
+                          <br />
+                          <span class="body-2">{{ props.item.title}}</span>
+                        </td>
+                        <!-- <td class="grey--text mt-2" >{{ props.item.description}}</td> -->
 
-                  <td class="text-xs-center">
-                    <span>
-                      <v-tooltip top>
-                        <img
-                          slot="activator"
-                          style="cursor:pointer; width:25px; height:25px; "
-                          @click="profile"
-                          src="/static/icon/view.png"
-                        />
-                        <span>View</span>
-                      </v-tooltip>
-                    </span>
-                  </td>
-                </tr>
-              </template>
-            </v-data-table>
-          </v-card>
+                        <td class="text-xs-center">
+                          <span>
+                            <v-tooltip top>
+                              <img
+                                slot="activator"
+                                style="cursor:pointer; width:25px; height:25px; "
+                                @click="profile"
+                                src="/static/icon/view.png"
+                              />
+                              <span>View</span>
+                            </v-tooltip>
+                          </span>
+                        </td>
+                      </tr>
+                    </template>
+                  </v-data-table>
+                </v-container>
+              </v-card>
+            </v-flex>
+
+            <!-- SCHOOL EVENTS -->
+            <v-flex xs12 sm6>
+              <v-card class="card">
+                <v-container>
+                  <v-card-title class="justify-center subheading font-weight-bold">School Events</v-card-title>
+                  <div
+                    v-for="(schoolEvent,index) in schoolEvents"
+                    :key="schoolEvent.title"
+                    class="mt-2"
+                    style="cursor: pointer;"
+                    @click="seeEventDetails(schoolEvent,'schoolEvent')"
+                  >
+                    <!-- color dot-->
+                    <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>
+                        <!-- date of event -->
+                        <div
+                          class="grey--text lighten-1 caption"
+                          v-if="schoolEvent.dateOfEvent"
+                        >{{moment(schoolEvent.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                        <!-- event title-->
+                        <div class="body-1" v-if="schoolEvent.title">{{schoolEvent.title}}</div>
+                      </div>
+                    </div>
+                  </div>
+                  <div v-if="schoolEvents.length == 0">
+                    <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
+                  </div>
+                </v-container>
+              </v-card>
+            </v-flex>
+          </v-layout>
+
+          <!-- SCHOOL EVENTS -->
+          <div></div>
 
           <!-- FOR TEACHER ROLE  -->
           <v-card class="mt-2 card" v-if="role == 'TEACHER'">
@@ -331,7 +433,7 @@
 
               <v-flex xs6 sm6 md6>
                 <v-card-text>
-                  <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
+                  <v-card-title class="justify-center subheading font-weight-bold">Meeting Events</v-card-title>
                   <div
                     v-for="(activity,index) in activityList"
                     :key="index"
@@ -497,7 +599,7 @@
       </v-flex>
       <v-spacer></v-spacer>
       <!-- SIDE BAR -->
-      <v-flex xs12 sm12 md3>
+      <v-flex xs12 sm12 md4>
         <v-card height="100%" class="elevation-0 mt-3 profileDasboard">
           <v-card-text class="px-2">
             <h4 class="text-xs-center py-3">
@@ -540,9 +642,11 @@
             <vue-event-calendar :events="activityEvents" @day-changed="handleDayChanged($event)"></vue-event-calendar>
 
             <!-- LATEST EVENTS -->
+            <!-- IF ROLE IS ADMIN -->
             <v-card class="my-3 elevation-0" v-if="role != 'TEACHER'">
               <v-card-text v-if="$store.state.role === 'ADMIN' ">
-                <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
+                <!-- MEETING EVENTS -->
+                <v-card-title class="justify-center subheading font-weight-bold">Meeting Events</v-card-title>
                 <div
                   v-for="(activity,index) in activityList"
                   :key="index"
@@ -560,7 +664,7 @@
                         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 class="body-1" v-if="activity.title">{{activity.title}}</div>
                     </div>
                   </div>
                 </div>
@@ -568,6 +672,8 @@
                   <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
                 </div>
               </v-card-text>
+
+              <!-- ROLE IS NOT ADMIN -->
               <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
@@ -666,7 +772,16 @@ export default {
       // calendar: {},
 
       // DIALOG BOX EVENT DETAILS
+      tabs: [
+        { name: "School Events", icon: "mdi-account" },
+        { name: "Meeting Events", icon: "mdi-account-outline" },
+      ],
       viewEventDetails: false,
+      active: 0,
+      particularEvent: [],
+      displayEventsList: [],
+      dialogSchoolEvents: [],
+      dialogMeetingEvents: [],
 
       // CALENDER
       moment: moment,
@@ -823,26 +938,60 @@ export default {
       console.log(" test - ", e);
     },
     async handleDayChanged(e) {
-      await this.getParticularMeetingEvent({
-        meetingEventId: e.events[0]._id,
-      });
+      console.log("event calender - ", e);
+      /*the list of events that will be used in dialog box to display events */
+      // this.displayEventsList = [];
+      this.dialogMeetingEvents = [];
+      this.dialogSchoolEvents = [];
+
+      for (var i = 0; i < e.events.length; i++) {
+        if (e.events[i].eventType == "meetingEvent") {
+          let meetingEventResponse = await this.getParticularMeetingEvent({
+            meetingEventId: e.events[i]._id,
+          });
+          this.dialogMeetingEvents.push(meetingEventResponse.data.data);
+        }
+        if (e.events[i].eventType == "schoolEvent") {
+          let schoolEventResponse = await this.getParticularSchoolEvent({
+            schoolEventId: e.events[i]._id,
+          });
+          this.dialogSchoolEvents.push(schoolEventResponse.data.data);
+        }
+      }
+
       this.viewEventDetails = true;
     },
-    async seeEventDetails(activity) {
+    async seeEventDetails(activity, message) {
       if (this.$store.state.role === "TEACHER") {
-        await this.getParticularMeetingEvent({ meetingEventId: activity._id });
+        let response = await this.getParticularMeetingEvent({
+          meetingEventId: activity._id,
+        });
+        this.displayEventsList = [];
+        this.displayEventsList.push(response.data.data);
         this.viewEventDetails = true;
       }
       if (this.$store.state.role === "PARENT") {
-        await this.getParticularMeetingEvent({
+        let response = await this.getParticularMeetingEvent({
           meetingEventId: activity.meetingEvent._id,
         });
+        this.displayEventsList = [];
+        this.displayEventsList.push(response.data.data);
         this.viewEventDetails = true;
       }
       if (this.$store.state.role === "ADMIN") {
-        await this.getParticularMeetingEvent({
-          meetingEventId: activity._id,
-        });
+        if (message == "schoolEvent") {
+          let response = await this.getParticularSchoolEvent({
+            schoolEventId: activity._id,
+          });
+          this.displayEventsList = [];
+          this.displayEventsList.push(response.data.data);
+        } else {
+          let response = await this.getParticularMeetingEvent({
+            meetingEventId: activity._id,
+          });
+          this.displayEventsList = [];
+          this.displayEventsList.push(response.data.data);
+        }
         this.viewEventDetails = true;
       }
     },
@@ -1070,7 +1219,7 @@ export default {
             this.activityList = activityList;
             this.showLoader = false;
 
-            /* set activityEvents array to highlight event dates in calender */
+            /* set meetingEvents 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(
@@ -1078,6 +1227,7 @@ export default {
               );
               obj.title = this.activityList[i].title;
               obj._id = this.activityList[i]._id;
+              obj.eventType = "meetingEvent";
               this.activityEvents.push(obj);
             }
           })
@@ -1085,6 +1235,20 @@ export default {
             this.showLoader = false;
           });
       }
+      if (this.role === "ADMIN") {
+        await this.getSchoolEventsList();
+        /* set schoolEvents array to highlight event dates in calender */
+        for (var i = 0; i < this.schoolEvents.length; i++) {
+          let obj = {};
+          obj.date = moment(this.schoolEvents[i].dateOfEvent).format(
+            "YYYY/MM/DD"
+          );
+          obj.title = this.schoolEvents[i].title;
+          obj._id = this.schoolEvents[i]._id;
+          obj.eventType = "schoolEvent";
+          this.activityEvents.push(obj);
+        }
+      }
     },
   },
 
@@ -1155,6 +1319,9 @@ export default {
 
 <style scoped>
 @import "fullcalendar/dist/fullcalendar.css";
+.wrap-text {
+  -webkit-line-clamp: unset !important;
+}
 
 a {
   color: white;