diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 214b8d941..118ac51e8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -14,7 +14,9 @@
- {{ arg.timeText }}
+ {{ arg.timeText }}
+ {{ arg.timeText }}
+ {{ arg.timeText }}
{{ arg.event.title }}
@@ -23,24 +25,31 @@
-
-
-
- {{ $t('loading') }}
-
+
+ -
+
+
+
+ {{ $t('loading') }}
+
+
+ -
+
+
+
+
-
-
{{ $t('copy_range_how_to')}}
+
@@ -77,7 +86,7 @@
@close="modal.showModal = false">
- {{ this.myCalendarClickedEvent.start.toLocaleString() }} - {{ this.myCalendarClickedEvent.end.toLocaleString() }}
+ {{ this.renderEventDate() }}
@@ -165,7 +174,7 @@ export default {
eventDrop: this.onEventDropOrResize,
eventResize: this.onEventDropOrResize,
eventClick: this.onEventClick,
- selectMirror: true,
+ selectMirror: false,
editable: true,
weekends: false,
headerToolbar: {
@@ -226,7 +235,7 @@ export default {
start: i.startDate.datetime,
end: i.endDate.datetime,
calendarRangeId: i.id,
- toDelete: 0
+ toDelete: false
})
);
let calendarRangeEvents = {
@@ -307,10 +316,6 @@ export default {
this.$store.dispatch('updateRange', payload);
},
onEventClick(payload) {
- console.log(payload)
- console.log(payload.event)
- console.log(payload.event.extendedProps)
-
if (payload.event.extendedProps.myCalendar) {
this.myCalendarClickedEvent = {
id: payload.event.extendedProps.calendarId,
@@ -369,12 +374,12 @@ export default {
},
onClickDelete(payload) {
if (payload.extendedProps.hasOwnProperty("calendarRangeId")) {
- if (payload.extendedProps.toDelete === 1) {
- payload.setExtendedProp('toDelete', 0)
+ if (payload.extendedProps.toDelete) {
+ payload.setExtendedProp('toDelete', false)
payload.setProp('borderColor', '#79bafc');
this.$store.dispatch('removeFromDeleteRange', payload);
} else {
- payload.setExtendedProp('toDelete', 1)
+ payload.setExtendedProp('toDelete', true)
payload.setProp('borderColor', '#dddddd');
this.$store.dispatch('deleteRange', payload);
}
@@ -448,6 +453,13 @@ export default {
} else {
console.log('no new events to copy-paste!')
}
+ },
+ renderEventDate() {
+ let start = this.myCalendarClickedEvent.start;
+ let end = this.myCalendarClickedEvent.end;
+ return start.getDate() === end.getDate() ?
+ `${start.toLocaleDateString()}, ${start.toLocaleTimeString()} - ${end.toLocaleTimeString()}` :
+ `${start.toLocaleString()} - ${end.toLocaleString()}`;
}
},
mounted() {