bugy + CR

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

@@ -10,28 +10,46 @@
 		</v-col>
 		<v-col cols="7">
 			<v-sheet class="py-3">
-				<p v-if="deadline" :class="`${tmUtils.isAfter(deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(deadline) }}</p>
-				<p v-else>Tento task nema určený deadline</p>
+				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }}</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>
+					</template>
+				</v-tooltip>
 			</v-sheet>
 		</v-col>
 	</v-row>
 </template>
 
 <script>
-import tmUtils from '@/plugins/tm@_utils/tm.utils'
+import tmUtils 			from '@/plugins/tm@_utils/tm.utils'
+import moment 			from 'moment'
+import { mapGetters } 	from 'vuex'
 
 export default {
 	props: {
-		deadline: {
+		subtask: {
 			type: [String, Object, null],
 			required: true
 		}
 	},
 
+	computed: {
+		...mapGetters('tm', ['mastertasks'])
+	},
+
 	data() {
 		return {
 			tmUtils
 		}
+	},
+
+	methods: {
+		getMasterTaskDeadline(subtask) {
+			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') : ''
+		}
 	}
 }
 </script>

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

@@ -1,7 +1,7 @@
 <template>
 	<A-mastertask-name      	:name="subtask._master_task.name" :id="subtask.master_task_id" :color="subtask._master_task.color" @close-modal="$emit('close-modal')" />
     <A-mastertask-status    	:isFinished="subtask.is_finished" />
-	<A-task-deadline 			:deadline="subtask.deadline" />
+	<A-task-deadline 			:subtask="subtask" />
 	<A-task-timeblocks			:timeblocks="subtask.timeblocks" :subtask="subtask" @update-subtask="$emit('update-subtask', $event)" />
     <Z-created-by 				:employee-id="subtask.created_by" />
     <A-task-assigned-employee  	:employee="subtask._employee" />