From f1e3d63fc9103196613e6c5a2cf5fc67ca0a5fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Kalu=C5=BEa?= Date: Tue, 10 Jan 2023 15:28:33 +0100 Subject: [PATCH] [teams overview] setup, tahanie dat a ich formatovanie... --- app/public/mock/v1/overview/teams.GET.json | 221 ++++++++++++------ app/src/plugins/app@vendor/vue-cal/index.vue | 2 + .../tasks/_components/z-timeline.vue | 29 +-- app/src/plugins/tm@dashboard/tasks/tasks.vue | 5 - app/src/plugins/tm@dashboard/teams/teams.vue | 123 +++++++++- 5 files changed, 274 insertions(+), 106 deletions(-) diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json index b286142..01e1711 100644 --- a/app/public/mock/v1/overview/teams.GET.json +++ b/app/public/mock/v1/overview/teams.GET.json @@ -1,80 +1,161 @@ { - "data": { - "unscheduled_time": 123123123, - - "users_tasks": [ - { - "user": { + "data": [ + { + "id": 1, + "name": "Rastislav", + "surname": "Kuttner", + "work_hours_from": "08:00", + "work_hours_to": "19:00", + "unscheduled_time": 10, + "tasks": [ + { "id": 1, - "name": "Rastislav", - "surname": "Kuttner", - "work_hours_from": "08:00", - "work_hours_to": "16:00" + "task_id": 1, + "starts_at": "2023-01-10T08:01:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Task DNES", + "project_code": "CO-2201", + "master_task_color": "#E9FFE6" }, - "tasks": [ - { - "id": 1, - "is_finished": false, - "starts_at": "2022-11-10T09:00:00+00:00", - "ends_at": "2022-11-12T12:00:00+00:00", - "files": [] - }, - - { - "id": 2, - "is_finished": false, - "starts_at": "2022-11-10T12:00:00+00:00", - "ends_at": "2022-11-12T16:00:00+00:00", - "files": [] - }, - - { - "id": 4, - "is_finished": false, - "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 - } - ] - }, - - { - "user": { + { "id": 2, - "name": "Lenka", - "surname": "Nemeckova", - "work_hours_from": "09:00", - "work_hours_to": "17:00" + "task_id": 2, + "starts_at": "2023-01-10T08:30:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", + "project_code": "CO-2201", + "master_task_color": "#f27e57" }, - "tasks": [ - { - "id": 3, - "is_finished": false, - "starts_at": "2022-11-10T09:00:00+00:00", - "ends_at": "2022-11-12T12:00:00+00:00", - "files": [] - }, + { + "id": 3, + "task_id": 3, + "starts_at": "2023-01-10T10:30:00+00:00", + "ends_at": "2023-01-10T10:45:00+00:00", + "title": "Kratky 15min", + "project_code": "CO-2201", + "master_task_color": "#57e0f2" + } + ] + }, + { + "id": 2, + "name": "Rastislav", + "surname": "Kuttner", + "work_hours_from": "05:00", + "work_hours_to": "16:00", + "unscheduled_time": 10, + "tasks": [ + { + "id": 1, + "task_id": 1, + "starts_at": "2023-01-10T08:01:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Task DNES", + "project_code": "CO-2201", + "master_task_color": "#E9FFE6" + }, - { - "id": 4, - "is_finished": false, - "starts_at": "2022-11-10T12:00:00+00:00", - "ends_at": "2022-11-12T16:00:00+00:00", - "files": [] - } - ] - } - ] - }, + { + "id": 2, + "task_id": 2, + "starts_at": "2023-01-10T08:30:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", + "project_code": "CO-2201", + "master_task_color": "#f27e57" + }, + + { + "id": 3, + "task_id": 3, + "starts_at": "2023-01-10T10:30:00+00:00", + "ends_at": "2023-01-10T10:45:00+00:00", + "title": "Kratky 15min", + "project_code": "CO-2201", + "master_task_color": "#57e0f2" + } + ] + }, + { + "id": 3, + "name": "Rastislav", + "surname": "Kuttner", + "work_hours_from": "07:30", + "work_hours_to": "18:30", + "unscheduled_time": 10, + "tasks": [ + { + "id": 1, + "task_id": 1, + "starts_at": "2023-01-10T08:01:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Task DNES", + "project_code": "CO-2201", + "master_task_color": "#E9FFE6" + }, + + { + "id": 2, + "task_id": 2, + "starts_at": "2023-01-10T08:30:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", + "project_code": "CO-2201", + "master_task_color": "#f27e57" + }, + + { + "id": 3, + "task_id": 3, + "starts_at": "2023-01-10T10:30:00+00:00", + "ends_at": "2023-01-10T10:45:00+00:00", + "title": "Kratky 15min", + "project_code": "CO-2201", + "master_task_color": "#57e0f2" + } + ] + }, + { + "id": 4, + "name": "Rastislav", + "surname": "Kuttner", + "work_hours_from": "07:00", + "work_hours_to": "18:00", + "unscheduled_time": 10, + "tasks": [ + { + "id": 1, + "task_id": 1, + "starts_at": "2023-01-10T08:01:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Task DNES", + "project_code": "CO-2201", + "master_task_color": "#E9FFE6" + }, + + { + "id": 2, + "task_id": 2, + "starts_at": "2023-01-10T08:30:00+00:00", + "ends_at": "2023-01-10T09:00:00+00:00", + "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", + "project_code": "CO-2201", + "master_task_color": "#f27e57" + }, + + { + "id": 3, + "task_id": 3, + "starts_at": "2023-01-10T10:30:00+00:00", + "ends_at": "2023-01-10T10:45:00+00:00", + "title": "Kratky 15min", + "project_code": "CO-2201", + "master_task_color": "#57e0f2" + } + ] + } + ], "status": 200 } \ No newline at end of file diff --git a/app/src/plugins/app@vendor/vue-cal/index.vue b/app/src/plugins/app@vendor/vue-cal/index.vue index 6d928bc..bd424b1 100644 --- a/app/src/plugins/app@vendor/vue-cal/index.vue +++ b/app/src/plugins/app@vendor/vue-cal/index.vue @@ -1237,6 +1237,8 @@ export default { }, created() { + console.log(this.splitDays) + this.utils.cell = new CellUtils(this) this.utils.event = new EventUtils(this, this.utils.date) 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 b34cc1b..9ff343c 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -25,10 +25,13 @@ >