Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

calendar app: fix error on users on startup

Browse Source
This commit is contained in:
Julien Fastré 2022-06-06 15:13:36 +02:00
parent 6c3043f6fc
commit c31886fea3
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
View File

@ -23,15 +23,13 @@
<location></location> <location></location>
<teleport to="#fullCalendar"> <teleport to="#fullCalendar">
<div class="row"> <div>
<template v-for="u in getActiveUsers" :key="u.id"> <template class="" v-for="u in getActiveUsers" :key="u.id">
<div class="col-md-4"> <calendar-active :user="u" ></calendar-active>
<calendar-active :user="u" ></calendar-active>
</div>
</template> </template>
</div> </div>
<div class="row"> <div class="row justify-content-between">
<div class="col-md-6"> <div class="col-sm-4 col-xs-12">
<div class="input-group mb-3"> <div class="input-group mb-3">
<label class="input-group-text" for="slotDuration">Durée des créneaux</label> <label class="input-group-text" for="slotDuration">Durée des créneaux</label>
<select v-model="this.slotDuration" id="slotDuration" class="form-select"> <select v-model="this.slotDuration" id="slotDuration" class="form-select">
@ -42,11 +40,13 @@
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-6 self-end-m"> <div class="col-sm-4 col-xs-12">
<div class="input-group mb-3"> <div class="float-end">
<div class="input-group-text"> <div class="input-group mb-3">
<input id="showHideWE" class="form-check-input mt-0" type="checkbox" v-model="this.hideWeekEnds" /> <div class="input-group-text">
<label for="showHideWE" class="form-check-label">Masquer les week-ends</label> <input id="showHideWE" class="form-check-input mt-0" type="checkbox" v-model="this.hideWeekEnds" />
<label for="showHideWE" class="form-check-label">Masquer les week-ends</label>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -73,7 +73,7 @@ import interactionPlugin from '@fullcalendar/interaction';
import timeGridPlugin from '@fullcalendar/timegrid'; import timeGridPlugin from '@fullcalendar/timegrid';
import CalendarActive from './Components/CalendarActive'; import CalendarActive from './Components/CalendarActive';
import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue'; import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue';
import {mapGetters} from "vuex"; import {mapGetters, mapState} from "vuex";
export default { export default {
name: "App", name: "App",
@ -94,6 +94,7 @@ export default {
}, },
computed: { computed: {
...mapGetters(['getMainUser']), ...mapGetters(['getMainUser']),
...mapState(['activity']),
events() { events() {
return this.$store.getters.getEventSources; return this.$store.getters.getEventSources;
}, },
@ -102,7 +103,7 @@ export default {
locale: frLocale, locale: frLocale,
plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, dayGridPlugin], plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, dayGridPlugin],
initialView: 'timeGridWeek', initialView: 'timeGridWeek',
initialDate: this.$store.getters.initialDate, initialDate: this.$store.getters.getInitialDate,
eventSources: this.events, eventSources: this.events,
selectable: true, selectable: true,
datesSet: this.onDatesSet, datesSet: this.onDatesSet,
@ -121,7 +122,7 @@ export default {
timeGrid: { timeGrid: {
slotEventOverlap: false, slotEventOverlap: false,
slotDuration: this.slotDuration, slotDuration: this.slotDuration,
scrollTime: '10:00:00', //scrollTime: '10:00:00',
}, },
dayGridThreeDays: { dayGridThreeDays: {
type: 'dayGridWeek', type: 'dayGridWeek',

22
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<span class="badge" :style="style"> <div :style="style" style="display: inline-block;">
{{ user.text }} <span class="badge-user">{{ user.text }}</span>
<span class="form-check form-switch"> <span class="form-check-inline form-switch">
<input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault" v-model="rangeShow"> <input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault" v-model="rangeShow">
<label class="form-check-label" for="flexSwitchCheckDefault">Disponibilité</label> <label class="form-check-label" for="flexSwitchCheckDefault">Disponibilité</label>
</span> </span>
<span class="form-check form-switch"> <span class="form-check-inline form-switch">
<input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault" v-model="remoteShow"> <input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault" v-model="remoteShow">
<label class="form-check-label" for="flexSwitchCheckDefault">Agenda</label> <label class="form-check-label" for="flexSwitchCheckDefault">Agenda</label>
</span> </span>
</span> </div>
</template> </template>
<script> <script>

1
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/actions.js
View File

@ -81,6 +81,7 @@ export default {
}, },
addPersonsInvolved({commit, dispatch}, payload) { addPersonsInvolved({commit, dispatch}, payload) {
console.log('### action addPersonsInvolved', payload.result.type); console.log('### action addPersonsInvolved', payload.result.type);
console.log('### action addPersonsInvolved payload result', payload.result);
switch (payload.result.type) { switch (payload.result.type) {
case 'person': case 'person':
let aPersons = document.getElementById("chill_activitybundle_activity_persons"); let aPersons = document.getElementById("chill_activitybundle_activity_persons");

4
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/getters.js
View File

@ -91,6 +91,10 @@ export default {
return sources; return sources;
}, },
getInitialDate(state) {
console.log('initialDate', state.activity.startDate);
return state.activity.startDate;
},
/** /**
* get the user data for a specific user * get the user data for a specific user
* *

4
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/index.js
View File

@ -57,4 +57,8 @@ if (null !== store.getters.getMainUser) {
store.commit('showUserOnCalendar', {ranges: true, remotes: true, user: store.getters.getMainUser}); store.commit('showUserOnCalendar', {ranges: true, remotes: true, user: store.getters.getMainUser});
} }
for (let u of store.state.activity.users) {
store.commit('showUserOnCalendar', {ranges: false, remotes: false, user: u});
}
export default store; export default store;

5
src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.js
View File

@ -19,9 +19,8 @@ const removeIdFromValue = (string, id) => {
* Assign missing keys for the ConcernedGroups component * Assign missing keys for the ConcernedGroups component
*/ */
const mapEntity = (entity) => { const mapEntity = (entity) => {
console.log('mapEntity', entity);
let calendar = { ...entity}; let calendar = { ...entity};
Object.assign(calendar, {thirdParties: entity.professionals, users: entity.invites}); Object.assign(calendar, {thirdParties: entity.professionals});
if (entity.startDate !== null ) { if (entity.startDate !== null ) {
calendar.startDate = ISOToDatetime(entity.startDate.datetime); calendar.startDate = ISOToDatetime(entity.startDate.datetime);
@ -35,8 +34,6 @@ const mapEntity = (entity) => {
calendar.calendarRange.id = `range_${entity.calendarRange.id}`; calendar.calendarRange.id = `range_${entity.calendarRange.id}`;
} }
console.log('new calendar object ', calendar);
return calendar; return calendar;
}; };