From 7457616e0c006ceddebb2957a2e20cca0e4d05bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 17 Oct 2024 08:30:09 +0200
Subject: [PATCH 1/3] [Master Task] Added option to remove current team

---
 .../master-task/z-master-task-modal.vue       | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

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 ece524b..d125133 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
@@ -23,7 +23,7 @@
 
 					<v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" :label="`${mastertask.duration} h`" :disabled="true"></v-text-field>
 
-					<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="mastertask.id"></v-select>
+					<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="mastertask.id" :clearable="true" />
 
 					<template v-if="!mastertask.id">
 						<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
@@ -31,7 +31,7 @@
 								{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}
 							</p>
 
-							<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close" size="small"></v-icon>
+							<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close-circle" size="default"></v-icon>
 						</v-text-field>
 					</template>
 
@@ -42,7 +42,7 @@
 								{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}
 							</p>
 
-							<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close" size="small"></v-icon>
+							<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close-circle" size="default"></v-icon>
 						</v-text-field>
 					</template>
 
@@ -446,19 +446,21 @@ export default {
 	background: #6200EE
 	color: #fff
 	border-radius: 50%
-	padding: 13px
 	font-size: 11.5px
-	height: 24px
-	width: 24px
+	height: 22px
+	width: 22px
 	position: absolute
 	top: 50%
-	right: 0
-	transform: translate(-120%, -50%)
+	right: 12px
+	transform: translate(0, -50%)
 
 .remove-input
 	position: absolute
 	top: 50%
-	transform: translate(120%, -50%)
+	right: 0px
+	transform: translate(-15px, -50%)
+	color: rgb(102, 102, 102) !important
+	z-index: 10
 	cursor: pointer
 
 .scrolling
@@ -472,4 +474,7 @@ export default {
 	color: #7f39fb !important
 	height: 53px
 	text-align: center
+
+:deep(.v-field__clearable)
+	opacity: 1 !important
 </style>

From 8a0e9072c10f8da09c4b72df49870fce485977ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 17 Oct 2024 08:36:08 +0200
Subject: [PATCH 2/3] [Fix] Handling of deleted employee in master task

---
 .../master-task/_components/a-tasks-table.vue       |  4 ++--
 .../tm@modal/master-task/z-master-task-modal.vue    | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
index 187e9ef..3d71c97 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
@@ -47,8 +47,8 @@ export default {
 
 				return {
 					...subtask,
-					_employeeInitials: employee._initials,
-					_employeeFullName: employee._fullName
+					_employeeInitials: employee ? employee._initials : '?',
+					_employeeFullName: employee ? employee._fullName : ''
 				}
 			})
 		}
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 d125133..b44d7c9 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
@@ -23,7 +23,7 @@
 
 					<v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" :label="`${mastertask.duration} h`" :disabled="true"></v-text-field>
 
-					<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="mastertask.id" :clearable="true" />
+					<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="!!mastertask.id" :clearable="true" />
 
 					<template v-if="!mastertask.id">
 						<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
@@ -50,7 +50,7 @@
 
 					<!-- <Z-autocomplete label="Vyhľadať zamestnanca"  :options="employeesOptions" class="modal-input" @option-selected="onEmployeeSelected" /> -->
 
-					<v-btn :disabled="mastertask.id" class="w-100 mb-5 button secondary" :class="{error: v$.mastertask.project_id.$errors.length}" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
+					<v-btn :disabled="!!mastertask.id" class="w-100 mb-5 button secondary" :class="{error: v$.mastertask.project_id.$errors.length}" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
 
 					<div class="w-100 modal-input" :class="{ error: v$.mastertask.description.$errors.length }">
 						<QuillEditor ref="description" v-model="mastertask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @keyup="onQuillEditorInput" />
@@ -170,7 +170,7 @@ export default {
 					_initials: employee ? employee.name.charAt(0) + employee.surname.charAt(0) : '?',
 					_fullName: employee ? `${employee.name} ${employee.surname}` : ''
 				}
-			})
+			}).filter(subtask => subtask !== null)
 		}
 	},
 
@@ -275,10 +275,15 @@ export default {
 
 					this.mastertask._allEmployees = this.mastertask.subtasks.map(({ employee_id, duration}) => {
 						const employee = this.enrichedEmployees.find(({ id }) => id == employee_id)
+
+						if (!employee) {
+							return null
+						}
+
 						employee.duration = duration
 
 						return employee
-					})
+					}).filter(employee => employee !== null)
 
 					// this.mastertask.project_code 	= project.code
 				} else {

From a00ce421df559d1b2e0db73d89adb25e4e4fe541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 17 Oct 2024 19:02:14 +0200
Subject: [PATCH 3/3] [Bug] Fixed for deleted employee

---
 .../master-task/_components/a-tasks-table.vue   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
index 3d71c97..ba72bfa 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
@@ -16,10 +16,10 @@
 				</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">
-						<img v-if="subtask.is_finished" class="pencil-icon is-finished" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)">
-						<img v-if="!subtask.is_finished" class="pencil-icon" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)">
-						<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="openTaskModal(subtask)">
-						<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(subtask)">
+						<img v-if="subtask.is_finished" class="pencil-icon is-finished" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)" />
+						<img v-if="!subtask.is_finished" class="pencil-icon" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)" />
+						<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="openTaskModal(subtask)" />
+						<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(subtask)" />
 					</div>
 				</td>
 			</tr>
@@ -35,15 +35,15 @@ export default {
 		subtasks: {
 			type: Array,
 			required: true
-		},
+		}
 	},
 
 	computed: {
 		...mapGetters('tm', ['enrichedEmployees']),
 
 		enrichedtasks() {
-			return this.subtasks.map(subtask => {
-				const employee = this.enrichedEmployees.find(employee => employee.id == subtask.employee_id)
+			return this.subtasks.map((subtask) => {
+				const employee = this.enrichedEmployees.find((employee) => employee.id == subtask.employee_id)
 
 				return {
 					...subtask,
@@ -54,7 +54,6 @@ export default {
 		}
 	},
 
-
 	methods: {
 		openDeleteTaskModal(subtask) {
 			this.$events.emit('show-delete-task-modal', { subtask })
@@ -85,4 +84,4 @@ td:not(:last-child)
 	-webkit-box-orient: vertical
 	overflow: hidden
 	text-overflow: ellipsis
-</style>
\ No newline at end of file
+</style>