mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-22 06:49:35 +00:00
[Refactor] Code formatting refactor
This commit is contained in:
1 parent
9d70fe378d
commit
1a1b6f99a8
3 files changed
+140
-75
No files matched your search
@@ -104,6 +104,36 @@
|
|||||||
"title": "Task 7",
|
"title": "Task 7",
|
||||||
"project_code": "CO-2201",
|
"project_code": "CO-2201",
|
||||||
"master_task_color": "#E7DBF8"
|
"master_task_color": "#E7DBF8"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"id": 8,
|
||||||
|
"task_id": 8,
|
||||||
|
"starts_at": "2022-12-19T07:00:00+00:00",
|
||||||
|
"ends_at": "2022-12-19T09:00:00+00:00",
|
||||||
|
"title": "Task 8",
|
||||||
|
"project_code": "CO-2201",
|
||||||
|
"master_task_color": "#E7DBF8"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"id": 9,
|
||||||
|
"task_id": 9,
|
||||||
|
"starts_at": "2022-12-20T09:00:00+00:00",
|
||||||
|
"ends_at": "2022-12-20T12:00:00+00:00",
|
||||||
|
"title": "Task 9",
|
||||||
|
"project_code": "CO-2201",
|
||||||
|
"master_task_color": "#E9FFE6"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"id": 10,
|
||||||
|
"task_id": 10,
|
||||||
|
"starts_at": "2022-12-19T12:00:00+00:00",
|
||||||
|
"ends_at": "2022-12-19T13:00:00+00:00",
|
||||||
|
"title": "Task 10",
|
||||||
|
"project_code": "CO-2201",
|
||||||
|
"master_task_color": "#57e0f2"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -35,9 +35,13 @@
|
|||||||
<div class="vuecal__bg" :class="{ vuecal__flex: !hasTimeColumn }" column="column">
|
<div class="vuecal__bg" :class="{ vuecal__flex: !hasTimeColumn }" column="column">
|
||||||
<div class="vuecal__flex" row="row" grow="grow">
|
<div class="vuecal__flex" row="row" grow="grow">
|
||||||
<div class="vuecal__time-column" v-if="hasTimeColumn">
|
<div class="vuecal__time-column" v-if="hasTimeColumn">
|
||||||
<div class="vuecal__all-day-text" v-if="showAllDayEvents && cellOrSplitMinWidth && !(isDayView && !minSplitWidth)" :style="{ height: allDayBar.height }"><span>{{ texts.allDay }}</span></div>
|
<div class="vuecal__all-day-text" v-if="showAllDayEvents && cellOrSplitMinWidth && !(isDayView && !minSplitWidth)" :style="{ height: allDayBar.height }">
|
||||||
|
<span>{{ texts.allDay }}</span>
|
||||||
|
</div>
|
||||||
<div class="vuecal__time-cell" v-for="(cell, i) in timeCells" :key="i" :style="`height: ${timeCellHeight}px`">
|
<div class="vuecal__time-cell" v-for="(cell, i) in timeCells" :key="i" :style="`height: ${timeCellHeight}px`">
|
||||||
<slot name="time-cell" :hours="cell.hours" :minutes="cell.minutes"><span class="vuecal__time-cell-line"></span><span class="vuecal__time-cell-label">{{ cell.label }}</span></slot>
|
<slot name="time-cell" :hours="cell.hours" :minutes="cell.minutes"
|
||||||
|
><span class="vuecal__time-cell-line"></span><span class="vuecal__time-cell-label">{{ cell.label }}</span></slot
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="vuecal__flex vuecal__week-numbers" v-if="showWeekNumbers && isMonthView" column="column">
|
<div class="vuecal__flex vuecal__week-numbers" v-if="showWeekNumbers && isMonthView" column="column">
|
||||||
@@ -68,7 +72,9 @@
|
|||||||
</slot>
|
</slot>
|
||||||
</template>
|
</template>
|
||||||
</all-day-bar>
|
</all-day-bar>
|
||||||
|
|
||||||
<div class="vuecal__flex" :ref="el => cellsEl = el" grow="grow" :wrap="!cellOrSplitMinWidth || !isWeekView" :style="cellOrSplitMinWidth ? `min-width: ${cellOrSplitMinWidth}px` : ''">
|
<div class="vuecal__flex" :ref="el => cellsEl = el" grow="grow" :wrap="!cellOrSplitMinWidth || !isWeekView" :style="cellOrSplitMinWidth ? `min-width: ${cellOrSplitMinWidth}px` : ''">
|
||||||
|
<!-- TU -->
|
||||||
<vuecal-cell v-for="(cell, i) in viewCells" :key="i" :options="$props" :edit-events="editEvents" :data="cell" :cell-width="hideWeekdays.length && (isWeekView || isMonthView) && cellWidth" :min-timestamp="minTimestamp" :max-timestamp="maxTimestamp" :cell-splits="hasSplits && daySplits || []">
|
<vuecal-cell v-for="(cell, i) in viewCells" :key="i" :options="$props" :edit-events="editEvents" :data="cell" :cell-width="hideWeekdays.length && (isWeekView || isMonthView) && cellWidth" :min-timestamp="minTimestamp" :max-timestamp="maxTimestamp" :cell-splits="hasSplits && daySplits || []">
|
||||||
<template #cell-content="{ events, split, selectCell }">
|
<template #cell-content="{ events, split, selectCell }">
|
||||||
<slot name="cell-content" :cell="cell" :view="view" :go-narrower="selectCell" :events="events">
|
<slot name="cell-content" :cell="cell" :view="view" :go-narrower="selectCell" :events="events">
|
||||||
@@ -86,7 +92,10 @@
|
|||||||
<slot name="event" :view="view" :event="event">
|
<slot name="event" :view="view" :event="event">
|
||||||
<div class="vuecal__event-title vuecal__event-title--edit" v-if="editEvents.title && event.titleEditable" contenteditable="contenteditable" @blur="onEventTitleBlur($event, event)" v-html="event.title"></div>
|
<div class="vuecal__event-title vuecal__event-title--edit" v-if="editEvents.title && event.titleEditable" contenteditable="contenteditable" @blur="onEventTitleBlur($event, event)" v-html="event.title"></div>
|
||||||
<div class="vuecal__event-title" v-else-if="event.title" v-html="event.title"></div>
|
<div class="vuecal__event-title" v-else-if="event.title" v-html="event.title"></div>
|
||||||
<div class="vuecal__event-time" v-if="time && !event.allDay && !(isMonthView && (event.allDay || showAllDayEvents === 'short')) && !isShortMonthView">{{ utils.date.formatTime(event.start, TimeFormat) }}<span v-if="event.endTimeMinutes"> - {{ utils.date.formatTime(event.end, TimeFormat, null, true) }}</span><small class="days-to-end" v-if="event.daysCount > 1 && (event.segments[cell.formattedDate] || {}).isFirstDay"> +{{ event.daysCount - 1 }}{{ (texts.day[0] || '').toLowerCase() }}</small></div>
|
<div class="vuecal__event-time" v-if="time && !event.allDay && !(isMonthView && (event.allDay || showAllDayEvents === 'short')) && !isShortMonthView">
|
||||||
|
{{ utils.date.formatTime(event.start, TimeFormat) }}<span v-if="event.endTimeMinutes"> - {{ utils.date.formatTime(event.end, TimeFormat, null, true) }}</span
|
||||||
|
><small class="days-to-end" v-if="event.daysCount > 1 && (event.segments[cell.formattedDate] || {}).isFirstDay"> +{{ event.daysCount - 1 }}{{ (texts.day[0] || '').toLowerCase() }}</small>
|
||||||
|
</div>
|
||||||
<div class="vuecal__event-content" v-if="event.content && !(isMonthView && event.allDay && showAllDayEvents === 'short') && !isShortMonthView" v-html="event.content"></div>
|
<div class="vuecal__event-content" v-if="event.content && !(isMonthView && event.allDay && showAllDayEvents === 'short') && !isShortMonthView" v-html="event.content"></div>
|
||||||
</slot>
|
</slot>
|
||||||
</template>
|
</template>
|
||||||
@@ -149,7 +158,12 @@ const dateUtils = new DateUtils(textsDefaults) // Do this ASAP for date prototyp
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'vue-cal',
|
name: 'vue-cal',
|
||||||
components: { 'vuecal-cell': Cell, 'vuecal-header': Header, WeekdaysHeadings, AllDayBar },
|
components: {
|
||||||
|
'vuecal-cell': Cell,
|
||||||
|
'vuecal-header': Header,
|
||||||
|
WeekdaysHeadings,
|
||||||
|
AllDayBar
|
||||||
|
},
|
||||||
|
|
||||||
// By Vue design, passing props loses the reactivity unless it's a method or reactive OBJECT.
|
// By Vue design, passing props loses the reactivity unless it's a method or reactive OBJECT.
|
||||||
provide() {
|
provide() {
|
||||||
@@ -339,10 +353,8 @@ export default {
|
|||||||
if (this.locale === 'en') {
|
if (this.locale === 'en') {
|
||||||
const texts = await import('./i18n/en.json')
|
const texts = await import('./i18n/en.json')
|
||||||
this.texts = Object.assign({}, textsDefaults, texts)
|
this.texts = Object.assign({}, textsDefaults, texts)
|
||||||
}
|
} else {
|
||||||
else {
|
import(`./i18n/${locale}.json`).then((response) => {
|
||||||
import(`./i18n/${locale}.json`)
|
|
||||||
.then(response => {
|
|
||||||
this.texts = Object.assign({}, textsDefaults, response.default)
|
this.texts = Object.assign({}, textsDefaults, response.default)
|
||||||
this.utils.date.updateTexts(this.texts)
|
this.utils.date.updateTexts(this.texts)
|
||||||
})
|
})
|
||||||
@@ -354,7 +366,7 @@ export default {
|
|||||||
*/
|
*/
|
||||||
loadDragAndDrop() {
|
loadDragAndDrop() {
|
||||||
import('./modules/drag-and-drop')
|
import('./modules/drag-and-drop')
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
const { DragAndDrop } = response
|
const { DragAndDrop } = response
|
||||||
this.modules.dnd = new DragAndDrop(this)
|
this.modules.dnd = new DragAndDrop(this)
|
||||||
})
|
})
|
||||||
@@ -516,13 +528,19 @@ export default {
|
|||||||
view,
|
view,
|
||||||
startDate,
|
startDate,
|
||||||
endDate: this.view.endDate,
|
endDate: this.view.endDate,
|
||||||
...(this.isMonthView ? {
|
...(this.isMonthView
|
||||||
|
? {
|
||||||
firstCellDate: this.view.firstCellDate,
|
firstCellDate: this.view.firstCellDate,
|
||||||
lastCellDate: this.view.lastCellDate,
|
lastCellDate: this.view.lastCellDate,
|
||||||
outOfScopeEvents: this.view.outOfScopeEvents.map(this.cleanupEvent)
|
outOfScopeEvents: this.view.outOfScopeEvents.map(this.cleanupEvent)
|
||||||
} : {}),
|
}
|
||||||
|
: {}),
|
||||||
events: this.view.events.map(this.cleanupEvent),
|
events: this.view.events.map(this.cleanupEvent),
|
||||||
...(this.isWeekView ? { week: ud.getWeek(this.startWeekOnSunday ? ud.addDays(startDate, 1) : startDate) } : {})
|
...(this.isWeekView
|
||||||
|
? {
|
||||||
|
week: ud.getWeek(this.startWeekOnSunday ? ud.addDays(startDate, 1) : startDate)
|
||||||
|
}
|
||||||
|
: {})
|
||||||
}
|
}
|
||||||
this.$emit('view-change', params)
|
this.$emit('view-change', params)
|
||||||
}
|
}
|
||||||
@@ -570,7 +588,7 @@ export default {
|
|||||||
case 'day':
|
case 'day':
|
||||||
firstCellDate = ud[next ? 'addDays' : 'subtractDays'](startDate, 1)
|
firstCellDate = ud[next ? 'addDays' : 'subtractDays'](startDate, 1)
|
||||||
const weekDay = firstCellDate.getDay() // 0 to 6 with Sunday at position 0.
|
const weekDay = firstCellDate.getDay() // 0 to 6 with Sunday at position 0.
|
||||||
const weekDayIndex = this.startWeekOnSunday ? weekDay : ((weekDay || 7) - 1)
|
const weekDayIndex = this.startWeekOnSunday ? weekDay : (weekDay || 7) - 1
|
||||||
const isDayHidden = this.weekDays[weekDayIndex].hide
|
const isDayHidden = this.weekDays[weekDayIndex].hide
|
||||||
|
|
||||||
// If the day to show on the day view is listed as hidden by hideWeekdays or hideWeekends,
|
// If the day to show on the day view is listed as hidden by hideWeekdays or hideWeekends,
|
||||||
@@ -582,14 +600,13 @@ export default {
|
|||||||
let daysFromDate = 0
|
let daysFromDate = 0
|
||||||
|
|
||||||
if (next) {
|
if (next) {
|
||||||
dayToShow = ([...daysWithIndex.slice(weekDayIndex), ...daysWithIndex]).find(day => {
|
dayToShow = [...daysWithIndex.slice(weekDayIndex), ...daysWithIndex].find((day) => {
|
||||||
daysFromDate++
|
daysFromDate++
|
||||||
return !day.hide
|
return !day.hide
|
||||||
}).i // Returns 0 to 6 with Monday at position 0.
|
}).i // Returns 0 to 6 with Monday at position 0.
|
||||||
daysFromDate--
|
daysFromDate--
|
||||||
}
|
} else {
|
||||||
else {
|
dayToShow = [...daysWithIndex, ...daysWithIndex.slice(0, weekDayIndex)].reverse().find((day) => {
|
||||||
dayToShow = ([...daysWithIndex, ...daysWithIndex.slice(0, weekDayIndex)]).reverse().find(day => {
|
|
||||||
daysFromDate++
|
daysFromDate++
|
||||||
return !day.hide
|
return !day.hide
|
||||||
}).i // Returns 0 to 6 with Monday at position 0.
|
}).i // Returns 0 to 6 with Monday at position 0.
|
||||||
@@ -624,12 +641,12 @@ export default {
|
|||||||
|
|
||||||
// First remove the events that are not in view.
|
// First remove the events that are not in view.
|
||||||
// Keep the unfiltered array of events for outOfScopeEvents below.
|
// Keep the unfiltered array of events for outOfScopeEvents below.
|
||||||
let filteredEvents = events.filter(e => ue.eventInRange(e, startDate, endDate))
|
let filteredEvents = events.filter((e) => ue.eventInRange(e, startDate, endDate))
|
||||||
|
|
||||||
// For each multiple-day event and only if needed, create its segments (= days) for rendering in the view.
|
// For each multiple-day event and only if needed, create its segments (= days) for rendering in the view.
|
||||||
// If we don't display the event on month view (eventsOnMonthView = false) then don't create segments.
|
// If we don't display the event on month view (eventsOnMonthView = false) then don't create segments.
|
||||||
if (!this.isYearsOrYearView && !(this.isMonthView && !this.eventsOnMonthView)) {
|
if (!this.isYearsOrYearView && !(this.isMonthView && !this.eventsOnMonthView)) {
|
||||||
filteredEvents = filteredEvents.map(e => {
|
filteredEvents = filteredEvents.map((e) => {
|
||||||
return e.daysCount > 1 ? ue.createEventSegments(e, firstCellDate || startDate, lastCellDate || endDate) : e
|
return e.daysCount > 1 ? ue.createEventSegments(e, firstCellDate || startDate, lastCellDate || endDate) : e
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -639,11 +656,11 @@ export default {
|
|||||||
if (this.isMonthView) {
|
if (this.isMonthView) {
|
||||||
// Save out of scope events into the view object separated from the array of in-scope events.
|
// Save out of scope events into the view object separated from the array of in-scope events.
|
||||||
this.view.outOfScopeEvents = []
|
this.view.outOfScopeEvents = []
|
||||||
events.forEach(e => {
|
events.forEach((e) => {
|
||||||
if (ue.eventInRange(e, firstCellDate, startDate) || ue.eventInRange(e, endDate, lastCellDate)) {
|
if (ue.eventInRange(e, firstCellDate, startDate) || ue.eventInRange(e, endDate, lastCellDate)) {
|
||||||
// Only add events to the view.outOfScopeEvents array if not already in view.events
|
// Only add events to the view.outOfScopeEvents array if not already in view.events
|
||||||
// (multiple-day events case).
|
// (multiple-day events case).
|
||||||
if (!this.view.events.some(e2 => e2._eid === e._eid)) this.view.outOfScopeEvents.push(e)
|
if (!this.view.events.some((e2) => e2._eid === e._eid)) this.view.outOfScopeEvents.push(e)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -687,7 +704,6 @@ export default {
|
|||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
if (resizeAnEvent._eid) this.eventResizing(e)
|
if (resizeAnEvent._eid) this.eventResizing(e)
|
||||||
|
|
||||||
else if (this.dragToCreateEvent && dragCreateAnEvent.start) this.eventDragCreation(e)
|
else if (this.dragToCreateEvent && dragCreateAnEvent.start) this.eventDragCreation(e)
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -700,13 +716,7 @@ export default {
|
|||||||
* @param {Object} e the native DOM event object.
|
* @param {Object} e the native DOM event object.
|
||||||
*/
|
*/
|
||||||
onMouseUp(e) {
|
onMouseUp(e) {
|
||||||
const {
|
const { focusAnEvent, resizeAnEvent, clickHoldAnEvent, clickHoldACell, dragCreateAnEvent } = this.domEvents
|
||||||
focusAnEvent,
|
|
||||||
resizeAnEvent,
|
|
||||||
clickHoldAnEvent,
|
|
||||||
clickHoldACell,
|
|
||||||
dragCreateAnEvent
|
|
||||||
} = this.domEvents
|
|
||||||
const { _eid: isClickHoldingEvent } = clickHoldAnEvent
|
const { _eid: isClickHoldingEvent } = clickHoldAnEvent
|
||||||
const { _eid: wasResizing } = resizeAnEvent
|
const { _eid: wasResizing } = resizeAnEvent
|
||||||
let hasResized = false
|
let hasResized = false
|
||||||
@@ -723,7 +733,7 @@ export default {
|
|||||||
// On event resize end, emit event if duration has changed.
|
// On event resize end, emit event if duration has changed.
|
||||||
if (wasResizing) {
|
if (wasResizing) {
|
||||||
const { originalEnd, originalEndTimeMinutes, endTimeMinutes } = resizeAnEvent
|
const { originalEnd, originalEndTimeMinutes, endTimeMinutes } = resizeAnEvent
|
||||||
const event = this.view.events.find(e => e._eid === resizeAnEvent._eid)
|
const event = this.view.events.find((e) => e._eid === resizeAnEvent._eid)
|
||||||
// If end time is different than original, consider as resized.
|
// If end time is different than original, consider as resized.
|
||||||
hasResized = endTimeMinutes && endTimeMinutes !== originalEndTimeMinutes
|
hasResized = endTimeMinutes && endTimeMinutes !== originalEndTimeMinutes
|
||||||
|
|
||||||
@@ -731,7 +741,7 @@ export default {
|
|||||||
// So compare timestamps instead of only endTimeMinutes.
|
// So compare timestamps instead of only endTimeMinutes.
|
||||||
if (event && event.end.getTime() !== originalEnd.getTime()) {
|
if (event && event.end.getTime() !== originalEnd.getTime()) {
|
||||||
// Update the modified event in the mutable events array.
|
// Update the modified event in the mutable events array.
|
||||||
const mutableEvent = this.mutableEvents.find(e => e._eid === resizeAnEvent._eid)
|
const mutableEvent = this.mutableEvents.find((e) => e._eid === resizeAnEvent._eid)
|
||||||
mutableEvent.endTimeMinutes = event.endTimeMinutes
|
mutableEvent.endTimeMinutes = event.endTimeMinutes
|
||||||
mutableEvent.end = event.end
|
mutableEvent.end = event.end
|
||||||
|
|
||||||
@@ -741,7 +751,11 @@ export default {
|
|||||||
end: originalEnd,
|
end: originalEnd,
|
||||||
endTimeMinutes: event.originalEndTimeMinutes
|
endTimeMinutes: event.originalEndTimeMinutes
|
||||||
}
|
}
|
||||||
this.$emit('event-duration-change', { event: cleanEvent, oldDate: resizeAnEvent.originalEnd, originalEvent })
|
this.$emit('event-duration-change', {
|
||||||
|
event: cleanEvent,
|
||||||
|
oldDate: resizeAnEvent.originalEnd,
|
||||||
|
originalEvent
|
||||||
|
})
|
||||||
this.$emit('event-change', { event: cleanEvent, originalEvent })
|
this.$emit('event-change', { event: cleanEvent, originalEvent })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -755,9 +769,7 @@ export default {
|
|||||||
resizeAnEvent.endTimeMinutes = null
|
resizeAnEvent.endTimeMinutes = null
|
||||||
resizeAnEvent.startCell = null
|
resizeAnEvent.startCell = null
|
||||||
resizeAnEvent.endCell = null
|
resizeAnEvent.endCell = null
|
||||||
}
|
} else if (dragCreateStarted) {
|
||||||
|
|
||||||
else if (dragCreateStarted) {
|
|
||||||
// The drag create might be started but not completed due to threshold never reached.
|
// The drag create might be started but not completed due to threshold never reached.
|
||||||
if (dragCreatedEvent) {
|
if (dragCreatedEvent) {
|
||||||
this.emitWithEvent('event-drag-create', dragCreatedEvent)
|
this.emitWithEvent('event-drag-create', dragCreatedEvent)
|
||||||
@@ -790,9 +802,9 @@ export default {
|
|||||||
// and if not dragging handle or deleting event.
|
// and if not dragging handle or deleting event.
|
||||||
const eventClickHandler = typeof this.onEventClick === 'function'
|
const eventClickHandler = typeof this.onEventClick === 'function'
|
||||||
if (eventClicked && !hasResized && !isClickHoldingEvent && !dragCreatedEvent && eventClickHandler) {
|
if (eventClicked && !hasResized && !isClickHoldingEvent && !dragCreatedEvent && eventClickHandler) {
|
||||||
let event = this.view.events.find(e => e._eid === focusAnEvent._eid)
|
let event = this.view.events.find((e) => e._eid === focusAnEvent._eid)
|
||||||
// If not found, the event may be in the outOfScope array.
|
// If not found, the event may be in the outOfScope array.
|
||||||
if (!event && this.isMonthView) event = this.view.outOfScopeEvents.find(e => e._eid === focusAnEvent._eid)
|
if (!event && this.isMonthView) event = this.view.outOfScopeEvents.find((e) => e._eid === focusAnEvent._eid)
|
||||||
|
|
||||||
return event && this.onEventClick(event, e)
|
return event && this.onEventClick(event, e)
|
||||||
}
|
}
|
||||||
@@ -814,7 +826,9 @@ export default {
|
|||||||
*/
|
*/
|
||||||
eventResizing(e) {
|
eventResizing(e) {
|
||||||
const { resizeAnEvent } = this.domEvents
|
const { resizeAnEvent } = this.domEvents
|
||||||
const event = this.view.events.find(e => e._eid === resizeAnEvent._eid) || { segments: {} }
|
const event = this.view.events.find((e) => e._eid === resizeAnEvent._eid) || {
|
||||||
|
segments: {}
|
||||||
|
}
|
||||||
const { minutes, cursorCoords } = this.minutesAtCursor(e)
|
const { minutes, cursorCoords } = this.minutesAtCursor(e)
|
||||||
const segment = event.segments && event.segments[resizeAnEvent.segment]
|
const segment = event.segments && event.segments[resizeAnEvent.segment]
|
||||||
|
|
||||||
@@ -828,7 +842,7 @@ export default {
|
|||||||
|
|
||||||
// On resize, snap to time (e.g. 0, 15, 30, 45) if the option is on.
|
// On resize, snap to time (e.g. 0, 15, 30, 45) if the option is on.
|
||||||
if (this.snapToTime) {
|
if (this.snapToTime) {
|
||||||
const plusHalfSnapTime = (event.endTimeMinutes + this.snapToTime / 2)
|
const plusHalfSnapTime = event.endTimeMinutes + this.snapToTime / 2
|
||||||
event.endTimeMinutes = plusHalfSnapTime - (plusHalfSnapTime % this.snapToTime)
|
event.endTimeMinutes = plusHalfSnapTime - (plusHalfSnapTime % this.snapToTime)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -864,7 +878,11 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emit event while resizing, so it has to be fast.
|
// Emit event while resizing, so it has to be fast.
|
||||||
this.$emit('event-resizing', { _eid: event._eid, end: event.end, endTimeMinutes: event.endTimeMinutes })
|
this.$emit('event-resizing', {
|
||||||
|
_eid: event._eid,
|
||||||
|
end: event.end,
|
||||||
|
endTimeMinutes: event.endTimeMinutes
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -876,7 +894,10 @@ export default {
|
|||||||
const { dragCreateAnEvent } = this.domEvents
|
const { dragCreateAnEvent } = this.domEvents
|
||||||
const { start, startCursorY, split } = dragCreateAnEvent
|
const { start, startCursorY, split } = dragCreateAnEvent
|
||||||
const timeAtCursor = new Date(start)
|
const timeAtCursor = new Date(start)
|
||||||
const { minutes, cursorCoords: { y } } = this.minutesAtCursor(e)
|
const {
|
||||||
|
minutes,
|
||||||
|
cursorCoords: { y }
|
||||||
|
} = this.minutesAtCursor(e)
|
||||||
|
|
||||||
// Don't show anything until the threshold is reached.
|
// Don't show anything until the threshold is reached.
|
||||||
if (!dragCreateAnEvent.event && Math.abs(startCursorY - y) < this.dragToCreateThreshold) return
|
if (!dragCreateAnEvent.event && Math.abs(startCursorY - y) < this.dragToCreateThreshold) return
|
||||||
@@ -927,7 +948,7 @@ export default {
|
|||||||
*/
|
*/
|
||||||
unfocusEvent() {
|
unfocusEvent() {
|
||||||
const { focusAnEvent, clickHoldAnEvent } = this.domEvents
|
const { focusAnEvent, clickHoldAnEvent } = this.domEvents
|
||||||
const event = this.view.events.find(e => e._eid === (focusAnEvent._eid || clickHoldAnEvent._eid))
|
const event = this.view.events.find((e) => e._eid === (focusAnEvent._eid || clickHoldAnEvent._eid))
|
||||||
focusAnEvent._eid = null // Cancel event focus.
|
focusAnEvent._eid = null // Cancel event focus.
|
||||||
clickHoldAnEvent._eid = null // Hide delete button.
|
clickHoldAnEvent._eid = null // Hide delete button.
|
||||||
|
|
||||||
@@ -943,7 +964,7 @@ export default {
|
|||||||
cancelDelete() {
|
cancelDelete() {
|
||||||
const { clickHoldAnEvent } = this.domEvents
|
const { clickHoldAnEvent } = this.domEvents
|
||||||
if (clickHoldAnEvent._eid) {
|
if (clickHoldAnEvent._eid) {
|
||||||
const event = this.view.events.find(e => e._eid === clickHoldAnEvent._eid)
|
const event = this.view.events.find((e) => e._eid === clickHoldAnEvent._eid)
|
||||||
if (event) event.deleting = false
|
if (event) event.deleting = false
|
||||||
|
|
||||||
clickHoldAnEvent._eid = null
|
clickHoldAnEvent._eid = null
|
||||||
@@ -967,7 +988,10 @@ export default {
|
|||||||
const cleanEvent = this.cleanupEvent(event)
|
const cleanEvent = this.cleanupEvent(event)
|
||||||
|
|
||||||
this.$emit('event-title-change', { event: cleanEvent, oldTitle })
|
this.$emit('event-title-change', { event: cleanEvent, oldTitle })
|
||||||
this.$emit('event-change', { event: cleanEvent, originalEvent: { ...cleanEvent, title: oldTitle } })
|
this.$emit('event-change', {
|
||||||
|
event: cleanEvent,
|
||||||
|
originalEvent: { ...cleanEvent, title: oldTitle }
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -986,7 +1010,7 @@ export default {
|
|||||||
// For each event of the `events` prop, prepare the event for vue-cal:
|
// For each event of the `events` prop, prepare the event for vue-cal:
|
||||||
// Populate missing keys: start, startDate, startTimeMinutes, end, endTimeMinutes, daysCount.
|
// Populate missing keys: start, startDate, startTimeMinutes, end, endTimeMinutes, daysCount.
|
||||||
// Lots of these variables may look redundant but are here for performance as a cached result of calculation. :)
|
// Lots of these variables may look redundant but are here for performance as a cached result of calculation. :)
|
||||||
this.events.forEach(event => {
|
this.events.forEach((event) => {
|
||||||
// `event.start` accepts a Date object, or a formatted string, but always convert to Date.
|
// `event.start` accepts a Date object, or a formatted string, but always convert to Date.
|
||||||
const start = typeof event.start === 'string' ? ud.stringToDate(event.start) : event.start
|
const start = typeof event.start === 'string' ? ud.stringToDate(event.start) : event.start
|
||||||
const startDateF = ud.formatDateLite(start)
|
const startDateF = ud.formatDateLite(start)
|
||||||
@@ -998,8 +1022,7 @@ export default {
|
|||||||
if (typeof event.end === 'string' && event.end.includes('24:00')) {
|
if (typeof event.end === 'string' && event.end.includes('24:00')) {
|
||||||
end = new Date(event.end.replace(' 24:00', ''))
|
end = new Date(event.end.replace(' 24:00', ''))
|
||||||
end.setHours(23, 59, 59, 0) // Sets to the same day at 23.59.59.
|
end.setHours(23, 59, 59, 0) // Sets to the same day at 23.59.59.
|
||||||
}
|
} else end = typeof event.end === 'string' ? ud.stringToDate(event.end) : event.end
|
||||||
else end = typeof event.end === 'string' ? ud.stringToDate(event.end) : event.end
|
|
||||||
let endDateF = ud.formatDateLite(end)
|
let endDateF = ud.formatDateLite(end)
|
||||||
let endTimeMinutes = ud.dateToMinutes(end)
|
let endTimeMinutes = ud.dateToMinutes(end)
|
||||||
|
|
||||||
@@ -1008,8 +1031,7 @@ export default {
|
|||||||
// This also applies on timeless events, all-day events & multiple-day events.
|
// This also applies on timeless events, all-day events & multiple-day events.
|
||||||
if (!this.time || (typeof event.end === 'string' && event.end.length === 10)) {
|
if (!this.time || (typeof event.end === 'string' && event.end.length === 10)) {
|
||||||
end.setHours(23, 59, 59, 0) // Sets to the same day at 23.59.59.
|
end.setHours(23, 59, 59, 0) // Sets to the same day at 23.59.59.
|
||||||
}
|
} else end.setSeconds(end.getSeconds() - 1) // Sets to the previous day at 23.59.59.
|
||||||
else end.setSeconds(end.getSeconds() - 1) // Sets to the previous day at 23.59.59.
|
|
||||||
endDateF = ud.formatDateLite(end)
|
endDateF = ud.formatDateLite(end)
|
||||||
endTimeMinutes = minutesInADay
|
endTimeMinutes = minutesInADay
|
||||||
}
|
}
|
||||||
@@ -1067,11 +1089,10 @@ export default {
|
|||||||
|
|
||||||
// Delete vue-cal specific props instead of returning a set of props so user
|
// Delete vue-cal specific props instead of returning a set of props so user
|
||||||
// can place whatever they want inside an event and see it returned.
|
// can place whatever they want inside an event and see it returned.
|
||||||
const discardProps = [
|
const discardProps = ['segments', 'deletable', 'deleting', 'titleEditable', 'resizable', 'resizing', 'draggable', 'dragging', 'draggingStatic', 'focused']
|
||||||
'segments', 'deletable', 'deleting', 'titleEditable', 'resizable', 'resizing',
|
discardProps.forEach((prop) => {
|
||||||
'draggable', 'dragging', 'draggingStatic', 'focused'
|
if (prop in event) delete event[prop]
|
||||||
]
|
})
|
||||||
discardProps.forEach(prop => { if (prop in event) delete event[prop] })
|
|
||||||
|
|
||||||
if (!event.repeat) delete event.repeat // If empty we don't need it.
|
if (!event.repeat) delete event.repeat // If empty we don't need it.
|
||||||
|
|
||||||
@@ -1138,8 +1159,7 @@ export default {
|
|||||||
|
|
||||||
if (currentWeekNumber > 52) {
|
if (currentWeekNumber > 52) {
|
||||||
return ud.getWeek(ud.addDays(this.view.firstCellDate, 7 * weekFromFirstCell + modifier))
|
return ud.getWeek(ud.addDays(this.view.firstCellDate, 7 * weekFromFirstCell + modifier))
|
||||||
}
|
} else return currentWeekNumber
|
||||||
else return currentWeekNumber
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1196,7 +1216,7 @@ export default {
|
|||||||
* @return {Boolean} true if there are events, false otherwise.
|
* @return {Boolean} true if there are events, false otherwise.
|
||||||
*/
|
*/
|
||||||
cellOrSplitHasEvents(events, split = null) {
|
cellOrSplitHasEvents(events, split = null) {
|
||||||
return events.length && ((!split && events.length) || (split && events.some(e => e.split === split.id)))
|
return events.length && ((!split && events.length) || (split && events.some((e) => e.split === split.id)))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1237,7 +1257,9 @@ export default {
|
|||||||
window.addEventListener(hasTouch ? 'touchend' : 'mouseup', this.onMouseUp)
|
window.addEventListener(hasTouch ? 'touchend' : 'mouseup', this.onMouseUp)
|
||||||
}
|
}
|
||||||
if (resize || drag || (create && this.dragToCreateEvent)) {
|
if (resize || drag || (create && this.dragToCreateEvent)) {
|
||||||
window.addEventListener(hasTouch ? 'touchmove' : 'mousemove', this.onMouseMove, { passive: false })
|
window.addEventListener(hasTouch ? 'touchmove' : 'mousemove', this.onMouseMove, {
|
||||||
|
passive: false
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (title) window.addEventListener('keyup', this.onKeyUp)
|
if (title) window.addEventListener('keyup', this.onKeyUp)
|
||||||
@@ -1261,7 +1283,11 @@ export default {
|
|||||||
endDate: this.view.endDate,
|
endDate: this.view.endDate,
|
||||||
...(this.isMonthView ? { firstCellDate: this.view.firstCellDate, lastCellDate: this.view.lastCellDate } : {}),
|
...(this.isMonthView ? { firstCellDate: this.view.firstCellDate, lastCellDate: this.view.lastCellDate } : {}),
|
||||||
events: this.view.events.map(this.cleanupEvent),
|
events: this.view.events.map(this.cleanupEvent),
|
||||||
...(this.isWeekView ? { week: ud.getWeek(this.startWeekOnSunday ? ud.addDays(startDate, 1) : startDate) } : {})
|
...(this.isWeekView
|
||||||
|
? {
|
||||||
|
week: ud.getWeek(this.startWeekOnSunday ? ud.addDays(startDate, 1) : startDate)
|
||||||
|
}
|
||||||
|
: {})
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$emit('ready', params)
|
this.$emit('ready', params)
|
||||||
@@ -1270,7 +1296,9 @@ export default {
|
|||||||
|
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
const hasTouch = 'ontouchstart' in window
|
const hasTouch = 'ontouchstart' in window
|
||||||
window.removeEventListener(hasTouch ? 'touchmove' : 'mousemove', this.onMouseMove, { passive: false })
|
window.removeEventListener(hasTouch ? 'touchmove' : 'mousemove', this.onMouseMove, {
|
||||||
|
passive: false
|
||||||
|
})
|
||||||
window.removeEventListener(hasTouch ? 'touchend' : 'mouseup', this.onMouseUp)
|
window.removeEventListener(hasTouch ? 'touchend' : 'mouseup', this.onMouseUp)
|
||||||
window.removeEventListener('keyup', this.onKeyUp)
|
window.removeEventListener('keyup', this.onKeyUp)
|
||||||
|
|
||||||
@@ -1313,7 +1341,7 @@ export default {
|
|||||||
return this.validateView(this.activeView)
|
return this.validateView(this.activeView)
|
||||||
},
|
},
|
||||||
enabledViews() {
|
enabledViews() {
|
||||||
return Object.keys(this.views).filter(view => this.views[view].enabled)
|
return Object.keys(this.views).filter((view) => this.views[view].enabled)
|
||||||
},
|
},
|
||||||
hasTimeColumn() {
|
hasTimeColumn() {
|
||||||
return this.time && this.isWeekOrDayView
|
return this.time && this.isWeekOrDayView
|
||||||
@@ -1345,10 +1373,10 @@ export default {
|
|||||||
},
|
},
|
||||||
// Filter out the day splits that are hidden.
|
// Filter out the day splits that are hidden.
|
||||||
daySplits() {
|
daySplits() {
|
||||||
return (
|
return (this.splitDays.filter((item) => !item.hide) || []).map((item, i) => ({
|
||||||
(this.splitDays.filter(item => !item.hide) || [])
|
...item,
|
||||||
.map((item, i) => ({ ...item, id: item.id || (i + 1) })) // Make sure there's always an id.
|
id: item.id || i + 1
|
||||||
)
|
})) // Make sure there's always an id.
|
||||||
},
|
},
|
||||||
// Whether the current view has days splits.
|
// Whether the current view has days splits.
|
||||||
hasSplits() {
|
hasSplits() {
|
||||||
@@ -1409,16 +1437,19 @@ export default {
|
|||||||
return (
|
return (
|
||||||
this.isMonthView ||
|
this.isMonthView ||
|
||||||
// hasSplits check is important here in case the user toggles the splits but keep minSplitWidth.
|
// hasSplits check is important here in case the user toggles the splits but keep minSplitWidth.
|
||||||
(this.isWeekView && !this.minCellWidth && !(this.hasSplits && this.minSplitWidth)))
|
(this.isWeekView && !this.minCellWidth && !(this.hasSplits && this.minSplitWidth))
|
||||||
|
)
|
||||||
},
|
},
|
||||||
months() {
|
months() {
|
||||||
return this.texts.months.map(month => ({ label: month }))
|
return this.texts.months.map((month) => ({ label: month }))
|
||||||
},
|
},
|
||||||
// Validate and fill up the special hours object once for all at root level and not in cell.
|
// Validate and fill up the special hours object once for all at root level and not in cell.
|
||||||
specialDayHours() {
|
specialDayHours() {
|
||||||
if (!this.specialHours || !Object.keys(this.specialHours).length) return {}
|
if (!this.specialHours || !Object.keys(this.specialHours).length) return {}
|
||||||
|
|
||||||
return Array(7).fill('').map((cell, i) => {
|
return Array(7)
|
||||||
|
.fill('')
|
||||||
|
.map((cell, i) => {
|
||||||
let day = this.specialHours[i + 1] || []
|
let day = this.specialHours[i + 1] || []
|
||||||
if (!Array.isArray(day)) day = [day]
|
if (!Array.isArray(day)) day = [day]
|
||||||
cell = []
|
cell = []
|
||||||
@@ -1557,11 +1588,10 @@ export default {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (this.hideWeekends || this.hideWeekdays.length) {
|
if (this.hideWeekends || this.hideWeekdays.length) {
|
||||||
cells = cells.filter(cell => {
|
cells = cells.filter((cell) => {
|
||||||
const day = cell.startDate.getDay() || 7 // Put Sunday at position 7 instead of 0.
|
const day = cell.startDate.getDay() || 7 // Put Sunday at position 7 instead of 0.
|
||||||
|
|
||||||
return !((this.hideWeekends && day >= 6) ||
|
return !((this.hideWeekends && day >= 6) || (this.hideWeekdays.length && this.hideWeekdays.includes(day)))
|
||||||
(this.hideWeekdays.length && this.hideWeekdays.includes(day)))
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
@@ -1571,7 +1601,8 @@ export default {
|
|||||||
const firstDayOfWeek = this.view.startDate
|
const firstDayOfWeek = this.view.startDate
|
||||||
const weekDays = this.weekDays
|
const weekDays = this.weekDays
|
||||||
|
|
||||||
cells = weekDays.map((cell, i) => {
|
cells = weekDays
|
||||||
|
.map((cell, i) => {
|
||||||
const startDate = ud.addDays(firstDayOfWeek, this.startWeekOnSunday ? i - 1 : i)
|
const startDate = ud.addDays(firstDayOfWeek, this.startWeekOnSunday ? i - 1 : i)
|
||||||
const endDate = new Date(startDate)
|
const endDate = new Date(startDate)
|
||||||
endDate.setHours(23, 59, 59, 0) // End at 23:59:59.
|
endDate.setHours(23, 59, 59, 0) // End at 23:59:59.
|
||||||
@@ -1585,7 +1616,8 @@ export default {
|
|||||||
today: !todayFound && ud.isToday(startDate) && !todayFound++,
|
today: !todayFound && ud.isToday(startDate) && !todayFound++,
|
||||||
specialHours: this.specialDayHours[dayOfWeek] || []
|
specialHours: this.specialDayHours[dayOfWeek] || []
|
||||||
}
|
}
|
||||||
}).filter((cell, i) => !weekDays[i].hide)
|
})
|
||||||
|
.filter((cell, i) => !weekDays[i].hide)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
case 'day': {
|
case 'day': {
|
||||||
@@ -1594,13 +1626,15 @@ export default {
|
|||||||
endDate.setHours(23, 59, 59, 0) // End at 23:59:59.
|
endDate.setHours(23, 59, 59, 0) // End at 23:59:59.
|
||||||
const dayOfWeek = (startDate.getDay() || 7) - 1 // Day of the week from 0 to 6 with 6 = Sunday.
|
const dayOfWeek = (startDate.getDay() || 7) - 1 // Day of the week from 0 to 6 with 6 = Sunday.
|
||||||
|
|
||||||
cells = [{
|
cells = [
|
||||||
|
{
|
||||||
startDate,
|
startDate,
|
||||||
formattedDate: ud.formatDateLite(startDate),
|
formattedDate: ud.formatDateLite(startDate),
|
||||||
endDate,
|
endDate,
|
||||||
today: ud.isToday(startDate),
|
today: ud.isToday(startDate),
|
||||||
specialHours: this.specialDayHours[dayOfWeek] || []
|
specialHours: this.specialDayHours[dayOfWeek] || []
|
||||||
}]
|
}
|
||||||
|
]
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<A-task-filter @weekChange="getWeekData" />
|
<A-task-filter @weekChange="getWeekData" />
|
||||||
|
|
||||||
<W-loadable :content="timelineData" class="w-loadable" empty-message="Nepodarilo sa nacitat data!">
|
<W-loadable :content="timelineData" class="w-loadable" empty-message="Nepodarilo sa nacitat data!">
|
||||||
<Z-timeline :calData="timelineData" :calConfig="config" @eventMoved="onEventMoved" />
|
<Z-timeline :calData="timelineData" :calConfig="config" @eventMoved="onEventMoved" />
|
||||||
</W-loadable>
|
</W-loadable>
|
||||||
|
|||||||
Reference in new issue
Block a user