[bugy & CR]

app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue

@@ -2,8 +2,10 @@
 	<v-table>
 		<thead>
 			<tr>
-				<th class="text-left">Kód projektu</th>
+				<th @click="getSelectedTimeblockDeadline" class="text-left">Kód projektu</th>
 				<th class="text-left">Názov</th>
+				<th class="text-left">Deadline</th>
+				<th class="text-left">Najbližší neuzavretý</th>
 				<th class="text-left">Naplánované</th>
 				<th class="text-left">Zostávajúce</th>
 				<th class="text-left">Akcia</th>
@@ -14,6 +16,13 @@
 			<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
 				<td>{{ subtask.project_code }}</td>
 				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
+				<td v-if="subtask.deadline">{{ getDeadline(subtask) }}</td>
+				<v-tooltip text="Deadline z Mastertasku" location="end">
+					<template v-slot:activator="{ props }">
+						<td v-if="!subtask.deadline" v-bind="props">{{ getDeadline(subtask) }}*</td>
+					</template>
+				</v-tooltip>
+				<td>{{ displayTimeblock(subtask) }}</td>
 				<td>{{ subtask.duration }} h</td>
 				<td>{{ (subtask.duration - subtask.spent_time).toFixed(2) }} h</td>
 				<td class="task-action">
@@ -31,6 +40,9 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import moment from 'moment'
+
 export default {
 	props: {
 		subtasks: {
@@ -38,6 +50,10 @@ export default {
 			required: true
 		}
 	},
+
+	computed: {
+		...mapGetters('tm', ['mastertasks'])
+	},
 	
 	methods: {
 		editTask(subtask, editMode = false) {
@@ -46,6 +62,34 @@ export default {
 
 		deleteTask(subtask) {
 			this.$events.emit('show-delete-task-modal', {subtask})
+		},
+
+		getDeadline(subtask) {
+			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') : ''
+		},
+
+		getSelectedTimeblockDeadline(timeblocks) {
+			const currentDate = moment()
+
+			const unfinishedTimeblocks = timeblocks.filter(tb => tb.is_finished === 0)
+			if (unfinishedTimeblocks.length > 0) return moment(unfinishedTimeblocks[0].end).format('DD.MM.yyyy, HH:mm')
+
+			const upcomingTimeblocks = timeblocks
+				.filter(tb => moment(tb.end).isAfter(currentDate))
+				.sort((a, b) => moment(a.end).diff(moment(b.end)))
+
+			if (upcomingTimeblocks.length > 0 && upcomingTimeblocks.is_finished === 0) return moment(upcomingTimeblocks[0].end).format('DD.MM.yyyy, HH:mm')
+
+			return ''
+		},
+
+		displayTimeblock(subtask) {
+			const timeblockDeadline = this.getSelectedTimeblockDeadline(subtask.timeblocks)
+
+			return timeblockDeadline !== '' ? timeblockDeadline : 'Žiadny termín'
 		}
 	}
 }

app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue

@@ -15,7 +15,12 @@
 
 				<td>{{ subtask.project_code }}</td>
 				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
-				<td>{{ getDeadline(subtask) }}</td>
+				<td v-if="subtask.deadline">{{ getDeadline(subtask) }}</td>
+				<v-tooltip text="Deadline z Mastertasku" location="end">
+					<template v-slot:activator="{ props }">
+						<td v-if="!subtask.deadline" v-bind="props">{{ getDeadline(subtask) }}*</td>
+					</template>
+				</v-tooltip>
 				<td>{{ subtask.spent_time }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">