From 1744a228a0c707e174aa5478add9269d267fee5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Wed, 14 Dec 2022 13:33:35 +0100 Subject: [PATCH 1/3] [Calendar] WIP event drag --- app/src/plugins/app@vendor/vue-cal/event.vue | 784 ++++++++++-------- .../tasks/_components/z-timeline.vue | 7 +- app/src/plugins/tm@dashboard/tasks/tasks.vue | 8 +- 3 files changed, 444 insertions(+), 355 deletions(-) diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue index 8b3bc71..c5d48d2 100644 --- a/app/src/plugins/app@vendor/vue-cal/event.vue +++ b/app/src/plugins/app@vendor/vue-cal/event.vue @@ -1,434 +1,522 @@ diff --git a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue index 0a660c5..a761b83 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -52,6 +52,7 @@
{{ event.project_code }}

{{ event.title }}

+

{{ event.id }}

{{ getUserInitials(event) }} @@ -233,7 +234,7 @@ export default { width: 10px - // HEADING + // HEADING .vuecal__weekdays-headings, .vuecal__cell:before border: none @@ -328,7 +329,7 @@ export default { .event-initials-wrapper margin-bottom: 0 .event-initials - margin-right: 0 + margin-right: 0 h3 font-size: 14px !important @@ -337,7 +338,7 @@ export default { white-space: nowrap overflow: hidden margin: 0 - + .event-initials-date display: none !important diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index ef2a3e1..68fd56e 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -5,9 +5,9 @@ - @@ -80,7 +80,7 @@ export default { }, async onEventMoved(event) { - console.log(event) + console.log(`ID from dragStop: ${event.event.id}`) // try { // await this.$axios.post_auth_data(`v1/overview/tasks/${event.event.id}`, {start: event.event.start, end: event.event.end}) // } catch(error) { From db7e0d82b010bb27e1fe3297f14cc512c015d184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Wed, 14 Dec 2022 13:34:13 +0100 Subject: [PATCH 2/3] [Calendar] WIP event drag --- app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue index a761b83..44ae48b 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -52,7 +52,6 @@
{{ event.project_code }}

{{ event.title }}

-

{{ event.id }}

{{ getUserInitials(event) }} From df1b881c0f449d5a151429eb2f588ddb280975de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Wed, 14 Dec 2022 13:52:10 +0100 Subject: [PATCH 3/3] [Calendar] Disappearing evnet fix --- app/src/plugins/app@vendor/vue-cal/event.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue index c5d48d2..fadd2e7 100644 --- a/app/src/plugins/app@vendor/vue-cal/event.vue +++ b/app/src/plugins/app@vendor/vue-cal/event.vue @@ -157,6 +157,7 @@ export default { onDragStart(e) { console.log(`ID from dragStart: ${this.event.id}`) + this.event.draggingStatic = false this.dnd && this.dnd.eventDragStart(e, this.event); },