From 7b09fe15c79215b6f76825a33b5c57a653420f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 21 Nov 2024 11:07:42 +0100
Subject: [PATCH] Feat(office365) Added support for type office365_blocker

---
 app/src/plugins/app@vendor/vue-cal/event.vue                  | 2 +-
 app/src/plugins/tm@dashboard/_components/a-timeline-event.vue | 2 +-
 app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue
index 68671ae..bb7e2d2 100644
--- a/app/src/plugins/app@vendor/vue-cal/event.vue
+++ b/app/src/plugins/app@vendor/vue-cal/event.vue
@@ -157,7 +157,7 @@ export default {
 		},
 
 		onDragStart(e) {
-			if (this.event.type == 'blocker' || this.event.type == 'non-working-hours') return //|| this.event._timeblock_is_finished || this.event.subtask?.is_finished
+			if (this.event.type == 'blocker' || this.event.type == 'non-working-hours' || this.event.type == 'office365_blocker') return //|| this.event._timeblock_is_finished || this.event.subtask?.is_finished
 			this.event.draggingStatic = false
 			this.dnd && this.dnd.eventDragStart(e, this.event);
 		},
diff --git a/app/src/plugins/tm@dashboard/_components/a-timeline-event.vue b/app/src/plugins/tm@dashboard/_components/a-timeline-event.vue
index 7f250d9..786fac0 100644
--- a/app/src/plugins/tm@dashboard/_components/a-timeline-event.vue
+++ b/app/src/plugins/tm@dashboard/_components/a-timeline-event.vue
@@ -7,7 +7,7 @@
 			</div>
 		</div>
 
-		<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day', 'office365'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="subtaskCssClass" :style="{ backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask?.color }">
+		<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day', 'office365', 'office365_blocker'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="subtaskCssClass" :style="{ backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask?.color }">
 			<div class="event-content" :class="{ 'is-blocker': props.event.isBlocker }">
 				<template v-if="['subtask', 'office365'].includes(event.type)">
 					<small v-if="props.event.subtask.project_code" class="project-code">{{ props.event.subtask.project_code }}</small>
diff --git a/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts b/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
index 7bd26ac..2609763 100644
--- a/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
+++ b/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
@@ -30,7 +30,7 @@ export default {
 		const tasks = []
 
 		subtasks.forEach(subtask => {
-			if (['blocker', 'adhoc', 'home_office', 'vacation', 'free_day'].includes(subtask.type)) {
+			if (['blocker', 'adhoc', 'home_office', 'vacation', 'free_day', 'office365_blocker'].includes(subtask.type)) {
 				blockers = [...blockers, ...this._generateEventsFromBlocker(subtask, date)]
 			} else {
 				subtask.timeblocks?.forEach((timeblock) => {