From c93a5c7799b648d4df9d97795ea0a41bb4646e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Sun, 5 Mar 2023 20:09:20 +0100
Subject: [PATCH 1/2] [Master task] Edit fix

---
 .../projects/_components/a-project-calendar.vue     |  2 ++
 .../tm@modal/master-task/_mixins/selects.mixin.ts   |  4 ++--
 .../tm@modal/master-task/z-master-task-modal.vue    | 13 ++++++++++---
 app/src/plugins/tm@modal/task/z-task-modal.vue      |  2 +-
 app/src/plugins/w/auth/refreshExpired.ts            |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
index cfea543..2457224 100644
--- a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
+++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
@@ -79,6 +79,8 @@ export default {
 	&:deep(.fc-event-end)
 		border-top-right-radius: 30px
 		border-bottom-right-radius: 30px
+	&:deep(.fc-event-main)
+		color: black
 	&:deep(.fc-event)
 		font-size: 12px
 		padding-left: 10px
diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
index d2b4dea..2ebf323 100644
--- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
+++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
@@ -3,7 +3,7 @@ export default {
 		employeesOptions() {
 			const selectedEmployees = [...this.mastertask.employees].map(employee => employee.id)
 
-			const employees = this.employees.filter(
+			const employees = this.enrichedEmployees.filter(
 				(employee) => !selectedEmployees.includes(employee.id)
 			) || []
 
@@ -30,7 +30,7 @@ export default {
 		},
 
 		onEmployeeSelected({ key }) {
-			const employee = this.employees.find(employee => employee.id == key)
+			const employee = this.enrichedEmployees.find(employee => employee.id == key)
 			this.mastertask.employees.push(employee)
 			this.showAddEmployeeInput = false
 		},
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 9c22049..d5b3d80 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
@@ -58,7 +58,7 @@
 						<A-mastertask-description :mastertask="mastertask" />
 
 						<div class="d-flex justify-start align-center mt-8">
-							<v-btn class="button primary" @click="save()">Ukončiť mastertask</v-btn>
+							<v-btn class="button primary" @click="toggleIsFinished()">{{ mastertask.is_finished ? 'Otvoriť mastertask' : 'Ukončiť mastertask'}}</v-btn>
 						</div>
 
 						<A-tasks-table :subtasks="mastertask.subtasks" />
@@ -125,7 +125,8 @@ export default {
 	computed: {
 		...mapGetters('tm', [
 			'teams',
-			'projects'
+			'projects',
+			'enrichedEmployees'
 		])
 	},
 
@@ -193,10 +194,16 @@ export default {
 			}
 		},
 
+		toggleIsFinished() {
+			this.mastertask.is_finished = !this.mastertask.is_finished
+			this.save()
+		},
+
 		async save() {
 			if (!(await this.v$.$validate())) return
 
-			this.mastertask.description = this.$refs['description'].getHTML()
+			if (this.$refs['description'])
+				this.mastertask.description = this.$refs['description'].getHTML()
 
 			// this.mastertask.subtasks = this.mastertask.subtasks.map(subtask => {
 			// 	const employee = this.mastertask.employees.find(employee => employee.id == subtask.employee_id)
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 d650c8f..4e0093b 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -168,7 +168,7 @@ export default {
 			if (!(await this.v$.$validate()))
 				return
 
-			this.subtask.description = this.$refs["description"].getHTML()
+			this.subtask.description = this.$refs['description'].getHTML()
 
 			try {
 				if (this.subtask?.id) {
diff --git a/app/src/plugins/w/auth/refreshExpired.ts b/app/src/plugins/w/auth/refreshExpired.ts
index 1e1057f..a420c3c 100644
--- a/app/src/plugins/w/auth/refreshExpired.ts
+++ b/app/src/plugins/w/auth/refreshExpired.ts
@@ -6,7 +6,7 @@ async function _unauthorised(error: any) {
 	if (error?.response?.data?.message == 'Unauthenticated.')
 		return store.dispatch('auth/logout')
 	
-	return error
+	return Promise.reject(error)
 }
 
 axios.interceptors.response.use(

From 2a158a4798b90f7f8250272137ef866da4cfe260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Tue, 7 Mar 2023 22:47:52 +0100
Subject: [PATCH 2/2] [Filters] Height fix

---
 app/src/plugins/app/_theme/global.sass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/plugins/app/_theme/global.sass b/app/src/plugins/app/_theme/global.sass
index 9df904b..88e8ac0 100644
--- a/app/src/plugins/app/_theme/global.sass
+++ b/app/src/plugins/app/_theme/global.sass
@@ -96,4 +96,8 @@ input[type="time"]::-webkit-calendar-picker-indicator
 	z-index: 10000 !important
 
 .vld-overlay .vld-background
-	opacity: 1
\ No newline at end of file
+	opacity: 1
+
+.v-row.subheader
+	.v-input
+		height: 56px !important
\ No newline at end of file