From c95e5e883512d486404b9d3c220118ce044124d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Fri, 27 Jan 2023 00:56:16 +0100 Subject: [PATCH] . --- app/public/mock/v1/overview/tasks.GET.json | 24 ++++++------- app/public/mock/v1/overview/teams.GET.json | 36 +++++++++---------- app/src/plugins/app/_config/App.vue | 6 ++-- .../tm@dashboard/projects/projects.vue | 1 + .../master-task/z-master-task-modal.vue | 6 ++-- 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json index 3e0dcf5..9148896 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-18T08:01:00+00:00", - "ends_at": "2023-01-18T09:00:00+00:00", + "starts_at": "2023-01-26T08:01:00+00:00", + "ends_at": "2023-01-26T09: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-19T08:30:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-27T08:30:00+00:00", + "ends_at": "2023-01-27T09: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-19T10:30:00+00:00", - "ends_at": "2023-01-19T10:45:00+00:00", + "starts_at": "2023-01-27T10:30:00+00:00", + "ends_at": "2023-01-27T10: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-20T08:00:00+00:00", - "ends_at": "2023-01-20T10:00:00+00:00", + "starts_at": "2023-01-26T08:00:00+00:00", + "ends_at": "2023-01-26T10: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-20T09:00:00+00:00", - "ends_at": "2023-01-20T12:00:00+00:00", + "starts_at": "2023-01-27T09:00:00+00:00", + "ends_at": "2023-01-27T12: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-20T12:00:00+00:00", - "ends_at": "2023-01-20T16:00:00+00:00", + "starts_at": "2023-01-28T12:00:00+00:00", + "ends_at": "2023-01-28T16:00:00+00:00", "title": "Task 7", "project_code": "CO-2201", "master_task_color": "#E7DBF8", diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json index 311e017..879976e 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-19T08:01:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-27T08:01:00+00:00", + "ends_at": "2023-01-27T09: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-19T08:30:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-27T08:30:00+00:00", + "ends_at": "2023-01-27T09: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-20T10:30:00+00:00", - "ends_at": "2023-01-20T10:45:00+00:00", + "starts_at": "2023-01-28T10:30:00+00:00", + "ends_at": "2023-01-28T10: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-19T08:01:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-27T08:01:00+00:00", + "ends_at": "2023-01-27T09: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-19T08:30:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-28T08:30:00+00:00", + "ends_at": "2023-01-28T09: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-19T10:30:00+00:00", - "ends_at": "2023-01-19T10:45:00+00:00", + "starts_at": "2023-01-28T10:30:00+00:00", + "ends_at": "2023-01-28T10: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-20T08:01:00+00:00", - "ends_at": "2023-01-20T09:00:00+00:00", + "starts_at": "2023-01-27T08:01:00+00:00", + "ends_at": "2023-01-27T09: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-19T08:30:00+00:00", - "ends_at": "2023-01-19T09:00:00+00:00", + "starts_at": "2023-01-27T08:30:00+00:00", + "ends_at": "2023-01-27T09: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-20T10:30:00+00:00", - "ends_at": "2023-01-20T10:45:00+00:00", + "starts_at": "2023-01-27T10:30:00+00:00", + "ends_at": "2023-01-27T10:45:00+00:00", "title": "Kratky 15min", "project_code": "CO-2201", "master_task_color": "#57e0f2", diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue index a60847a..b82e138 100644 --- a/app/src/plugins/app/_config/App.vue +++ b/app/src/plugins/app/_config/App.vue @@ -7,7 +7,7 @@ - + @@ -57,8 +57,8 @@ export default { this.$refs['z-task-modal'].showModal(task, editMode) }) - this.$events.on('show-master-task-modal', ({task, editMode}) => { - this.$refs['z-master-task-modal'].showModal(task, editMode) + this.$events.on('show-master-task-modal', ({masterTask, editMode}) => { + this.$refs['z-master-task-modal'].showModal(masterTask, editMode) }) this.$events.on('show-complete-task-modal', ({task}) => { diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue index 9c13b97..d6d2b4f 100644 --- a/app/src/plugins/tm@dashboard/projects/projects.vue +++ b/app/src/plugins/tm@dashboard/projects/projects.vue @@ -93,6 +93,7 @@ export default { openMasterTaskModal(masterTaskId) { const masterTask = this.masterTasks.find(masterTask => masterTask.id == masterTaskId) + console.log(masterTask) this.$events.emit('show-master-task-modal', {masterTask, editMode: false}) }, diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index 2b8b477..f50a0e0 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -106,9 +106,9 @@