From b28a5f17df1ca6741182ddec90e3bb58676bebec Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Tue, 1 Oct 2019 15:11:00 +0530
Subject: [PATCH] fixed events and holidays api in calender dashbaord

---
 src/pages/Dashboard/dashboard.vue | 110 ++++++++++----------------------------
 src/pages/Event/event.vue         |  22 +++++---
 src/pages/Holiday/holiday.vue     |   2 +
 3 files changed, 47 insertions(+), 87 deletions(-)

diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 982c7ac..680eee9 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -1,26 +1,6 @@
 <template>
   <v-app id="pages-dasboard">
-    <v-tabs icons-and-text centered>
-      <v-tabs-slider color="green"></v-tabs-slider>
-      <v-tab href="#tab-1">
-        Events
-        <v-icon>event</v-icon>
-      </v-tab>
-      <v-tab href="#tab-2">
-        Holidays
-        <v-icon>star</v-icon>
-      </v-tab>
-      <v-tab-item id="tab-1">
-        <v-card flat>
-          <full-calendar ref="calendar" :events="events" :config="config"></full-calendar>
-        </v-card>
-      </v-tab-item>
-      <v-tab-item id="tab-2">
-        <v-card flat>
-          <full-calendar ref="calendar" :events="eventHoliday" :config="config"></full-calendar>
-        </v-card>
-      </v-tab-item>
-    </v-tabs>
+    <full-calendar ref="calendar" :events="events" :config="config"></full-calendar>
     <v-dialog v-model="dialog" max-width="500">
       <v-card color="grey lighten-4" flat>
         <v-toolbar dark color="fixcolors">
@@ -68,8 +48,9 @@ export default {
     return {
       showLoader: false,
       dialog: false,
+      HolidaysList: [],
+      EventsList: [],
       events: [],
-      eventHoliday: [],
       config: {
         eventClick: event => {
           this.selected = event;
@@ -97,35 +78,6 @@ export default {
     eventCreated(...test) {
       console.log(test);
     },
-    // getEvents() {
-    //   this.showLoader = true;
-    //   var token = this.$store.state.token;
-    //   http()
-    //     .get("/getSchoolEventsList", {
-    //       headers: { Authorization: "Bearer " + token }
-    //     })
-    //     .then(response => {
-    //       for(var i=0; i<response.data.data.length;i++){
-    //         console.log(response.data.data[i])
-    //         this.events = [
-    //           {
-    //             title:response.data.data[i].title,
-    //             start:response.data.data[i].dateOfEvent
-    //           }
-    //         ]
-    //       }
-    //       this.showLoader = false;
-    //     })
-    //     .catch(err => {
-    //       // console.log("err====>", err);
-    //       this.showLoader = false;
-    //       if (error.response.status === 401) {
-    //         this.$router.replace({ path: "/" });
-    //         this.$store.dispatch("setToken", null);
-    //         this.$store.dispatch("Id", null);
-    //       }
-    //     });
-    // }
     getHolidays() {
       this.showLoader = true;
       var token = this.$store.state.token;
@@ -134,7 +86,8 @@ export default {
           headers: { Authorization: "Bearer " + token }
         })
         .then(response => {
-          this.eventHoliday = response.data.data;
+          this.HolidaysList = response.data.data;
+          // this.events = response.data.data;
           this.showLoader = false;
         })
         .catch(err => {
@@ -146,6 +99,29 @@ export default {
             this.$store.dispatch("Id", null);
           }
         });
+      // },
+      // getEvents() {
+      var token = this.$store.state.token;
+      http()
+        .get("/getSchoolEventsList", {
+          headers: { Authorization: "Bearer " + token }
+        })
+        .then(response => {
+          this.EventsList = response.data.data;
+          let allData = [];
+          allData = this.HolidaysList.concat(this.EventsList);
+          this.events = allData;
+          this.showLoader = false;
+        })
+        .catch(error => {
+          // console.log("err====>", err);
+          this.showLoader = false;
+          if (error.response.status === 401) {
+            this.$router.replace({ path: "/" });
+            this.$store.dispatch("setToken", null);
+            this.$store.dispatch("Id", null);
+          }
+        });
     }
     // eventSources() {
     //   const self = this;
@@ -162,24 +138,6 @@ export default {
   },
   mounted() {
     // this.getEvents();
-    var token = this.$store.state.token;
-    http()
-      .get("/getSchoolEventsList", {
-        headers: { Authorization: "Bearer " + token }
-      })
-      .then(response => {
-        this.events = response.data.data;
-        this.showLoader = false;
-      })
-      .catch(error => {
-        // console.log("err====>", err);
-        this.showLoader = false;
-        if (error.response.status === 401) {
-          this.$router.replace({ path: "/" });
-          this.$store.dispatch("setToken", null);
-          this.$store.dispatch("Id", null);
-        }
-      });
     this.getHolidays();
   }
 };
@@ -215,10 +173,7 @@ export default {
   margin: 0 15px;
   min-width: 120px;
 }
-.primary {
-  background-color: #aaa !important;
-  border-color: #aaa !important;
-}
+
 h4 {
   background-repeat: no-repeat;
   padding: 8px;
@@ -275,13 +230,6 @@ h4 {
 #dialog {
   height: 550px;
 }
-.active {
-  background-color: black;
-  color: white !important;
-}
-.activebtn {
-  color: black !important;
-}
 #flex {
   height: 300px;
 }
diff --git a/src/pages/Event/event.vue b/src/pages/Event/event.vue
index ea70624..45ddc4a 100644
--- a/src/pages/Event/event.vue
+++ b/src/pages/Event/event.vue
@@ -102,6 +102,7 @@
                             placeholder="Select date"
                           ></v-text-field>
                           <v-date-picker
+                            color="info"
                             ref="picker"
                             v-model="editedItem.dateOfEvent"
                             @input="$refs.menu.save(editedItem.dateOfEvent)"
@@ -157,7 +158,9 @@
                   <v-flex>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1"><b>Title:</b></h5>
+                        <h5 class="right my-1">
+                          <b>Title:</b>
+                        </h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.title }}</h5>
@@ -165,7 +168,9 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1"><b>Date:</b></h5>
+                        <h5 class="right my-1">
+                          <b>Date:</b>
+                        </h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ dates(editedItem.dateOfEvent) }}</h5>
@@ -173,7 +178,9 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1"><b>Description:</b></h5>
+                        <h5 class="right my-1">
+                          <b>Description:</b>
+                        </h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.description }}</h5>
@@ -298,7 +305,7 @@
                   <v-flex xs12>
                     <v-layout>
                       <v-flex xs4 class="pt-4 subheading">
-                        <label class="right">date:</label>
+                        <label class="right">Date:</label>
                       </v-flex>
                       <v-flex xs4 class="ml-3">
                         <v-menu
@@ -307,6 +314,7 @@
                           v-model="menu1"
                           :nudge-right="40"
                           :return-value.sync="addEvent.dateOfEvent"
+                          app
                           lazy
                           transition="scale-transition"
                           offset-y
@@ -317,12 +325,14 @@
                             slot="activator"
                             :rules="dateRules"
                             v-model="addEvent.dateOfEvent"
+                            append-icon="event"
                             placeholder="Select date"
                           ></v-text-field>
                           <v-date-picker
+                            color="info"
                             v-model="addEvent.dateOfEvent"
-                            @input="$refs.menu1.save(addEvent.dateOfEvent)">
-                          </v-date-picker>
+                            @input="$refs.menu1.save(addEvent.dateOfEvent)"
+                          ></v-date-picker>
                         </v-menu>
                       </v-flex>
                     </v-layout>
diff --git a/src/pages/Holiday/holiday.vue b/src/pages/Holiday/holiday.vue
index d4f03ef..59cb038 100644
--- a/src/pages/Holiday/holiday.vue
+++ b/src/pages/Holiday/holiday.vue
@@ -82,6 +82,7 @@
                           ></v-text-field>
                           <v-date-picker
                             ref="picker"
+                            color="info"
                             v-model="editedItem.dateOfHoliday"
                             @input="menu = false"
                           ></v-date-picker>
@@ -259,6 +260,7 @@
                           ></v-text-field>
                           <v-date-picker
                             ref="picker"
+                            color="info"
                             v-model="addHoliday.dateOfHoliday"
                             @input="$refs.menu1.save(addHoliday.dateOfHoliday)"
                           ></v-date-picker>
-- 
2.0.0