diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json index 72e33dc..98f2a9d 100644 --- a/app/public/mock/v1/overview/tasks.GET.json +++ b/app/public/mock/v1/overview/tasks.GET.json @@ -10,8 +10,8 @@ { "id": 1, "task_id": 1, - "starts_at": "2022-12-06T09:00:00+00:00", - "ends_at": "2022-12-06T12:00:00+00:00", + "starts_at": "2022-12-06T08:30:00+00:00", + "ends_at": "2022-12-06T09:30:00+00:00", "title": "title", "project_code": "CO-2201", "master_task_color": "#121212", @@ -21,8 +21,8 @@ { "id": 2, "task_id": 2, - "starts_at": "2022-12-06T12:00:00+00:00", - "ends_at": "2022-12-06T16:00:00+00:00", + "starts_at": "2022-12-06T08:00:00+00:00", + "ends_at": "2022-12-06T10:00:00+00:00", "title": "title", "project_code": "CO-2201", "master_task_color": "#121212", @@ -32,8 +32,8 @@ { "id": 4, "task_id": null, - "starts_at": "2022-12-05T16:00:00+00:00", - "ends_at": "2022-12-06T18:00:00+00:00", + "starts_at": "2022-12-06T07:00:00+00:00", + "ends_at": "2022-12-06T11:00:00+00:00", "title": "title", "is_blocker": true, "master_task_color": null, @@ -43,21 +43,23 @@ { "id": 5, "task_id": 1, - "starts_at": "2022-12-10T09:00:00+00:00", - "ends_at": "2022-12-12T12:00:00+00:00", + "starts_at": "2022-12-07T09:00:00+00:00", + "ends_at": "2022-12-07T12:00:00+00:00", "title": "title", "project_code": "CO-2201", - "master_task_color": "#121212" + "master_task_color": "#121212", + "class": "yellow" }, { "id": 6, "task_id": 2, - "starts_at": "2022-12-10T12:00:00+00:00", - "ends_at": "2022-12-12T16:00:00+00:00", + "starts_at": "2022-12-07T12:00:00+00:00", + "ends_at": "2022-12-07T16:00:00+00:00", "title": "title", "project_code": "CO-2201", - "master_task_color": "#121212" + "master_task_color": "#121212", + "class": "green" } ] }, diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue index df8ddd5..d34b089 100644 --- a/app/src/plugins/app@vendor/vue-cal/event.vue +++ b/app/src/plugins/app@vendor/vue-cal/event.vue @@ -219,8 +219,11 @@ export default { eventStyles () { if (this.event.allDay || !this.vuecal.time || !this.event.endTimeMinutes || this.view.id === 'month' || this.allDay) return {} - let width = 100 / Math.min(this.overlaps.length + 1, this.overlapsStreak) - let left = (100 / (this.overlaps.length + 1)) * this.eventPosition + // let width = 100 / Math.min(this.overlaps.length + 1, this.overlapsStreak) + // let left = (100 - ((this.overlaps.length + 1) * 10 )) * this.eventPosition + let width = 100 - (this.eventPosition * 10) + let left = 10 * this.eventPosition / 2 + let zIdnex = (this.eventPosition + 1) * 10 if (this.vuecal.minEventWidth && width < this.vuecal.minEventWidth) { width = this.vuecal.minEventWidth @@ -230,6 +233,7 @@ export default { const { top, height } = this.eventDimensions return { + "z-index": `${zIdnex}`, top: `${top}px`, height: `${height}px`, width: `${width}%`, diff --git a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue index 0657aa2..a2340d8 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue @@ -49,7 +49,6 @@ export default { getWeek() { this.firstDay = addDays(startOfWeek(this.date), 1) this.lastDay = addDays(endOfWeek(this.date), 1) - console.log() this.$emit('weekChange', {firstDay: this.firstDay, lastDay: this.lastDay}) this.selectedDate = String(this.firstDay.toLocaleDateString('sk-SK') + ' - ' + this.lastDay.toLocaleDateString('sk-SK')) 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 7e45610..7f4216b 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -252,8 +252,9 @@ export default { img width: 18px - &:hover - z-index: 10 + // &:hover, + &:focus + z-index: 100 !important &.red background: #FFC9C9 !important diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index f89796e..dd8a702 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -75,17 +75,18 @@ export default { }, async onEventMoved(event) { - try { - await this.$axios.post_auth_data(`v1/overview/tasks/${event.event.id}`, {start: event.event.start, end: event.event.end}) - } catch(error) { - this.triggerToast("Nepodarilo sa presunut ulohu!") - this.timelineData.dates.filter(e => { - if (e.id == event.event.id) { - e.start = new Date(event.originalEvent.start) - e.end = new Date(event.originalEvent.end) - } - }) - } + console.log(event) + // try { + // await this.$axios.post_auth_data(`v1/overview/tasks/${event.event.id}`, {start: event.event.start, end: event.event.end}) + // } catch(error) { + // this.triggerToast("Nepodarilo sa presunut ulohu!") + // this.timelineData.dates.filter(e => { + // if (e.id == event.event.id) { + // e.start = new Date(event.originalEvent.start) + // e.end = new Date(event.originalEvent.end) + // } + // }) + // } } } }