From 4fb0af78fa6ac74ba8c0846d5d1fbe75e87c67bf Mon Sep 17 00:00:00 2001
From: amber <amber.dev@viithiisys.com>
Date: Mon, 24 Aug 2020 12:42:40 +0530
Subject: [PATCH] added school events to teacher role

---
 src/pages/Dashboard/dashboard.vue | 48 ++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index efe536c..d317955 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -293,10 +293,10 @@
           </v-layout>
 
           <!-- FOR ADMIN ROLE  -->
-          <v-layout row wrap>
+          <v-layout row wrap v-if="role == 'ADMIN'||role == 'TEACHER'">
             <!-- NOTICE -->
             <v-flex xs12 sm6>
-              <v-card class="card" v-if="role == 'ADMIN'">
+              <v-card class="card">
                 <v-container>
                   <v-card-title class="justify-center subheading font-weight-bold">Notice</v-card-title>
 
@@ -380,11 +380,10 @@
             </v-flex>
           </v-layout>
 
-          <!-- SCHOOL EVENTS -->
-          <div></div>
+          
 
           <!-- FOR TEACHER ROLE  -->
-          <v-card class="mt-2 card" v-if="role == 'TEACHER'">
+          <!-- <v-card class="mt-2 card" v-if="role == 'TEACHER'">
             <v-layout>
               <v-flex xs6 sm6 md6>
                 <h4 class="pa-3">
@@ -461,7 +460,7 @@
                 </v-card-text>
               </v-flex>
             </v-layout>
-          </v-card>
+          </v-card> -->
 
           <!-- COURSES -->
           <v-layout v-if="role == 'PARENT'">
@@ -641,9 +640,9 @@
 
             <vue-event-calendar :events="activityEvents" @day-changed="handleDayChanged($event)"></vue-event-calendar>
 
-            <!-- LATEST EVENTS -->
+            <!-- MEETING EVENTS -->
             <!-- IF ROLE IS ADMIN -->
-            <v-card class="my-3 elevation-0" v-if="role != 'TEACHER'">
+            <v-card class="my-3 elevation-0">
               <v-card-text v-if="$store.state.role === 'ADMIN' ">
                 <!-- MEETING EVENTS -->
                 <v-card-title class="justify-center subheading font-weight-bold">Meeting Events</v-card-title>
@@ -675,7 +674,7 @@
 
               <!-- 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>
+                <v-card-title class="justify-center subheading font-weight-bold">Meeting Events</v-card-title>
                 <div
                   v-for="(activity,index) in activityList"
                   :key="index"
@@ -688,7 +687,7 @@
                     style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
                   ></span>
                   <div style="display: inline-block;" class="ml-2">
-                    <!-- LATEST EVENTS FOR PARENT -->
+                    <!-- MEETING EVENTS FOR PARENT -->
                     <div v-if="$store.state.role === 'PARENT' ">
                       <div
                         class="grey--text lighten-1 caption"
@@ -700,7 +699,7 @@
                       >{{activity.meetingEvent.title}}</div>
                     </div>
 
-                    <!-- LATEST EVENTS FOR TEACHER -->
+                    <!-- MEETING EVENTS FOR TEACHER -->
                     <div v-if="role === 'TEACHER'">
                       <div
                         class="grey--text lighten-1 caption"
@@ -962,14 +961,14 @@ export default {
       this.viewEventDetails = true;
     },
     async seeEventDetails(activity, message) {
-      if (this.$store.state.role === "TEACHER") {
-        let response = await this.getParticularMeetingEvent({
-          meetingEventId: activity._id,
-        });
-        this.displayEventsList = [];
-        this.displayEventsList.push(response.data.data);
-        this.viewEventDetails = true;
-      }
+      // if (this.$store.state.role === "TEACHER") {
+      //   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") {
         let response = await this.getParticularMeetingEvent({
           meetingEventId: activity.meetingEvent._id,
@@ -978,7 +977,7 @@ export default {
         this.displayEventsList.push(response.data.data);
         this.viewEventDetails = true;
       }
-      if (this.$store.state.role === "ADMIN") {
+      if (this.$store.state.role === "ADMIN" || this.$store.state.role === "TEACHER") {
         if (message == "schoolEvent") {
           let response = await this.getParticularSchoolEvent({
             schoolEventId: activity._id,
@@ -1219,7 +1218,7 @@ export default {
             this.activityList = activityList;
             this.showLoader = false;
 
-            /* set meetingEvents array to highlight event dates in calender */
+            /* set meetingEvents in 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].dateOfEvent).format(
@@ -1228,6 +1227,7 @@ export default {
               obj.title = this.activityList[i].title;
               obj._id = this.activityList[i]._id;
               obj.eventType = "meetingEvent";
+              /* activityEvents is an array used to display events in calender on particular dates */
               this.activityEvents.push(obj);
             }
           })
@@ -1235,9 +1235,10 @@ export default {
             this.showLoader = false;
           });
       }
-      if (this.role === "ADMIN") {
+      /* If role is ADMIN or TEACHER then school events need to be displayed too */
+      if (this.role === "ADMIN" || this.role === "TEACHER") {
         await this.getSchoolEventsList();
-        /* set schoolEvents array to highlight event dates in calender */
+        /* set schoolEvents in activityEvents 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(
@@ -1246,6 +1247,7 @@ export default {
           obj.title = this.schoolEvents[i].title;
           obj._id = this.schoolEvents[i]._id;
           obj.eventType = "schoolEvent";
+           /* activityEvents is an array used to display events in calender on particular dates */
           this.activityEvents.push(obj);
         }
       }
-- 
2.0.0