JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 22:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Matej Glasnák committed 2022-12-20 00:14:24 +01:00
1 parent 6a8afc2dc4
commit 3d7ceea9c6
2 files changed
+3 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/public/mock/v1/overview/tasks.GET.json
+2 -12
View File
@@ -96,16 +96,6 @@
"master_task_color": "#FDE1FF" "master_task_color": "#FDE1FF"
}, },
{
"id": 5,
"task_id": 5,
"starts_at": "2022-12-20T09:00:00+00:00",
"ends_at": "2022-12-20T12:00:00+00:00",
"title": "Task 5",
"is_blocker": true,
"master_task_color": null
},
{ {
"id": 6, "id": 6,
"task_id": 6, "task_id": 6,
@@ -113,7 +103,7 @@
"ends_at": "2022-12-20T12:00:00+00:00", "ends_at": "2022-12-20T12:00:00+00:00",
"title": "Task 6", "title": "Task 6",
"project_code": "CO-2201", "project_code": "CO-2201",
"master_task_color": "#E9FFE6" "master_task_color": "#57e0f2"
}, },
{ {
@@ -133,7 +123,7 @@
"ends_at": "2022-12-19T09:00:00+00:00", "ends_at": "2022-12-19T09:00:00+00:00",
"title": "Task 8", "title": "Task 8",
"project_code": "CO-2201", "project_code": "CO-2201",
"master_task_color": "#E7DBF8" "master_task_color": "#57e0f2"
}, },
{ {
app/src/plugins/app@vendor/vue-cal/event.vue
+1 -1
View File
@@ -275,7 +275,7 @@ export default {
let background = this.event.master_task_color; let background = this.event.master_task_color;
if (Array.isArray(this.cellOverlaps.sameOverlaps) && this.cellOverlaps.sameOverlaps.length) { if (Array.isArray(this.cellOverlaps.sameOverlaps) && this.cellOverlaps.sameOverlaps.length) {
width = 50 width = 46
left = 50 * this.eventPosition left = 50 * this.eventPosition
zIdnex = 10 zIdnex = 10
} }