From d6cc0a64d9c5a1a4ca3f6634566b304a6041753e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Wed, 15 Feb 2023 16:13:12 +0100
Subject: [PATCH] .

---
 app/src/plugins/app/_config/App.vue           |  1 -
 app/src/plugins/tm@_store/store/index.ts      |  2 ++
 .../master-task/_mixins/selects.mixin.ts      |  8 ++++----
 .../plugins/tm@modal/task/z-task-modal.vue    | 19 +++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index 989ba97..3d28059 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -62,7 +62,6 @@ export default {
 		})
 
 		this.$events.on('show-team-modal', ({team}) => {
-			console.log('show team modal')
 			this.$refs['z-team-modal'].showModal(team)
 		})
 
diff --git a/app/src/plugins/tm@_store/store/index.ts b/app/src/plugins/tm@_store/store/index.ts
index b1d1ebb..2042d93 100644
--- a/app/src/plugins/tm@_store/store/index.ts
+++ b/app/src/plugins/tm@_store/store/index.ts
@@ -177,6 +177,8 @@ export default {
 		},
 
 		enrichedEmployees: (state: any) => {
+			if (!state.employees) return []
+			
 			return state.employees.map(employee => ({...employee, _fullName: `${ employee.name } ${ employee.surname }`}))
 		},
 
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 e30ffa8..0c14d81 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
@@ -24,10 +24,10 @@ export default {
 		},
 
 		onMasterTaskSelected({ key }) {
-			const masterTask = this.masterTasks.find(masterTask => masterTask.id == key)
-			this.task.master_task.name		= masterTask.name
-			this.task.master_task.id		= masterTask.id
-			this.task.project_code 			= masterTask.project_code
+			const mastertask = this.mastertasks.find(masterTask => masterTask.id == key)
+			this.task.master_task.name		= mastertask.name
+			this.task.master_task.id		= mastertask.id
+			this.task.project_code 			= mastertask.project_code
 		},
 
 		onEmployeeSelected({ key }) {
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 fb5b8ce..0ed5ab8 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -10,7 +10,7 @@
 				<v-card-actions class="d-flex flex-column modal-content">
 					<v-text-field v-model="task.project_code" label="Kód projektu" :value="task.project_code" @focus="onInputFocus" class="modal-input" variant="solo" disabled></v-text-field>
 
-					<Z-autocomplete label="Master task" :options="mastertasks.map((masterTask) => ({ key: masterTask.id, value: masterTask.name }))" :validations="v$.task.master_task.id" :clear-on-submit="false" :value="task.master_task.name" :class="{ error: v$.task.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
+					<Z-autocomplete label="Master task" :options="mastertasks.map((masterTask) => ({ key: masterTask.id, value: masterTask.name }))" :validations="v$.task.master_task.id" :clear-on-submit="false" :value="task?.master_task?.name" :class="{ error: v$.task.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
 
 					<v-select v-model="task.employee_id" @focus="onInputFocus" class="modal-input border-select" label="Priradený" :class="{ error: v$.task.employee_id.$errors.length }" variant="solo" :items="filteredEmployees" item-value="id" item-title="_fullName"></v-select>
 
@@ -99,16 +99,14 @@ export default {
 	computed: {
 		...mapGetters('tm', [
 			'mastertasks',
-			'employees'
+			'enrichedEmployees'
 		]),
 
 		filteredEmployees() {
-			if (!this.employees || !this.task?.master_task) return []
+			if (!this.enrichedEmployees || !this.task?.master_task) return []
 
 			const selectedEmployees = this.task.master_task.employees?.map((employee) => employee.id) || []
-			const filteredEmployees = this.employees.filter((employee) => !selectedEmployees.includes(employee.id))
-
-			return tmUtils.enrichEmployeesByFullName(filteredEmployees)
+			return this.enrichedEmployees.filter((employee) => !selectedEmployees.includes(employee.id))
 		}
 	},
 
@@ -143,6 +141,7 @@ export default {
 		async showModal(task, editMode = false, masterTask = {}) {
 			this.task = null
 			this.visible = true
+			this.$nextTick(() => this.v$.$reset())
 
 			try {
 
@@ -162,8 +161,6 @@ export default {
 
 		closeModal() {
 			this.visible = false
-			this.masterTaskIdSelect = null
-			this.$nextTick(() => this.v$.$reset())
 		},
 
 		async save() {
@@ -176,6 +173,7 @@ export default {
 					await this.$axios.put_auth_data(`v1/subtasks/${this.task.id}`, this.task)
 				} else {
 					const { subtask } = await this.$axios.post_auth(`v1/mastertasks/${this.task.master_task.id}/subtasks`, this.task)
+					console.log(subtask)
 					this.task.id = subtask.id
 				}
 
@@ -220,7 +218,7 @@ export default {
 
 		_enrichTask(task) {
 			task.master_task 		= this.mastertasks.find((masterTask) => masterTask.id == task.master_task_id)
-			task.employee 			= this.employees.find((employee) => employee.id == task.employee_id)
+			task.employee 			= this.enrichedEmployees.find((employee) => employee.id == task.employee_id)
 			this.masterTaskIdSelect = task.master_task.id
 
 			return task
@@ -237,7 +235,8 @@ export default {
 
 		"task.employee_id"(value) {
 			if (!value) return
-			this.task.employee = this.employees.find((employee) => employee.id == value)
+
+			this.task.employee = this.enrichedEmployees.find((employee) => employee.id == value)
 		},
 
 		editMode() {