mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app
This commit is contained in:
commit
8d49ad7122
10 files changed
+476
-168
No files matched your search
@@ -39,92 +39,102 @@
|
||||
{
|
||||
"id": 1,
|
||||
"task_id": 1,
|
||||
"starts_at": "2023-01-03T08:01:00+00:00",
|
||||
"ends_at": "2023-01-03T09:00:00+00:00",
|
||||
"title": "Task 1",
|
||||
"starts_at": "2023-01-08T08:01:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 2,
|
||||
"task_id": 2,
|
||||
"starts_at": "2023-01-03T08:30:00+00:00",
|
||||
"ends_at": "2023-01-03T09:00:00+00:00",
|
||||
"starts_at": "2023-01-08T08:30:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 3,
|
||||
"task_id": 3,
|
||||
"starts_at": "2023-01-03T10:30:00+00:00",
|
||||
"ends_at": "2023-01-03T10:45:00+00:00",
|
||||
"starts_at": "2023-01-08T10:30:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 4,
|
||||
"task_id": 4,
|
||||
"starts_at": "2023-01-03T08:00:00+00:00",
|
||||
"ends_at": "2023-01-03T10:00:00+00:00",
|
||||
"starts_at": "2023-01-08T08:00:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 6,
|
||||
"task_id": 6,
|
||||
"starts_at": "2023-01-04T09:00:00+00:00",
|
||||
"ends_at": "2023-01-04T12:00:00+00:00",
|
||||
"starts_at": "2023-01-09T09:00:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 7,
|
||||
"task_id": 7,
|
||||
"starts_at": "2023-01-05T12:00:00+00:00",
|
||||
"ends_at": "2023-01-05T16:00:00+00:00",
|
||||
"starts_at": "2023-01-10T12:00:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 8,
|
||||
"task_id": 8,
|
||||
"starts_at": "2023-01-03T07:00:00+00:00",
|
||||
"ends_at": "2023-01-03T09:00:00+00:00",
|
||||
"starts_at": "2023-01-08T07:00:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 9,
|
||||
"task_id": 9,
|
||||
"starts_at": "2023-01-04T09:00:00+00:00",
|
||||
"ends_at": "2023-01-04T12:00:00+00:00",
|
||||
"starts_at": "2023-01-09T09:00:00+00:00",
|
||||
"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
|
||||
},
|
||||
|
||||
{
|
||||
"id": 10,
|
||||
"task_id": 10,
|
||||
"starts_at": "2023-01-03T12:00:00+00:00",
|
||||
"ends_at": "2023-01-03T13:00:00+00:00",
|
||||
"starts_at": "2023-01-08T12:00:00+00:00",
|
||||
"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
|
||||
}
|
||||
|
||||
]
|
||||
},
|
||||
"status": 200
|
||||
|
||||
@@ -1,80 +1,173 @@
|
||||
{
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
"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-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",
|
||||
"completed": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"id": 3,
|
||||
"task_id": 3,
|
||||
"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",
|
||||
"completed": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"id": 2,
|
||||
"task_id": 2,
|
||||
"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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"id": 3,
|
||||
"task_id": 3,
|
||||
"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",
|
||||
"completed": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"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-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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"id": 2,
|
||||
"task_id": 2,
|
||||
"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",
|
||||
"completed": false
|
||||
},
|
||||
|
||||
{
|
||||
"id": 3,
|
||||
"task_id": 3,
|
||||
"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",
|
||||
"completed": false
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"status": 200
|
||||
}
|
||||
Reference in new issue
Block a user