rdv: add user calendar endpoint + add this calendar in the calendar

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue

@@ -51,7 +51,7 @@ export default {
       calendarEvents: {
          loaded: [],
          selected: [],
-         userEvents: [], //TODO load user calendar events
+         user: [], //TODO load user calendar events
          current: currentEvent
       },
       calendarOptions: {
@@ -81,22 +81,24 @@ export default {
       console.log(window.startDate)
       // let calendar = this.$refs.fullCalendar.getApi()
       // console.log(calendar)
+      this.calendarEvents.selected.push(this.calendarEvents.user);
+      this.calendarOptions.eventSources = this.calendarEvents.selected;
+      console.log(this.calendarOptions.eventSources)
+
     },
     updateEventsSource() {
-      this.calendarOptions.eventSources = this.calendarEvents.selected;
       if (window.startDate !== undefined) {
          this.calendarEvents.selected.push(currentEvent);
       }
+      this.calendarEvents.selected.push(this.calendarEvents.user);
+      this.calendarOptions.eventSources = this.calendarEvents.selected;
+      console.log(this.calendarOptions.eventSources)
     },
     onDateSelect(payload) {
       Object.assign(payload, {users: this.users});
       this.$store.dispatch('createEvent', payload);
     },
     onEventChange(payload) {
-      console.log(payload.event);
-      console.log(payload.event.extendedProps);
-      console.log(payload.event.source);
-      console.log(payload.event.source.id);
       console.log(this.calendarOptions.eventSources)
       this.$store.dispatch('updateEvent', payload);
     },

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js

@@ -113,7 +113,6 @@ const store = createStore({
          startDateInput.value = payload.startStr;
          let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate");
          endDateInput.value = payload.endStr;
-         //TODO specify the mainUserInput value if not from a source
          let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser");
          mainUserInput.value = payload.users.logged.id;
          commit('setEvents', payload);
@@ -128,7 +127,6 @@ const store = createStore({
          calendarRangeInput.value = Number(payload.event.extendedProps.calendarRangeId);
          let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser");
          mainUserInput.value = Number(payload.event.source.id);
-         //TODO check if working when reiszing an event
          commit('setEvents', payload);
       },
 

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue

@@ -22,7 +22,7 @@
 </template>
 <script>
 
-import { fetchCalendarRanges } from './js/api'
+import { fetchCalendarRanges, fetchCalendar } from './js/api'
 import VueMultiselect from 'vue-multiselect';
 import { whoami } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api';
 
@@ -54,9 +54,9 @@ export default {
   },
   methods: {
     init() {
-      this.getUniqueUserCalendarRanges()
+      this.fetchData()
     },
-    getUniqueUserCalendarRanges() {
+    fetchData() {
       fetchCalendarRanges().then(calendarRanges => new Promise((resolve, reject) => {
           let results = calendarRanges.results;
           
@@ -103,12 +103,33 @@ export default {
             this.users.logged = me;
             let currentUser = users.find(u => u.id === me.id);
             this.value = currentUser;
-            this.selectUsers(currentUser);
+            
+            fetchCalendar(currentUser.id).then(calendar => new Promise((resolve, reject) => {
+              let results = calendar.results;
+              console.log(results)
+              let events = results.map(i => 
+                ({
+                  start: i.startDate.datetime,
+                  end: i.endDate.datetime,
+                })
+              );
+              let calendarEventsCurrentUser = {
+                  events: events,
+                  color: 'darkblue',
+                  id: 1000
+              };
+              console.log(calendarEventsCurrentUser);
+              this.calendarEvents.user = calendarEventsCurrentUser;
+
+              this.selectUsers(currentUser);
+
+              resolve();
+            }));
 
             resolve();
           }));
 
-          resolve()
+          resolve();
       }))
       .catch((error) => {
         this.errorMsg.push(error.message);

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js

@@ -12,6 +12,21 @@ const fetchCalendarRanges = () => {
       });
 };
 
-export {
-   fetchCalendarRanges
+/*
+* Endpoint chill_api_single_calendar
+* method GET, get Calendar events, can be filtered by mainUser
+* @returns {Promise} a promise containing all Calendar objects
+*/
+const fetchCalendar = (mainUserId) => {
+   const url = `/api/1.0/calendar/calendar.json?main_user=${mainUserId}&item_per_page=1000`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+export {
+   fetchCalendarRanges,
+   fetchCalendar
 };