diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue
index 0add740..be897a3 100644
--- a/src/pages/Authentication/Login.vue
+++ b/src/pages/Authentication/Login.vue
@@ -30,12 +30,12 @@
                 <v-toolbar-title class="text-xs-center subheadline">SCHOOL LOGIN</v-toolbar-title>
                 <v-flex xs12 sm12 md12 lg12>
                   <v-form ref="form" v-model="valid" lazy-validation>
-                    <label class="title">Email</label>
+                    <label class="title">Email / PhoneNo</label>
                     <v-text-field
                       style="padding: 0px; margin: 0px;"
                       v-model.trim="userLogincredentials.email"
                       :rules="nameRules"
-                      placeholder="Enter your email"
+                      placeholder="Enter your email / phoneNo"
                       required
                     ></v-text-field>
                     <label class="title">Password</label>
@@ -113,6 +113,10 @@ export default {
           email: this.userLogincredentials.email,
           password: this.userLogincredentials.password
         };
+        if (/^[0-9]{10}$/.test(this.userLogincredentials.email)) {
+          userdata.fatherCellNo = this.userLogincredentials.email;
+          delete userdata.email;
+        }
         http()
           .post("/schoolLogin", userdata)
           .then(response => {
diff --git a/src/pages/Course/courseDetail.vue b/src/pages/Course/courseDetail.vue
index f58dae2..b352109 100644
--- a/src/pages/Course/courseDetail.vue
+++ b/src/pages/Course/courseDetail.vue
@@ -382,7 +382,7 @@
                 <v-layout>
                   <v-flex xs5 sm6>
                     <h5 class="right my-1">
-                      <b>You Tube Link Url:</b>
+                      <b>Chapter Point:</b>
                     </h5>
                   </v-flex>
                   <v-flex sm6 xs8>
@@ -863,7 +863,6 @@ export default {
         .then(response => {
           this.editChapter.courseId = "";
           this.courseData = response.data.data;
-          // console.log("this.courseData", this.courseData);
           this.showLoader = false;
         })
         .catch(err => {
@@ -883,9 +882,7 @@ export default {
           this.CourseDetailsList = response.data.data;
           if (response.data.data[0]) {
             this.chapters = response.data.data[0].chapters;
-            console.log(" this.chapters - ", this.chapters);
           }
-          // console.log("response.data.data", this.CourseDetailsList);
           this.showLoader = false;
         })
         .catch(error => {
@@ -899,7 +896,6 @@ export default {
         });
     },
     courseTableRow(id) {
-      // console.log("click7", id);
       this.courseId = id;
     },
     addChapters(item) {
@@ -913,7 +909,6 @@ export default {
       for (let i = 0; i < this.findsChapterPoint.length; i++) {
         this.addChapterItem.chapterPoints.push(this.findsChapterPoint[i].value);
       }
-      // console.log("this.addChapterItem", this.addChapterItem);
       this.loading = true;
       http()
         .put("/addChapters", this.addChapterItem)
@@ -1015,7 +1010,6 @@ export default {
       var chapterPoints = [];
       for (let i = 0; i < this.finds.length; i++) {
         chapterPoints.push(this.finds[i].value);
-        // console.log("this.finds[i].value", this.finds[i].value);
         chapters = [
           {
             chapterName: this.addCourseDetail.chapterName,
@@ -1027,7 +1021,6 @@ export default {
         ];
       }
       if (this.$refs.form.validate()) {
-        // console.log("this.addCourseDetail", this.addCourseDetail);
         var courseDetailsData = {
           classId: this.addCourseDetail.classId,
           courseId: this.addCourseDetail.courseId,
@@ -1060,7 +1053,6 @@ export default {
     },
     saveChapter() {
       this.editedItem.courseDetailId = this.editedItem._id;
-      // console.log("this.updates", this.updates);
       var chapterPoints = [];
       for (let i = 0; i < this.updates.length; i++) {
         chapterPoints.push(this.updates[i].value);
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 20485e7..9c0c9f3 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -90,9 +90,19 @@
             </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>Link : <a :href="particularEvent.link">{{particularEvent.link}}</a></v-list-tile-title>
+              </v-list-tile-content>
+            </v-list-tile>
           </v-list>
         </v-card-text>
       </v-card>
@@ -215,7 +225,8 @@
             </v-flex>
           </v-layout>
 
-          <v-card class="mt-2 card" v-if="role != 'PARENT'">
+          <!-- FOR ADMIN ROLE  -->
+          <v-card class="mt-2 card" v-if="role == 'ADMIN'">
             <!-- <full-calendar
                   ref="calendar"
                   defaultView="month"
@@ -267,6 +278,87 @@
               </template>
             </v-data-table>
           </v-card>
+
+          <!-- FOR TEACHER ROLE  -->
+          <v-card class="mt-2 card" v-if="role == 'TEACHER'">
+            <v-layout>
+              <v-flex xs6 sm6 md6>
+                <h4 class="pa-3">
+                  <b>Notice</b>
+                </h4>
+                <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="noticeDecritpion 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-flex>
+
+              <v-flex xs6 sm6 md6>   
+                <v-card-text>
+                  <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
+                  <div
+                    v-for="(activity,index) in activityList"
+                    :key="index"
+                    class="mt-2"
+                    style="cursor: pointer;"
+                    @click="seeEventDetails(activity)"
+                  >
+                    <span
+                      :style="{ 'background-color': colorsArray[index%colorsArray.length] }"
+                      style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
+                    ></span>
+                    <div style="display: inline-block;" class="ml-2">
+                      <div>
+                        <div
+                          class="grey--text lighten-1 caption"
+                          v-if="activity.dateOfEvent"
+                        >{{moment(activity.dateOfEvent).format("DD MMMM, YYYY")}}</div>
+                        <div class="body-2" v-if="activity.title">{{activity.title}}</div>
+                      </div>
+                    </div>
+                  </div>
+                  <div v-if="activityList.length == 0">
+                    <p class="text-center title grey lighten-4 error--text">No Data Found!</p>
+                  </div>
+                </v-card-text>
+              </v-flex>
+            </v-layout>
+          </v-card>
+
           <!-- COURSES -->
           <v-layout v-if="role == 'PARENT'">
             <v-flex xs12>
@@ -400,8 +492,9 @@
             <v-flex xs12 class="py-3">
               <v-layout wrap>
                 <v-flex xs12 sm12 md4>
-                  <img src="/static/icon/user.png" v-if="!userData.schoolLogoUrl" width="80" />
-                  <img :src="userData.schoolLogoUrl" v-else-if="userData.schoolLogoUrl" width="80" />
+                  <img src="/static/icon/user.png" v-if="!userData.profilePicUrl && !userData.schoolLogoUrl" width="80" />
+                  <img :src="userData.profilePicUrl" onerror="this.src='/static/icon/user.png';" v-if="userData.profilePicUrl" width="80" />
+                  <img :src="userData.schoolLogoUrl" onerror="this.src='/static/icon/user.png';" v-if="userData.schoolLogoUrl" width="80" />
                 </v-flex>
                 <v-flex xs12 sm12 md6>
                   <p class="mb-0 body-1">
@@ -419,7 +512,7 @@
             <vue-event-calendar :events="activityEvents" @day-changed="handleDayChanged($event)"></vue-event-calendar>
 
             <!-- LATEST EVENTS -->
-            <v-card class="my-3 elevation-0">
+            <v-card class="my-3 elevation-0" v-if="role != 'TEACHER'">
               <v-card-text>
                 <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
                 <div
@@ -657,7 +750,6 @@ export default {
         tooltip: {
           y: {
             formatter: function(val, opts) {
-              // console.log("opts",opts.w.config.xaxis.categories)
               return "" + val + " ";
             }
           }
@@ -713,7 +805,7 @@ export default {
       // this.editedIndex = this.desserts.indexOf(item);
       // this.notice = Object.assign({}, item);
       // this.dialogNotice = true;
-      this.$router.push({ name: "NoticeBoard" });
+      this.$router.push("/noticeBoard");
     },
     date: function(date) {
       return moment(date).format("MMMM DD, YYYY  HH:mm");
@@ -730,7 +822,6 @@ export default {
     },
     eventSelected(event) {
       this.selected = event;
-      console.log("this.selected", this.selected);
     },
     // eventDropStart: function(event) {
     //   event.editable = false;
@@ -837,7 +928,6 @@ export default {
           .then(response => {
             this.userData = response.data.data;
             this.showLoader = false;
-            console.log("sdsdfsdfsd - ", response);
           })
           .catch(error => {
             this.showLoader = false;
@@ -871,7 +961,6 @@ export default {
           // this.collectionData = response.data.data;
           this.series[0].data[0] = this.feeData.totalFees;
           this.series[0].data[1] = this.feeData.totalCollection;
-          // console.log("this.series====", this.series);
 
           this.showLoader = false;
         })
@@ -896,7 +985,6 @@ export default {
           //     data: array
           //   }
           // ];
-          // console.log("this.series====", this.series);
           this.showLoader = false;
         })
         .catch(error => {
@@ -910,7 +998,6 @@ export default {
       await http()
         .get("/parentStudentsList")
         .then(response => {
-          // console.log("resssssss", response.data.data.students[0].classId);
           this.studentsData = response.data.data;
           localStorage.setItem(
             "parentStudentId",
@@ -1057,4 +1144,8 @@ export default {
 
 <style scoped>
 @import "fullcalendar/dist/fullcalendar.css";
+
+a {
+  color: white;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/meetingEvent/meetingEvent.vue b/src/pages/meetingEvent/meetingEvent.vue
index eafab87..466f853 100644
--- a/src/pages/meetingEvent/meetingEvent.vue
+++ b/src/pages/meetingEvent/meetingEvent.vue
@@ -79,6 +79,7 @@
                   ></v-text-field>
                   <v-time-picker
                     v-model="editedItem.startTime"
+                    format="24hr"
                     @change="$refs.menuEdit.save(editedItem.startTime)"
                   ></v-time-picker>
                 </v-menu>
@@ -370,6 +371,7 @@
                     ></v-text-field>
                     <v-time-picker
                       v-model="meetEvent.startTime"
+                      format="24hr"
                       @change="$refs.menuA.save(meetEvent.startTime)"
                     ></v-time-picker>
                   </v-menu>
@@ -578,6 +580,7 @@ export default {
       this.editedIndex = this.events.indexOf(item);
       this.editedItem = Object.assign({}, item);
       this.editedItem.meetingEventId = item._id;
+      this.editedItem.startTime = moment(this.editedItem.startTime, ["h:mm A"]).format("HH:mm");
       this.editEventdialog = true;
     },
     profile(item) {
@@ -650,6 +653,7 @@ export default {
     submit() {
       if (this.$refs.form.validate()) {
         this.loading = true;
+        this.meetEvent.startTime = moment(this.meetEvent.startTime, "hh:mm").format("LT");
         http()
           .post("/createMeetingEvent", this.meetEvent)
           .then(response => {
@@ -674,6 +678,8 @@ export default {
     },
     save() {
       delete this.editedItem.classId;
+      this.editedItem.courseId = this.editedItem.courseId._id;
+      this.editedItem.startTime = moment(this.editedItem.startTime, "hh:mm").format("LT");
       http()
         .put("/updateMeetingEvent", this.editedItem)
         .then(response => {