mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
adapting vue_calendar to use Location
This commit is contained in:
parent
d86307327c
commit
6876c23adb
@ -1,6 +1,6 @@
|
|||||||
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
|
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
|
||||||
|
|
||||||
const appMessages = {
|
const activityMessages = {
|
||||||
fr: {
|
fr: {
|
||||||
activity: {
|
activity: {
|
||||||
//
|
//
|
||||||
@ -36,8 +36,8 @@ const appMessages = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.assign(appMessages.fr, personMessages.fr);
|
Object.assign(activityMessages.fr, personMessages.fr);
|
||||||
|
|
||||||
export {
|
export {
|
||||||
appMessages
|
activityMessages
|
||||||
};
|
};
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import { createApp } from 'vue';
|
import { createApp } from 'vue';
|
||||||
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
|
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
|
||||||
import { appMessages } from './i18n'
|
import { activityMessages } from './i18n'
|
||||||
import store from './store'
|
import store from './store'
|
||||||
|
|
||||||
import App from './App.vue';
|
import App from './App.vue';
|
||||||
|
|
||||||
const i18n = _createI18n(appMessages);
|
const i18n = _createI18n(activityMessages);
|
||||||
|
|
||||||
const app = createApp({
|
const app = createApp({
|
||||||
template: `<app></app>`,
|
template: `<app></app>`,
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<concerned-groups></concerned-groups>
|
<concerned-groups></concerned-groups>
|
||||||
|
<location></location>
|
||||||
<teleport to="#calendarControls">
|
<teleport to="#calendarControls">
|
||||||
<calendar-user-selector
|
<calendar-user-selector
|
||||||
v-bind:users="users"
|
v-bind:users="users"
|
||||||
@ -22,6 +23,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
|
import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
|
||||||
|
import Location from 'ChillActivityAssets/vuejs/Activity/components/Location.vue';
|
||||||
import CalendarUserSelector from '../_components/CalendarUserSelector/CalendarUserSelector.vue';
|
import CalendarUserSelector from '../_components/CalendarUserSelector/CalendarUserSelector.vue';
|
||||||
import '@fullcalendar/core/vdom'; // solves problem with Vite
|
import '@fullcalendar/core/vdom'; // solves problem with Vite
|
||||||
import frLocale from '@fullcalendar/core/locales/fr';
|
import frLocale from '@fullcalendar/core/locales/fr';
|
||||||
@ -35,6 +37,7 @@ export default {
|
|||||||
name: "App",
|
name: "App",
|
||||||
components: {
|
components: {
|
||||||
ConcernedGroups,
|
ConcernedGroups,
|
||||||
|
Location,
|
||||||
CalendarUserSelector,
|
CalendarUserSelector,
|
||||||
FullCalendar
|
FullCalendar
|
||||||
},
|
},
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
|
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
|
||||||
import { calendarUserSelectorMessages } from '../_components/CalendarUserSelector/js/i18n';
|
import { calendarUserSelectorMessages } from '../_components/CalendarUserSelector/js/i18n';
|
||||||
|
import { activityMessages } from 'ChillActivityAssets/vuejs/Activity/i18n';
|
||||||
|
|
||||||
const appMessages = {
|
const appMessages = {
|
||||||
fr: {
|
fr: {
|
||||||
@ -17,6 +18,7 @@ const appMessages = {
|
|||||||
|
|
||||||
Object.assign(appMessages.fr, personMessages.fr);
|
Object.assign(appMessages.fr, personMessages.fr);
|
||||||
Object.assign(appMessages.fr, calendarUserSelectorMessages.fr);
|
Object.assign(appMessages.fr, calendarUserSelectorMessages.fr);
|
||||||
|
Object.assign(appMessages.fr, activityMessages.fr);
|
||||||
|
|
||||||
export {
|
export {
|
||||||
appMessages
|
appMessages
|
||||||
|
@ -66,6 +66,11 @@ const store = createStore({
|
|||||||
setEvents(state, payload) {
|
setEvents(state, payload) {
|
||||||
console.log(payload)
|
console.log(payload)
|
||||||
state.currentEvent = {start: payload.start, end: payload.end}
|
state.currentEvent = {start: payload.start, end: payload.end}
|
||||||
|
},
|
||||||
|
// Location
|
||||||
|
updateLocation(state, value) {
|
||||||
|
console.log('### mutation: updateLocation', value);
|
||||||
|
state.activity.location = value;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
@ -130,6 +135,14 @@ const store = createStore({
|
|||||||
commit('setEvents', payload);
|
commit('setEvents', payload);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// Location
|
||||||
|
updateLocation({ commit }, value) {
|
||||||
|
console.log('### action: updateLocation', value);
|
||||||
|
let hiddenLocation = document.getElementById("chill_calendarbundle_calendar_location");
|
||||||
|
hiddenLocation.value = value.id;
|
||||||
|
commit('updateLocation', value);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -36,6 +36,20 @@
|
|||||||
<dt class="inline">{{ 'status'|trans }}</dt>
|
<dt class="inline">{{ 'status'|trans }}</dt>
|
||||||
<dd>{{ entity.status }}</dd>
|
<dd>{{ entity.status }}</dd>
|
||||||
|
|
||||||
|
|
||||||
|
<dt class="inline">{{ 'calendar location'|trans }}</dt>
|
||||||
|
<dd>
|
||||||
|
{% if entity.location is not null %}
|
||||||
|
<p>
|
||||||
|
<span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
|
||||||
|
{{ entity.location.name }}
|
||||||
|
</p>
|
||||||
|
{{ entity.location.address|chill_entity_render_box }}
|
||||||
|
{% else %}
|
||||||
|
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</dd>
|
||||||
|
|
||||||
{% if not entity.comment.isEmpty %}
|
{% if not entity.comment.isEmpty %}
|
||||||
<dt class="inline">{{ 'calendar comment'|trans }}</dt>
|
<dt class="inline">{{ 'calendar comment'|trans }}</dt>
|
||||||
<dd>{{ entity.comment|chill_entity_render_box }}</dd>
|
<dd>{{ entity.comment|chill_entity_render_box }}</dd>
|
||||||
|
@ -14,6 +14,7 @@ start date: début du rendez-vous
|
|||||||
end date: fin du rendez-vous
|
end date: fin du rendez-vous
|
||||||
cancel reason: motif d'annulation
|
cancel reason: motif d'annulation
|
||||||
status: Statut du rendez-vous
|
status: Statut du rendez-vous
|
||||||
|
calendar location: Localistion du rendez-vous
|
||||||
calendar comment: Remarque sur le rendez-vous
|
calendar comment: Remarque sur le rendez-vous
|
||||||
sendSMS: Envoi d'un SMS
|
sendSMS: Envoi d'un SMS
|
||||||
Send s m s: Envoi d'un SMS ?
|
Send s m s: Envoi d'un SMS ?
|
||||||
|
Loading…
x
Reference in New Issue
Block a user