From 5578cc9c7633e0018657b7260c1d6210d8bb5efd Mon Sep 17 00:00:00 2001
From: romankko2 <romokravarik@gmail.com>
Date: Fri, 26 Jan 2024 19:10:08 +0100
Subject: [PATCH] [production] endpoints update

---
 app/.env                                      |  3 ++-
 app/src/plugins/tm@_store/store/index.ts      | 19 ++++++++++---------
 .../tm@dashboard/_components/z-timeline.vue   | 11 +----------
 .../tm@dashboard/projects/projects.vue        |  2 --
 .../master-task/z-master-task-modal.vue       |  2 +-
 .../_components/a-task-deadline.vue           |  8 ++++----
 .../_components/a-task-timeblocks.vue         |  7 +------
 .../plugins/tm@modal/task/z-task-modal.vue    |  2 --
 .../_components/a-ongoing-table.vue           |  9 ++++-----
 .../tasks-ongoing/tasks-ongoing.vue           |  5 +----
 .../_components/a-unscheduled-table.vue       |  9 ++++-----
 .../tasks-unscheduled/tasks-unscheduled.vue   |  5 +----
 12 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/app/.env b/app/.env
index 12e0b59..d37cd60 100644
--- a/app/.env
+++ b/app/.env
@@ -1 +1,2 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
+# VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
+VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/
diff --git a/app/src/plugins/tm@_store/store/index.ts b/app/src/plugins/tm@_store/store/index.ts
index 919f8e1..d4ce017 100644
--- a/app/src/plugins/tm@_store/store/index.ts
+++ b/app/src/plugins/tm@_store/store/index.ts
@@ -66,20 +66,20 @@ export default {
 			state.unscheduledSubtasks 	= state.unscheduledSubtasks.map(st 		=> st.id == subtask.id ? subtask : st)
 			state.ongoingSubtasks 		= state.ongoingSubtasks.map(st 			=> st.id == subtask.id ? subtask : st)
 			
-			state.mastertasks 			= state.mastertasks.map(mastertask 		=> {
-				mastertask.subtasks 	= mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st)
-				return mastertask
-			})
+			// state.mastertasks 			= state.mastertasks.map(mastertask 		=> {
+			// 	mastertask.subtasks 	= mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st)
+			// 	return mastertask
+			// })
 		},
 
 		delete_subtask(state: any, subtask: any) {
 			state.unscheduledSubtasks 	= state.unscheduledSubtasks.filter(st 	=> st.id != subtask.id)
 			state.ongoingSubtasks 		= state.ongoingSubtasks.filter(st 		=> st.id != subtask.id)
 
-			state.mastertasks 			= state.mastertasks.map(mastertask 		=> {
-				mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id)
-				return mastertask
-			})
+			// state.mastertasks 			= state.mastertasks.map(mastertask 		=> {
+			// 	mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id)
+			// 	return mastertask
+			// })
 		},
 
 		initialized(state: any) {
@@ -116,7 +116,8 @@ export default {
 
 		loadMastertasks({commit}: {commit: any}) {
 			return new Promise((resolve, reject) => {
-				axios.get_auth('v1/mastertasks')
+				// axios.get_auth('v1/mastertasks')
+				axios.get_auth('v1/mastertasks/?simple=true')
 					.then(({ mastertasks }) => {
 						commit('set_mastertasks', mastertasks)
 						resolve(mastertasks)
diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index aef6302..790d58b 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -157,10 +157,6 @@ export default {
 		}
 	},
 
-	async created() {
-		console.log('splits', this.splits)
-	},
-
 	data() {
 		return {
 			vueCalConfig: {
@@ -202,15 +198,10 @@ export default {
 		},
 
 		getDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if (subtask?.deadline)
 				return subtask.deadline
 
-			if (!this.mastertasks)
-				return null
-
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return masterTask.deadline
+			return subtask.master_task_deadline
 		},
 
 		weekChanged() {
diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue
index fb4a055..ab943fe 100644
--- a/app/src/plugins/tm@dashboard/projects/projects.vue
+++ b/app/src/plugins/tm@dashboard/projects/projects.vue
@@ -30,7 +30,6 @@ export default {
 
 	computed: {
 		filteredProjects() {
-			// FIX: KRAVARIK pozriet co sa robi tunak, a ci staci vytiahnut mastertasky z BE podla date range
 			if (!this.mastertasks)
 				return null
 
@@ -124,7 +123,6 @@ export default {
 		},
 
 		openMasterTaskModal(mastertaskId) {
-			// FIX: Request na BE pre mastertasks/{id}
 			const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
 			this.$events.emit('show-mastertask-modal', {mastertask, editMode: 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 d786a4a..9575693 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
@@ -28,7 +28,7 @@
 					<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">
 							<p class="employee-select-avatar d-flex justify-center align-center">
-								{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}
+								{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}+ľš21s
 							</p>
 
 							<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close" size="small"></v-icon>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
index 42bbe5d..1b7341b 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
@@ -53,10 +53,10 @@ export default {
 
 	methods: {
 		getMasterTaskDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
-			if(!this.mastertasks) return ''
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return tmUtils.formatDateTime(masterTask) ? tmUtils.formatDateTime(masterTask.deadline) : ''
+			if (subtask?.deadline)
+				return subtask.deadline
+
+			return subtask.master_task_deadline
 		}
 	}
 }
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index dd0863d..c57cbaf 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -262,15 +262,10 @@ export default {
 		},
 
 		getDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if (subtask?.deadline)
 				return subtask.deadline
 
-			if (!this.mastertasks)
-				return null
-
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return masterTask.deadline
+			return subtask.master_task_deadline
 		},
 
 		closeModal() {
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 8123041..96632e0 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -296,7 +296,6 @@ export default {
 					this.$events.emit('task-created')
 					this.$events.emit('close-both-modals')
 				}
-
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(this.$parseError(error))
@@ -393,7 +392,6 @@ export default {
 		},
 
 		'subtask.master_task_id'(value) {
-			// FIX: Request na BE pre mastertasks/{id}
 			if (!value) return
 			this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
 			this.subtask.project_code = this.subtask._master_task?.project_code || null
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index 73d2893..183463f 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -65,11 +65,10 @@ export default {
 		},
 
 		getDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
-			if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
-			else if(!this.mastertasks) return ''
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
+			if (subtask?.deadline)
+				return moment(subtask.deadline).format('DD.MM.yyyy')
+
+			return moment(subtask.master_task_deadline).format('DD.MM.yyyy')
 		},
 
 		getSelectedTimeblockDeadline(timeblocks) {
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue b/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
index 0d3619a..0fdfa6f 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
@@ -97,10 +97,7 @@ export default {
 		},
 
 		getMasterTaskDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
-			if(!this.mastertasks) return ''
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return masterTask ? masterTask.deadline : ''
+			return subtask.master_task_deadline
 		}
 	}
 }
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index 4562ae5..597dd56 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -60,11 +60,10 @@ export default {
 		},
 
 		getDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
-			if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
-			else if(!this.mastertasks) return ''
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
+			if (subtask?.deadline)
+				return moment(subtask.deadline).format('DD.MM.yyyy')
+
+			return moment(subtask.master_task_deadline).format('DD.MM.yyyy')
 		}
 	}
 }
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue b/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
index 0c3c180..4e6ac3a 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
@@ -96,10 +96,7 @@ export default {
 		},
 
 		getMasterTaskDeadline(subtask) {
-			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
-			if(!this.mastertasks) return ''
-			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
-			return masterTask ? masterTask.deadline : ''
+			return subtask.master_task_deadline
 		}
 	}
 }