diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json index 8d9873c..d0655d9 100644 --- a/app/public/mock/v1/overview/tasks.GET.json +++ b/app/public/mock/v1/overview/tasks.GET.json @@ -43,7 +43,8 @@ "ends_at": "2023-01-08T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { @@ -53,7 +54,8 @@ "ends_at": "2023-01-08T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", - "master_task_color": "#f27e57" + "master_task_color": "#f27e57", + "completed": false }, { @@ -63,7 +65,8 @@ "ends_at": "2023-01-08T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false }, { @@ -73,7 +76,8 @@ "ends_at": "2023-01-08T10:00:00+00:00", "title": "Task 2", "project_code": "CO-2201", - "master_task_color": "#FDE1FF" + "master_task_color": "#FDE1FF", + "completed": false }, { @@ -83,7 +87,8 @@ "ends_at": "2023-01-09T12:00:00+00:00", "title": "Task 6", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false }, { @@ -93,7 +98,8 @@ "ends_at": "2023-01-10T16:00:00+00:00", "title": "Task 7", "project_code": "CO-2201", - "master_task_color": "#E7DBF8" + "master_task_color": "#E7DBF8", + "completed": true }, { @@ -103,7 +109,8 @@ "ends_at": "2023-01-08T09:00:00+00:00", "title": "Task 8", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false }, { @@ -113,7 +120,8 @@ "ends_at": "2023-01-09T12:00:00+00:00", "title": "Task 9", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { @@ -123,7 +131,8 @@ "ends_at": "2023-01-08T13:00:00+00:00", "title": "Task 10", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false } ] diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json index 01e1711..1f38bbb 100644 --- a/app/public/mock/v1/overview/teams.GET.json +++ b/app/public/mock/v1/overview/teams.GET.json @@ -11,31 +11,34 @@ { "id": 1, "task_id": 1, - "starts_at": "2023-01-10T08:01:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:01:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { "id": 2, "task_id": 2, - "starts_at": "2023-01-10T08:30:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:30:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", - "master_task_color": "#f27e57" + "master_task_color": "#f27e57", + "completed": false }, { "id": 3, "task_id": 3, - "starts_at": "2023-01-10T10:30:00+00:00", - "ends_at": "2023-01-10T10:45:00+00:00", + "starts_at": "2023-01-11T10:30:00+00:00", + "ends_at": "2023-01-11T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false } ] }, @@ -50,31 +53,34 @@ { "id": 1, "task_id": 1, - "starts_at": "2023-01-10T08:01:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:01:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { "id": 2, "task_id": 2, - "starts_at": "2023-01-10T08:30:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:30:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", - "master_task_color": "#f27e57" + "master_task_color": "#f27e57", + "completed": false }, { "id": 3, "task_id": 3, - "starts_at": "2023-01-10T10:30:00+00:00", - "ends_at": "2023-01-10T10:45:00+00:00", + "starts_at": "2023-01-11T10:30:00+00:00", + "ends_at": "2023-01-11T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false } ] }, @@ -89,31 +95,34 @@ { "id": 1, "task_id": 1, - "starts_at": "2023-01-10T08:01:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:01:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { "id": 2, "task_id": 2, - "starts_at": "2023-01-10T08:30:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:30:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", - "master_task_color": "#f27e57" + "master_task_color": "#f27e57", + "completed": false }, { "id": 3, "task_id": 3, - "starts_at": "2023-01-10T10:30:00+00:00", - "ends_at": "2023-01-10T10:45:00+00:00", + "starts_at": "2023-01-11T10:30:00+00:00", + "ends_at": "2023-01-11T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false } ] }, @@ -128,31 +137,34 @@ { "id": 1, "task_id": 1, - "starts_at": "2023-01-10T08:01:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:01:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Task DNES", "project_code": "CO-2201", - "master_task_color": "#E9FFE6" + "master_task_color": "#E9FFE6", + "completed": false }, { "id": 2, "task_id": 2, - "starts_at": "2023-01-10T08:30:00+00:00", - "ends_at": "2023-01-10T09:00:00+00:00", + "starts_at": "2023-01-11T08:30:00+00:00", + "ends_at": "2023-01-11T09:00:00+00:00", "title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e", "project_code": "CO-2201", - "master_task_color": "#f27e57" + "master_task_color": "#f27e57", + "completed": false }, { "id": 3, "task_id": 3, - "starts_at": "2023-01-10T10:30:00+00:00", - "ends_at": "2023-01-10T10:45:00+00:00", + "starts_at": "2023-01-11T10:30:00+00:00", + "ends_at": "2023-01-11T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", - "master_task_color": "#57e0f2" + "master_task_color": "#57e0f2", + "completed": false } ] } diff --git a/app/src/plugins/app@vendor/vue-cal/index.vue b/app/src/plugins/app@vendor/vue-cal/index.vue index bd424b1..6d928bc 100644 --- a/app/src/plugins/app@vendor/vue-cal/index.vue +++ b/app/src/plugins/app@vendor/vue-cal/index.vue @@ -1237,8 +1237,6 @@ 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 9ff343c..32604c3 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue @@ -66,7 +66,7 @@
@@ -81,8 +81,8 @@ -