mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production
This commit is contained in:
commit
bb262c1348
9 files changed
+10
No files matched your search
@@ -202,6 +202,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getDeadline(subtask) {
|
getDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if (subtask?.deadline)
|
if (subtask?.deadline)
|
||||||
return subtask.deadline
|
return subtask.deadline
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ export default {
|
|||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
filteredProjects() {
|
filteredProjects() {
|
||||||
|
// FIX: KRAVARIK pozriet co sa robi tunak, a ci staci vytiahnut mastertasky z BE podla date range
|
||||||
if (!this.mastertasks)
|
if (!this.mastertasks)
|
||||||
return null
|
return null
|
||||||
|
|
||||||
@@ -123,6 +124,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
openMasterTaskModal(mastertaskId) {
|
openMasterTaskModal(mastertaskId) {
|
||||||
|
// FIX: Request na BE pre mastertasks/{id}
|
||||||
const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
|
const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
|
||||||
this.$events.emit('show-mastertask-modal', {mastertask, editMode: false})
|
this.$events.emit('show-mastertask-modal', {mastertask, editMode: false})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ export default {
|
|||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
getMasterTaskDeadline(subtask) {
|
getMasterTaskDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if(!this.mastertasks) return ''
|
if(!this.mastertasks) return ''
|
||||||
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
||||||
return tmUtils.formatDateTime(masterTask) ? tmUtils.formatDateTime(masterTask.deadline) : ''
|
return tmUtils.formatDateTime(masterTask) ? tmUtils.formatDateTime(masterTask.deadline) : ''
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getDeadline(subtask) {
|
getDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if (subtask?.deadline)
|
if (subtask?.deadline)
|
||||||
return subtask.deadline
|
return subtask.deadline
|
||||||
|
|
||||||
|
|||||||
@@ -393,6 +393,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
'subtask.master_task_id'(value) {
|
'subtask.master_task_id'(value) {
|
||||||
|
// FIX: Request na BE pre mastertasks/{id}
|
||||||
if (!value) return
|
if (!value) return
|
||||||
this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
|
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
|
this.subtask.project_code = this.subtask._master_task?.project_code || null
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getDeadline(subtask) {
|
getDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
|
if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
|
||||||
else if(!this.mastertasks) return ''
|
else if(!this.mastertasks) return ''
|
||||||
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getMasterTaskDeadline(subtask) {
|
getMasterTaskDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if(!this.mastertasks) return ''
|
if(!this.mastertasks) return ''
|
||||||
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
||||||
return masterTask ? masterTask.deadline : ''
|
return masterTask ? masterTask.deadline : ''
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getDeadline(subtask) {
|
getDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
|
if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
|
||||||
else if(!this.mastertasks) return ''
|
else if(!this.mastertasks) return ''
|
||||||
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getMasterTaskDeadline(subtask) {
|
getMasterTaskDeadline(subtask) {
|
||||||
|
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
|
||||||
if(!this.mastertasks) return ''
|
if(!this.mastertasks) return ''
|
||||||
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
|
||||||
return masterTask ? masterTask.deadline : ''
|
return masterTask ? masterTask.deadline : ''
|
||||||
|
|||||||
Reference in new issue
Block a user