From 73b21b4e42b59d7dbf58c24a84303c97e95ee76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kalu=C5=BEa?= <kaluza.filip16@gmail.com>
Date: Fri, 9 Dec 2022 17:37:04 +0100
Subject: [PATCH] [task overview] blocker

---
 app/public/mock/v1/overview/tasks.GET.json    | 15 ++++-------
 app/src/plugins/app/_theme/global.sass        |  5 +---
 app/src/plugins/app@vendor/vue-cal/event.vue  |  3 +++
 .../app@vendor/vue-cal/weekdays-headings.vue  |  6 -----
 .../tasks/_components/z-timeline.vue          | 25 ++++++++++---------
 app/src/plugins/tm@dashboard/tasks/tasks.vue  |  2 --
 6 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json
index 06e3949..fe7015c 100644
--- a/app/public/mock/v1/overview/tasks.GET.json
+++ b/app/public/mock/v1/overview/tasks.GET.json
@@ -43,8 +43,7 @@
 				"ends_at": "2022-12-06T09:00:00+00:00",
 				"title": "title",
 				"project_code": "CO-2201",
-				"master_task_color": "#121212",
-				"class": "red"
+				"master_task_color": "#E9FFE6"
 			},
 
 			{
@@ -54,8 +53,7 @@
 				"ends_at": "2022-12-06T10:00:00+00:00",
 				"title": "title",
 				"project_code": "CO-2201",
-				"master_task_color": "#121212",
-				"class": "green"
+				"master_task_color": "#FDE1FF"
 			},
 
 			{
@@ -65,8 +63,7 @@
 				"ends_at": "2022-12-06T11:00:00+00:00",
 				"title": "title",
 				"is_blocker": true,
-				"master_task_color": null,
-				"class": "blue"
+				"master_task_color": null
 			},
 
 			{
@@ -76,8 +73,7 @@
 				"ends_at": "2022-12-07T12:00:00+00:00",
 				"title": "title",
 				"project_code": "CO-2201",
-				"master_task_color": "#121212",
-				"class": "yellow"
+				"master_task_color": "#E9FFE6"
 			},
 
 			{
@@ -87,8 +83,7 @@
 				"ends_at": "2022-12-07T16:00:00+00:00",
 				"title": "title",
 				"project_code": "CO-2201",
-				"master_task_color": "#121212",
-				"class": "green"
+				"master_task_color": "#E7DBF8"
 			}
 		]
 	},
diff --git a/app/src/plugins/app/_theme/global.sass b/app/src/plugins/app/_theme/global.sass
index ed63947..561a6c0 100644
--- a/app/src/plugins/app/_theme/global.sass
+++ b/app/src/plugins/app/_theme/global.sass
@@ -30,7 +30,4 @@ th
 	border-radius: 4px
 
 .border-select .v-input__control
-	border: 1px solid #E5E5E5 !important
-
-.min-h-100
-	min-height: 100%
\ No newline at end of file
+	border: 1px solid #E5E5E5 !important
\ No newline at end of file
diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue
index d34b089..15ec18d 100644
--- a/app/src/plugins/app@vendor/vue-cal/event.vue
+++ b/app/src/plugins/app@vendor/vue-cal/event.vue
@@ -224,6 +224,7 @@ export default {
       let width = 100 - (this.eventPosition * 10)
       let left = 10 * this.eventPosition / 2
       let zIdnex = (this.eventPosition + 1) * 10
+      let background = this.event.master_task_color
 
       if (this.vuecal.minEventWidth && width < this.vuecal.minEventWidth) {
         width = this.vuecal.minEventWidth
@@ -233,6 +234,7 @@ export default {
       const { top, height } = this.eventDimensions
 
       return {
+        "background": background,
         "z-index": `${zIdnex}`,
         top: `${top}px`,
         height: `${height}px`,
@@ -247,6 +249,7 @@ export default {
 
       return {
         [this.event.class]: !!this.event.class,
+        'event-blocker': this.event.is_blocker,
         'vuecal__event--focus': this.event.focused,
         'vuecal__event--resizing': this.event.resizing,
         'vuecal__event--background': this.event.background,
diff --git a/app/src/plugins/app@vendor/vue-cal/weekdays-headings.vue b/app/src/plugins/app@vendor/vue-cal/weekdays-headings.vue
index 59cc018..5bb11cb 100644
--- a/app/src/plugins/app@vendor/vue-cal/weekdays-headings.vue
+++ b/app/src/plugins/app@vendor/vue-cal/weekdays-headings.vue
@@ -34,10 +34,6 @@ export default {
     unscheduledTime: { type: Array, default: [] }
   },
 
-  // created() {
-  //   console.log(this.weekDays)
-  // },
-
   methods: {
     selectCell (date, DOMEvent) {
       if (date.getTime() !== this.view.selectedDate.getTime()) {
@@ -86,8 +82,6 @@ export default {
           } : {})
         }
       })
-
-      console.log(headings)
       return headings
     },
     cellWidth () {
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 37625cc..ea6ce82 100644
--- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue
@@ -48,9 +48,9 @@
 			<template v-slot:event="{ event }">
 				<div class="event-content-wrapper w-100 h-100 d-flex flex-column justify-space-between">
 					<div>
-						<small v-if="event.project_code && (event.end.getTime() - event.start.getTime() >= 7200000)" class="project-code">{{ event.project_code }}</small>
+						<small v-if="event.project_code && (event.end.getTime() - event.start.getTime() >= 7200000) && !event.is_blocker" class="project-code">{{ event.project_code }}</small>
 						<h3>{{ event.title }}</h3>
-						<div v-if="event.end.getTime() - event.start.getTime() >= 7200000" class="d-flex align-center">
+						<div v-if="event.end.getTime() - event.start.getTime() >= 7200000" class="d-flex align-center event-details">
 							<div class="event-initials d-flex justify-center align-center">
 								<small>{{ getUserInitials(event) }}</small>
 							</div>
@@ -125,8 +125,6 @@ export default {
 
 		correctTimecolumnMargin() {
 			const heightOfDayHeader = document.getElementsByClassName('vuecal__heading')[0].clientHeight
-			console.log(heightOfDayHeader)
-			console.log(document.getElementsByClassName('vuecal__time-column')[0].style)
 			document.getElementsByClassName('vuecal__time-column')[0].style.marginTop = `${heightOfDayHeader}px`
 		},
 
@@ -310,15 +308,18 @@ export default {
 				&:focus
 					z-index: 100 !important
 
-				&.red
-					background: #FFC9C9 !important
+				&.event-blocker
+					background: #B00020 !important
 
-				&.green
-					background: #E9FFE5 !important
+					h3,
+					.event-details *
+						color: white !important
+
+					.event-details .event-initials
+						border: 1px solid white
+
+					.event-footer
+						border-top: 1px solid rgba(255, 255, 255, 0.19)
 
-				&.blue
-					background: #DADEF8 !important
 
-				&.yellow
-					background: #F6ECD3 !important
 </style>
diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue
index 4c3c1a9..3fbe04c 100644
--- a/app/src/plugins/tm@dashboard/tasks/tasks.vue
+++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue
@@ -69,8 +69,6 @@ export default {
 				time.surname = this.timelineData.surname
 			})
 
-			console.log(this.timelineData.unscheduled_times)
-
 			// format working hours
 			this.config.startHour = Number(this.timelineData.work_hours_from.split(':')[0]) - 1
 			this.config.endHour = Number(this.timelineData.work_hours_to.split(':')[0]) + 1