From c94327a9b70c1ab843e1dff526e2542d38e066ba Mon Sep 17 00:00:00 2001
From: romankko2 <romokravarik@gmail.com>
Date: Tue, 6 Jun 2023 23:09:25 +0200
Subject: [PATCH] bugs

---
 app/src/plugins/tm@dashboard/_components/z-timeline.vue   | 2 +-
 .../projects/_components/a-project-filter.vue             | 8 +++++---
 .../plugins/tm@modal/master-task/z-master-task-modal.vue  | 2 +-
 app/src/plugins/tm@modal/task/z-task-modal.vue            | 2 +-
 .../plugins/tm@overview/_components/z-tasks-search.vue    | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index b6029e4..d985f51 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -65,7 +65,7 @@
 					</div>
 				</div>
 
-				<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished ? '#dedfe0' : event.color || event.subtask.color}">
+				<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished || event.subtask.is_finished ? '#dedfe0' : event.color || event.subtask.color}">
 					<div class="event-content" :class="{'is-blocker': event.isBlocker}"> 
 						<template v-if="event.type == 'subtask'">
 							<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small>
diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
index 1323c7c..6eb98e2 100644
--- a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
+++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
@@ -4,9 +4,11 @@
 
 		<v-select v-model="filter.teamId" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
 
-		<v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" />
-		
-		<v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
+		<!-- <v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" /> -->
+		<v-autocomplete v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" item-title="_fullName" item-value="id" label="Zamestnanec" variant="outlined" />
+
+		<!-- <v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" /> -->
+		<v-autocomplete v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
 
 		<v-select v-model="filter.month" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
 
diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
index 6067912..ad2fdf7 100644
--- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
@@ -305,7 +305,7 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['description']?.setHTML(this.mastertask.description || '')
 
-				if (!this.mastertask) return
+				if (!this.mastertask?.id) return
 
 				const date = new Date(this.mastertask.deadline)
 				const hours = date.getHours()
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index ded258f..ae1c2a9 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -92,7 +92,7 @@
 						<div class="d-flex justify-start align-center mt-8">
 							<v-btn class="done-btn" v-if="!subtask.is_finished" @click.stop="showCompleteTaskModal()">Dokončiť</v-btn>
 							<v-btn class="button secondary" v-else @click.stop="showCompleteTaskModal()">Znovu otvoriť</v-btn>
-							<v-btn class="button secondary" @click="save()">Uložiť zmeny</v-btn>
+							<v-btn class="button secondary" @click="closeModal()">Uložiť zmeny</v-btn>
 						</div>
 					</div>
 				</v-card-actions>
diff --git a/app/src/plugins/tm@overview/_components/z-tasks-search.vue b/app/src/plugins/tm@overview/_components/z-tasks-search.vue
index 37fe822..3c49649 100644
--- a/app/src/plugins/tm@overview/_components/z-tasks-search.vue
+++ b/app/src/plugins/tm@overview/_components/z-tasks-search.vue
@@ -1,14 +1,14 @@
 <template>
 	<v-row class="px-10 py-8 subheader">
-		<v-select
+		<v-autocomplete 
 			v-model="selectedEmployeeId"
 			class="subheader-input"
 			variant="outlined"
 			label="Zamestanec"
-			:items="[null, ...enrichedEmployees]"
+			:items="enrichedEmployees"
 			item-title="_fullName"
 			item-value="id"
-		></v-select>
+		/>
 
 		<v-text-field
 			v-model="searchQuery"