Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app

app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue

@@ -10,7 +10,7 @@
 		</v-col>
 		<v-col cols="7">
 			<v-sheet class="py-3">
-				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }} {{ deadlineTime }}</p> 
+				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }} {{ deadlineTime }}</p>
 				<v-tooltip v-else text="Deadline z Mastertasku" location="end">
 					<template v-slot:activator="{ props }">
 						<span class="cursor-pointer" v-bind="props">{{ getMasterTaskDeadline(subtask) }}*</span>
@@ -53,9 +53,10 @@ export default {
 
 	methods: {
 		getMasterTaskDeadline(subtask) {
-			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
 		}
 	}
 }

app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue

@@ -110,7 +110,7 @@ export default {
 
 	validations() {
 		return {
-			form: { 
+			form: {
 				date: { required },
 				starts_at_time: { required },
 				ends_at_time: { required }
@@ -202,7 +202,7 @@ export default {
 				subtask.timeblocks = subtask.timeblocks.map(originalTimeblock => {
 					if (originalTimeblock.id == newTimeblock.id)
 						return newTimeblock
-					
+
 					return originalTimeblock
 				})
 
@@ -252,7 +252,7 @@ export default {
 
 			const mDate = moment(this.form.date)
 			const mDeadline = moment(deadline)
-			
+
 			const [hours, minutes] = this.form.ends_at_time.split(':').map(Number)
 
 			mDate.hours(hours)
@@ -265,11 +265,7 @@ export default {
 			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() {

app/src/plugins/tm@modal/task/z-task-modal.vue

@@ -342,7 +342,6 @@ export default {
 					this.$events.emit('task-created')
 					this.$events.emit('close-both-modals')
 				}
-
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(this.$parseError(error))