From 6b73deb0f44891ab93092e2629b1c3b668634085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 2 Mar 2023 09:05:59 +0100
Subject: [PATCH] [Master task] Created_by fix

---
 app/src/plugins/app/_config/App.vue                |  6 +++---
 .../_components/read-only/z-created-by.vue         | 14 ++++++++++++--
 .../_components/a-mastertask-description.vue       |  2 +-
 .../task/_components/z-task-readonly-info.vue      |  6 +++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index d2f4d98..3264442 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -124,9 +124,9 @@ export default {
 
 	watch: {
 		'$route'() {
-			if (this.$route.query['master-task']) {
-				this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
-			}
+			// if (this.$route.query['master-task']) {
+			// 	this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
+			// }
 		}
 	}
 }
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
index dbf4411..79242bc 100644
--- a/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
+++ b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
@@ -21,12 +21,22 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
 	props: {
-		employee: {
-			type: [Object, Number],
+		employeeId: {
+			type: [Number],
 			required: false
 		}
+	},
+
+	computed: {
+		...mapGetters('tm', ['enrichedEmployees']),
+
+		employee() {
+			return this.enrichedEmployees.find(employee => employee.id == this.employeeId)
+		}
 	}
 }
 </script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
index 43f3bb8..30abd81 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
@@ -1,7 +1,7 @@
 <template>
 	<Z-status 				:status="mastertask.is_finished" />
 	<Z-deadline 			:deadline="mastertask.deadline" />
-	<Z-created-by 			:employee="mastertask.created_by" />
+	<Z-created-by 			:employee-id="mastertask.created_by" />
 	<Z-team 				:team="mastertask.team" :employees="mastertask.employees" />
 	<Z-planned-time        	:hours="mastertask.duration" />
     <Z-remaining-time      	:hours="mastertask.duration - mastertask.time_worked" />
diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
index c0d531f..19fb862 100644
--- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
@@ -2,7 +2,7 @@
 	<A-mastertask-name      	:name="task.master_task?.name || task.master_task" :id="task.master_task.id" :color="task.master_task.color" @close-modal="$emit('close-modal')" />
     <A-mastertask-status    	:status="task.is_finished" />
 	<A-task-timeblocks			:timeblocks="task.timeblocks" :task="task" />
-    <A-task-assigned-by  		:employee="task._created_by" v-if="task._created_by" />
+    <Z-created-by 				:employee-id="task.created_by" />
     <A-task-assigned-employee  	:employee="task.employee" />
     <A-task-planned-time        :hours="task.duration" />
     <A-task-remaining-time      :hours="task.duration - task.spent_time" />
@@ -15,7 +15,7 @@
 import AMastertaskName          from './_components/a-mastertask-name.vue'
 import AMastertaskStatus        from './_components/a-mastertask-status.vue'
 import ATaskTimeblocks    		from './_components/a-task-timeblocks.vue'
-import ATaskAssignedBy    		from './_components/a-task-assigned-by.vue'
+import ZCreatedBy    			from '../../_components/read-only/z-created-by.vue'
 import ATaskAssignedEmployee    from './_components/a-task-assigned-employee.vue'
 import ATaskPlannedTime         from './_components/a-task-planned-time.vue'
 import ATaskSpentTime           from './_components/a-task-spent-time.vue'
@@ -31,7 +31,7 @@ export default {
         AMastertaskName,
         AMastertaskStatus,
 		ATaskTimeblocks,
-		ATaskAssignedBy,
+		ZCreatedBy,
         ATaskAssignedEmployee,
         ATaskPlannedTime,
         ATaskSpentTime,