From a4401bf9224b68fc08f6bf015d0c1c88d872f4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Mon, 12 Dec 2022 17:13:58 +0100 Subject: [PATCH] [Tasks calendar] Added 15min task --- app/public/mock/v1/overview/tasks.GET.json | 10 ++++++++++ app/public/mock/v1/overview/teams.GET.json | 8 ++++++++ .../tasks/_components/z-timeline.vue | 18 +++++++++--------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json index 01bab0b..f89798e 100644 --- a/app/public/mock/v1/overview/tasks.GET.json +++ b/app/public/mock/v1/overview/tasks.GET.json @@ -46,6 +46,16 @@ "master_task_color": "#E9FFE6" }, + { + "id": 1, + "task_id": 1, + "starts_at": "2022-12-12T08:30:00+00:00", + "ends_at": "2022-12-12T09:00:00+00:00", + "title": "Kratky task", + "project_code": "CO-2201", + "master_task_color": "#f27e57" + }, + { "id": 2, "task_id": 2, diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json index 22eb775..b286142 100644 --- a/app/public/mock/v1/overview/teams.GET.json +++ b/app/public/mock/v1/overview/teams.GET.json @@ -35,6 +35,14 @@ "starts_at": "2022-11-10T16:00:00+00:00", "ends_at": "2022-11-12T18:00:00+00:00", "is_blocker": true + }, + + { + "id": 4, + "is_finished": false, + "starts_at": "2022-12-12T17:30:00+00:00", + "ends_at": "2022-12-12T18:00:00+00:00", + "is_blocker": true } ] }, 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 9ac0ace..ab4b740 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -13,7 +13,7 @@ :unscheduledTime="calData.unscheduled_times" :overlaps-per-time-step="false" :showTimeInCells="false" - :time-cell-height="200" + :time-cell-height="100" :min-cell-width="300" @ready="onReady()" @view-change="weekChanged" @@ -22,7 +22,7 @@ - +