[Master task] Modal fix

app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts

@@ -3,10 +3,15 @@ import moment from 'moment'
 
 export default {
 	generateTimelineTasks(subtasks, date, employee) {
-		return [
-			...this.generateTimelineEvents(subtasks, employee, date),
-			...this.generateTimelineNonWorkingHours(date, employee)
-		]
+		const { tasks, blockers, homeoffices } = this.generateTimelineEvents(subtasks, employee, date)
+		const { nonWorkingHours }              = this.generateTimelineNonWorkingHours(date, employee)
+
+		return {
+			tasks,
+			blockers,
+			nonWorkingHours,
+			homeoffices
+		}
 	},
 
 	getUnscheduledTime(subtasks) {
@@ -21,19 +26,24 @@ export default {
 	},
 
 	generateTimelineEvents(subtasks, employee, date) {
-		let events  = []
+		let blockers  = []
+		const tasks = []
 
 		subtasks.forEach(subtask => {
 			if (['blocker', 'adhoc', 'home_office', 'vacation', 'free_day'].includes(subtask.type)) {
-				events = [...events, ...this._generateEventsFromBlocker(subtask, date)]
+				blockers = [...blockers, ...this._generateEventsFromBlocker(subtask, date)]
 			} else {
 				subtask.timeblocks?.forEach((timeblock) => {
-					events.push(this._composeTimelineEvent(subtask, employee, date, timeblock))
+					tasks.push(this._composeTimelineEvent(subtask, employee, date, timeblock))
 				})
 			}
 		})
 
-		return events
+		return {
+			tasks,
+			blockers: blockers.filter(blocker => blocker.type != 'home_office'),
+			homeoffices: blockers.filter(blocker => blocker.type == 'home_office')
+		}
 	},
 
 	_composeTimelineEvent(subtask, employee, date, timeblock) {
@@ -118,7 +128,7 @@ export default {
 			})
 		}
 
-		return events
+		return {nonWorkingHours: events}
 	},
 
 	_getSplitFromDate(date, start) {