mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[TODO FIXES]
This commit is contained in:
1 parent
cb44878dcb
commit
f0f8dde0b6
9 files changed
+26
-16
No files matched your search
@@ -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,6 +53,7 @@ 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) : ''
|
||||
|
||||
@@ -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)
|
||||
@@ -262,6 +262,7 @@ export default {
|
||||
},
|
||||
|
||||
getDeadline(subtask) {
|
||||
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||
if (subtask?.deadline)
|
||||
return subtask.deadline
|
||||
|
||||
|
||||
@@ -393,6 +393,7 @@ 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
|
||||
|
||||
Reference in new issue
Block a user