Added update logic for single day events
This commit is contained in:
@@ -2,14 +2,17 @@
|
|||||||
import { cn } from "@/lib/utils"
|
import { cn } from "@/lib/utils"
|
||||||
import type { RPGDate } from "@@/models/Date"
|
import type { RPGDate } from "@@/models/Date"
|
||||||
import type { CalendarEvent } from "@@/models/CalendarEvent"
|
import type { CalendarEvent } from "@@/models/CalendarEvent"
|
||||||
|
import { ja } from "zod/v4/locales";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
event: CalendarEvent
|
event: CalendarEvent
|
||||||
tileDate: RPGDate
|
tileDate: RPGDate
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const { areDatesIdentical, revealEditEventModal, revealDeleteEventModal } = useCalendar()
|
const buttonRef = useTemplateRef<HTMLButtonElement>('buttonRef')
|
||||||
const { lastActiveEvent } = storeToRefs(useCalendar())
|
|
||||||
|
const { areDatesIdentical, revealEditEventModal, revealDeleteEventModal, resetSkeleton } = useCalendar()
|
||||||
|
const { lastActiveEvent, eventSkeleton, isDraggingEvent } = storeToRefs(useCalendar())
|
||||||
|
|
||||||
const spansMultipleDays = computed(() => Boolean(props.event.startDate && props.event.endDate))
|
const spansMultipleDays = computed(() => Boolean(props.event.startDate && props.event.endDate))
|
||||||
const isStartEvent = computed(() => spansMultipleDays.value && areDatesIdentical(props.tileDate, props.event.startDate))
|
const isStartEvent = computed(() => spansMultipleDays.value && areDatesIdentical(props.tileDate, props.event.startDate))
|
||||||
@@ -49,13 +52,29 @@ onMounted(() => {
|
|||||||
handleDelete()
|
handleDelete()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Draggable logic
|
||||||
|
const isTileDragging = shallowRef(false)
|
||||||
|
|
||||||
|
function handleDragStart() {
|
||||||
|
isTileDragging.value = true
|
||||||
|
isDraggingEvent.value = true
|
||||||
|
eventSkeleton.value = structuredClone(toRaw(props.event))
|
||||||
|
handleClosePopover()
|
||||||
|
}
|
||||||
|
function handleDragEnd() {
|
||||||
|
isTileDragging.value = false
|
||||||
|
isDraggingEvent.value = false
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<UiPopover v-model:open="isPopoverDetailsOpen">
|
<UiPopover v-model:open="isPopoverDetailsOpen">
|
||||||
<UiPopoverTrigger as-child>
|
<UiPopoverTrigger as-child>
|
||||||
<button
|
<button
|
||||||
class="event-button text-2xs md:text-xs px-[5px] py-[5px] md:px-2 md:py-1 block w-full text-left rounded-sm transition-colors outline-offset-1 cursor-pointer"
|
ref="buttonRef"
|
||||||
|
class="event-button text-2xs md:text-xs px-[5px] py-[5px] md:px-2 md:py-1 block w-full text-left rounded-sm transition-opacity outline-offset-1 cursor-pointer"
|
||||||
|
:draggable="event.endDate ? 'false' : 'true'"
|
||||||
:class="
|
:class="
|
||||||
cn(
|
cn(
|
||||||
`element-${event.category?.color}`,
|
`element-${event.category?.color}`,
|
||||||
@@ -63,11 +82,17 @@ onMounted(() => {
|
|||||||
'is-hidden': event.hidden,
|
'is-hidden': event.hidden,
|
||||||
'rounded-r-none': isStartEvent,
|
'rounded-r-none': isStartEvent,
|
||||||
'rounded-l-none': isEndEvent,
|
'rounded-l-none': isEndEvent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'opacity-60': isTileDragging,
|
||||||
|
'opacity-100': !isTileDragging
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
@dblclick="handleDoubleClick"
|
@dblclick="handleDoubleClick"
|
||||||
@keydown.delete="handleDelete"
|
@keydown.delete="handleDelete"
|
||||||
|
@dragstart="handleDragStart"
|
||||||
|
@dragend="handleDragEnd"
|
||||||
>
|
>
|
||||||
<div class="line-clamp-2 [overflow-wrap:anywhere] hyphens-auto">
|
<div class="line-clamp-2 [overflow-wrap:anywhere] hyphens-auto">
|
||||||
{{ eventTitle }}
|
{{ eventTitle }}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import { storeToRefs } from "pinia"
|
|||||||
import { computed, ref, type ComputedRef } from "vue"
|
import { computed, ref, type ComputedRef } from "vue"
|
||||||
|
|
||||||
import CalendarEventButton from "../../event/Event.vue"
|
import CalendarEventButton from "../../event/Event.vue"
|
||||||
|
import { useToast } from "@/components/ui/toast"
|
||||||
|
import type { APIError } from "@@/models/Errors"
|
||||||
|
import { ToastLifetime } from "@/components/ui/toast/use-toast"
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
date: RPGDate
|
date: RPGDate
|
||||||
@@ -16,11 +19,14 @@ const emit = defineEmits<{
|
|||||||
"on-open-create-dialog": [date: RPGDate]
|
"on-open-create-dialog": [date: RPGDate]
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
const { toast } = useToast()
|
||||||
|
const { t } = useI18n()
|
||||||
|
|
||||||
const calendarTile = ref()
|
const calendarTile = ref()
|
||||||
const calendarEventsList = ref()
|
const calendarEventsList = ref()
|
||||||
|
|
||||||
const { defaultDate, selectDate, areDatesIdentical, getFormattedDateTitle } = useCalendar()
|
const { defaultDate, selectDate, areDatesIdentical, getFormattedDateTitle, updateEventFromSkeleton, resetSkeleton } = useCalendar()
|
||||||
const { selectedDate, currentEvents, isReadOnly } = storeToRefs(useCalendar())
|
const { selectedDate, currentEvents, isReadOnly, eventSkeleton, isDraggingEvent } = storeToRefs(useCalendar())
|
||||||
|
|
||||||
const breakpoints = useBreakpoints(
|
const breakpoints = useBreakpoints(
|
||||||
breakpointsTailwind
|
breakpointsTailwind
|
||||||
@@ -60,7 +66,13 @@ const { top: tileListTop } = useElementBounding(calendarEventsList)
|
|||||||
const numberOfEventsToFit: ComputedRef<number> = computed(() => {
|
const numberOfEventsToFit: ComputedRef<number> = computed(() => {
|
||||||
if (!eventsForTheDay.value.length) return 0
|
if (!eventsForTheDay.value.length) return 0
|
||||||
|
|
||||||
return Math.trunc((tileHeight.value - (tileListTop.value - tileTop.value)) / 40)
|
let offset = 0
|
||||||
|
|
||||||
|
if (isDraggingEvent.value && !tileNotHovered.value) {
|
||||||
|
offset = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.trunc((tileHeight.value - (tileListTop.value - tileTop.value)) / 40) - offset
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,16 +88,61 @@ const eventsToDisplay: ComputedRef<CalendarEvent[]> = computed<CalendarEvent[]>(
|
|||||||
* Used if not all events can be seen in the tile's space
|
* Used if not all events can be seen in the tile's space
|
||||||
*/
|
*/
|
||||||
const eventsNotDisplayed: ComputedRef<number> = computed<number>(() => eventsForTheDay.value.length - eventsToDisplay.value.length)
|
const eventsNotDisplayed: ComputedRef<number> = computed<number>(() => eventsForTheDay.value.length - eventsToDisplay.value.length)
|
||||||
|
|
||||||
|
// Handle drop events
|
||||||
|
const { isOutside: tileNotHovered } = useMouseInElement(calendarTile)
|
||||||
|
const isLoading = ref(false)
|
||||||
|
|
||||||
|
async function handleTileDrop() {
|
||||||
|
if (isLoading.value) return
|
||||||
|
|
||||||
|
isLoading.value = true
|
||||||
|
|
||||||
|
eventSkeleton.value.startDate = props.date
|
||||||
|
|
||||||
|
const { error } = await tryCatch(updateEventFromSkeleton())
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
const apiError = (error as any).data as APIError
|
||||||
|
|
||||||
|
apiError.data.errors.forEach((error) => {
|
||||||
|
toast({
|
||||||
|
title: t("entity.calendar.event.editErrors.toastTitle"),
|
||||||
|
variant: "destructive",
|
||||||
|
description: t(`entity.calendar.event.editErrors.${error.path[1]}_${error.code}`),
|
||||||
|
duration: ToastLifetime.MEDIUM,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
isLoading.value = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(eventSkeleton.value)
|
||||||
|
|
||||||
|
toast({
|
||||||
|
title: t("entity.calendar.event.updatedToast.title", { event: eventSkeleton.value.title }),
|
||||||
|
variant: "success",
|
||||||
|
duration: ToastLifetime.SHORT
|
||||||
|
})
|
||||||
|
|
||||||
|
isLoading.value = false
|
||||||
|
resetSkeleton()
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
ref="calendarTile"
|
ref="calendarTile"
|
||||||
class="tile relative p-1 md:p-2 transition-all"
|
class="tile relative p-1 md:p-2 md:pt-1 transition-all"
|
||||||
:class="{
|
:class="{
|
||||||
'text-slate-300 dark:text-slate-500': props.faded,
|
'text-slate-300 dark:text-slate-500': props.faded,
|
||||||
'text-slate-500 dark:text-slate-300': !props.faded
|
'text-slate-500 dark:text-slate-300': !props.faded
|
||||||
}"
|
}"
|
||||||
|
@drop.prevent="handleTileDrop"
|
||||||
|
@dragenter.prevent
|
||||||
|
@dragover.prevent
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="relative z-10 group block w-full text-2xs md:text-xs text-center cursor-pointer"
|
class="relative z-10 group block w-full text-2xs md:text-xs text-center cursor-pointer"
|
||||||
@@ -107,13 +164,25 @@ const eventsNotDisplayed: ComputedRef<number> = computed<number>(() => eventsFo
|
|||||||
<ClientOnly>
|
<ClientOnly>
|
||||||
<ul
|
<ul
|
||||||
ref="calendarEventsList"
|
ref="calendarEventsList"
|
||||||
class="absolute top-9 md:top-12 bottom-1 md:bottom-2 inset-x-2 grid auto-rows-min gap-1 z-10 pointer-events-none transition-opacity"
|
class="absolute top-8 md:top-10 bottom-1 md:bottom-2 inset-x-2 grid auto-rows-min gap-1 z-10 pointer-events-none transition-opacity"
|
||||||
:class="{
|
:class="{
|
||||||
'opacity-40': props.faded && !isSelectedDate
|
'opacity-40': props.faded && !isSelectedDate
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<TransitionGroup name="event">
|
<li
|
||||||
<li v-for="event in eventsToDisplay" :key="event.id" class="grid w-full pointer-events-auto">
|
v-if="!tileNotHovered && isDraggingEvent && !(eventsForTheDay.find((e) => e.id === eventSkeleton.id))"
|
||||||
|
:key="eventSkeleton.id"
|
||||||
|
class="opacity-60"
|
||||||
|
>
|
||||||
|
<CalendarEventButton :event="eventSkeleton" :tile-date="date" />
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<TransitionGroup :name="!isDraggingEvent ? 'event' : ''">
|
||||||
|
<li
|
||||||
|
v-for="(event, i) in eventsToDisplay"
|
||||||
|
:key="event.id"
|
||||||
|
class="grid w-full pointer-events-auto"
|
||||||
|
>
|
||||||
<CalendarEventButton :event :tile-date="date" />
|
<CalendarEventButton :event :tile-date="date" />
|
||||||
</li>
|
</li>
|
||||||
</TransitionGroup>
|
</TransitionGroup>
|
||||||
@@ -158,6 +227,7 @@ const eventsNotDisplayed: ComputedRef<number> = computed<number>(() => eventsFo
|
|||||||
|
|
||||||
<ClientOnly>
|
<ClientOnly>
|
||||||
<LazyCalendarDialogCreateEvent v-if="!isReadOnly && breakpoints.lg.value" :date btn-class="absolute inset-0 w-full h-full cursor-default z-0" />
|
<LazyCalendarDialogCreateEvent v-if="!isReadOnly && breakpoints.lg.value" :date btn-class="absolute inset-0 w-full h-full cursor-default z-0" />
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-else-if="!isReadOnly && !breakpoints.lg.value"
|
v-else-if="!isReadOnly && !breakpoints.lg.value"
|
||||||
class="absolute inset-0 w-full h-full cursor-default z-0"
|
class="absolute inset-0 w-full h-full cursor-default z-0"
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ export const useCalendar = defineStore("calendar", () => {
|
|||||||
return Number(params.month)
|
return Number(params.month)
|
||||||
})
|
})
|
||||||
const currentMonthData = computed<CalendarMonth>(() => {
|
const currentMonthData = computed<CalendarMonth>(() => {
|
||||||
return sortedMonths.value[currentMonth.value]
|
return sortedMonths.value[currentMonth.value]!
|
||||||
})
|
})
|
||||||
// Gets the label from currentMonth index
|
// Gets the label from currentMonth index
|
||||||
const currentMonthName = computed<string>(() => getMonthName(currentMonth.value))
|
const currentMonthName = computed<string>(() => getMonthName(currentMonth.value))
|
||||||
@@ -605,7 +605,7 @@ export const useCalendar = defineStore("calendar", () => {
|
|||||||
// Else, we need to accelerate and decelerate
|
// Else, we need to accelerate and decelerate
|
||||||
else {
|
else {
|
||||||
// First, get all the remaining days in the current month
|
// First, get all the remaining days in the current month
|
||||||
const currentMonth = sortedMonths.value[datePivot.month]
|
const currentMonth = sortedMonths.value[datePivot.month]!
|
||||||
dateAcc.day = currentMonth.days - datePivot.day
|
dateAcc.day = currentMonth.days - datePivot.day
|
||||||
if (direction === "future") {
|
if (direction === "future") {
|
||||||
datePivot.month = getNextViewMonth(datePivot.month)
|
datePivot.month = getNextViewMonth(datePivot.month)
|
||||||
@@ -756,7 +756,7 @@ export const useCalendar = defineStore("calendar", () => {
|
|||||||
|
|
||||||
// Loop over all event once to convert the structure to a usable one
|
// Loop over all event once to convert the structure to a usable one
|
||||||
for (let i = 0; i < allEvents.value.length; i++) {
|
for (let i = 0; i < allEvents.value.length; i++) {
|
||||||
const e: CalendarEvent = allEvents.value[i]
|
const e: CalendarEvent = allEvents.value[i]!
|
||||||
|
|
||||||
// Estimate distance from pivot
|
// Estimate distance from pivot
|
||||||
const startDateDays: number = convertDateToDays(e.startDate)
|
const startDateDays: number = convertDateToDays(e.startDate)
|
||||||
@@ -830,6 +830,7 @@ export const useCalendar = defineStore("calendar", () => {
|
|||||||
const isCreatingEvent = ref<boolean>(false)
|
const isCreatingEvent = ref<boolean>(false)
|
||||||
const isUpdatingEvent = ref<boolean>(false)
|
const isUpdatingEvent = ref<boolean>(false)
|
||||||
const isDeletingEvent = ref<boolean>(false)
|
const isDeletingEvent = ref<boolean>(false)
|
||||||
|
const isDraggingEvent = ref<boolean>(false)
|
||||||
const operationInProgress = computed<boolean>(() => isCreatingEvent.value || isUpdatingEvent.value || isDeletingEvent.value)
|
const operationInProgress = computed<boolean>(() => isCreatingEvent.value || isUpdatingEvent.value || isDeletingEvent.value)
|
||||||
let abortController: AbortController | null = null
|
let abortController: AbortController | null = null
|
||||||
|
|
||||||
@@ -984,6 +985,7 @@ export const useCalendar = defineStore("calendar", () => {
|
|||||||
isCreatingEvent,
|
isCreatingEvent,
|
||||||
isUpdatingEvent,
|
isUpdatingEvent,
|
||||||
isDeletingEvent,
|
isDeletingEvent,
|
||||||
|
isDraggingEvent,
|
||||||
operationInProgress,
|
operationInProgress,
|
||||||
eventSkeleton,
|
eventSkeleton,
|
||||||
resetSkeleton,
|
resetSkeleton,
|
||||||
|
|||||||
Reference in New Issue
Block a user