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