From f13649485b4e309e1ff2acc56c030e5f3a492e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Kalu=C5=BEa?= Date: Wed, 18 Jan 2023 19:53:37 +0100 Subject: [PATCH] [timeline] farebne odlisenie vikendov --- app/public/mock/v1/overview/tasks.GET.json | 36 +++++++++---------- app/public/mock/v1/overview/teams.GET.json | 36 +++++++++---------- app/src/plugins/app@vendor/vue-cal/cell.vue | 1 + .../tm@dashboard/_components/z-timeline.vue | 7 +++- app/src/plugins/tm@dashboard/tasks/tasks.vue | 8 ++++- 5 files changed, 50 insertions(+), 38 deletions(-) diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json index 459ccd1..3e0dcf5 100644 --- a/app/public/mock/v1/overview/tasks.GET.json +++ b/app/public/mock/v1/overview/tasks.GET.json @@ -38,8 +38,8 @@ "tasks": [ { "id": 1, - "starts_at": "2023-01-11T08:01:00+00:00", - "ends_at": "2023-01-11T09:00:00+00:00", + "starts_at": "2023-01-18T08:01:00+00:00", + "ends_at": "2023-01-18T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", "master_task_color": "#E9FFE6", @@ -48,8 +48,8 @@ { "id": 2, - "starts_at": "2023-01-12T08:30:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:30:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", "master_task_color": "#f27e57", @@ -58,8 +58,8 @@ { "id": 3, - "starts_at": "2023-01-12T10:30:00+00:00", - "ends_at": "2023-01-12T10:45:00+00:00", + "starts_at": "2023-01-19T10:30:00+00:00", + "ends_at": "2023-01-19T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", "master_task_color": "#57e0f2", @@ -68,8 +68,8 @@ { "id": 4, - "starts_at": "2023-01-13T08:00:00+00:00", - "ends_at": "2023-01-13T10:00:00+00:00", + "starts_at": "2023-01-20T08:00:00+00:00", + "ends_at": "2023-01-20T10:00:00+00:00", "title": "Task 2", "project_code": "CO-2201", "master_task_color": "#FDE1FF", @@ -78,8 +78,8 @@ { "id": 6, - "starts_at": "2023-01-13T09:00:00+00:00", - "ends_at": "2023-01-13T12:00:00+00:00", + "starts_at": "2023-01-20T09:00:00+00:00", + "ends_at": "2023-01-20T12:00:00+00:00", "title": "Task 6", "project_code": "CO-2201", "master_task_color": "#57e0f2", @@ -88,8 +88,8 @@ { "id": 7, - "starts_at": "2023-01-13T12:00:00+00:00", - "ends_at": "2023-01-13T16:00:00+00:00", + "starts_at": "2023-01-20T12:00:00+00:00", + "ends_at": "2023-01-20T16:00:00+00:00", "title": "Task 7", "project_code": "CO-2201", "master_task_color": "#E7DBF8", @@ -98,8 +98,8 @@ { "id": 8, - "starts_at": "2023-01-14T07:00:00+00:00", - "ends_at": "2023-01-14T09:00:00+00:00", + "starts_at": "2023-01-21T07:00:00+00:00", + "ends_at": "2023-01-21T09:00:00+00:00", "title": "Task 8", "project_code": "CO-2201", "master_task_color": "#57e0f2", @@ -108,8 +108,8 @@ { "id": 9, - "starts_at": "2023-01-14T09:00:00+00:00", - "ends_at": "2023-01-14T12:00:00+00:00", + "starts_at": "2023-01-21T09:00:00+00:00", + "ends_at": "2023-01-21T12:00:00+00:00", "title": "Task 9", "project_code": "CO-2201", "master_task_color": "#E9FFE6", @@ -118,8 +118,8 @@ { "id": 10, - "starts_at": "2023-01-14T12:00:00+00:00", - "ends_at": "2023-01-14T13:00:00+00:00", + "starts_at": "2023-01-21T12:00:00+00:00", + "ends_at": "2023-01-21T13:00:00+00:00", "title": "Task 10", "project_code": "CO-2201", "master_task_color": "#57e0f2", diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json index 61c006f..311e017 100644 --- a/app/public/mock/v1/overview/teams.GET.json +++ b/app/public/mock/v1/overview/teams.GET.json @@ -10,8 +10,8 @@ "tasks": [ { "id": 1, - "starts_at": "2023-01-12T08:01:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:01:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", "master_task_color": "#E9FFE6", @@ -20,8 +20,8 @@ { "id": 2, - "starts_at": "2023-01-12T08:30:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:30:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Kratky 30min", "project_code": "CO-2201", "master_task_color": "#f27e57", @@ -30,8 +30,8 @@ { "id": 3, - "starts_at": "2023-01-13T10:30:00+00:00", - "ends_at": "2023-01-13T10:45:00+00:00", + "starts_at": "2023-01-20T10:30:00+00:00", + "ends_at": "2023-01-20T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", "master_task_color": "#57e0f2", @@ -49,8 +49,8 @@ "tasks": [ { "id": 4, - "starts_at": "2023-01-12T08:01:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:01:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", "master_task_color": "#E9FFE6", @@ -59,8 +59,8 @@ { "id": 5, - "starts_at": "2023-01-12T08:30:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:30:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Kratky 30min", "project_code": "CO-2201", "master_task_color": "#f27e57", @@ -69,8 +69,8 @@ { "id": 6, - "starts_at": "2023-01-12T10:30:00+00:00", - "ends_at": "2023-01-12T10:45:00+00:00", + "starts_at": "2023-01-19T10:30:00+00:00", + "ends_at": "2023-01-19T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", "master_task_color": "#57e0f2", @@ -88,8 +88,8 @@ "tasks": [ { "id": 1, - "starts_at": "2023-01-13T08:01:00+00:00", - "ends_at": "2023-01-13T09:00:00+00:00", + "starts_at": "2023-01-20T08:01:00+00:00", + "ends_at": "2023-01-20T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", "master_task_color": "#E9FFE6", @@ -98,8 +98,8 @@ { "id": 2, - "starts_at": "2023-01-12T08:30:00+00:00", - "ends_at": "2023-01-12T09:00:00+00:00", + "starts_at": "2023-01-19T08:30:00+00:00", + "ends_at": "2023-01-19T09:00:00+00:00", "title": "Kratky 30min", "project_code": "CO-2201", "master_task_color": "#f27e57", @@ -108,8 +108,8 @@ { "id": 3, - "starts_at": "2023-01-13T10:30:00+00:00", - "ends_at": "2023-01-13T10:45:00+00:00", + "starts_at": "2023-01-20T10:30:00+00:00", + "ends_at": "2023-01-20T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", "master_task_color": "#57e0f2", diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue index 4b60faa..a31f860 100644 --- a/app/src/plugins/app@vendor/vue-cal/cell.vue +++ b/app/src/plugins/app@vendor/vue-cal/cell.vue @@ -106,6 +106,7 @@ export default { return { 'vuecal__cell-split': true, 'vuecal__cell-split--highlighted': this.highlightedSplit === split.id, + 'vuecal__cell-split--weekend': split.isWeekend, [split.class]: !!split.class } }, diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index 4b84205..0f3835d 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -37,7 +37,7 @@

{{ split.date.toLocaleDateString('en-EN', { weekday: 'long' }) }}

-
+

{{split.initials}}

@@ -356,6 +356,11 @@ export default { .vuecal__cell--highlighted, .vuecal__cell--selected background-color: white + border-radius: 16px + + .vuecal__cell-split--weekend + background-color: #F2E7FE !important + border-radius: 16px // EVENT diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index 15678c9..e513211 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -56,11 +56,17 @@ export default { name: this.timelineData.name + " " + this.timelineData.surname, initials: this.timelineData.name.charAt(0).toUpperCase() + this.timelineData.surname.charAt(0).toUpperCase(), unscheduledTime: Math.floor(this.timelineData.unscheduled_times[i].time / 60) + "," + String(this.timelineData.unscheduled_times[i].time % 60)[0], - date: addDays(date, i) + date: addDays(date, i), + isWeekend: this.isWeekend(addDays(date, i)) }) } }, + isWeekend(date) { + if (date.getDay() == 6 || date.getDay() == 0) return true + return false + }, + formatTimelineDataToTimelineFormat(date) { // format events this.timelineData.tasks.forEach(event => {