JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
romankko2 committed 2024-01-26 12:41:18 +01:00
2 parents 2cc7224d21 f0f8dde0b6
commit bb262c1348
9 files changed
+10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/_components/z-timeline.vue
+1
View File
@@ -202,6 +202,7 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
if (subtask?.deadline)
return subtask.deadline
app/src/plugins/tm@dashboard/projects/projects.vue
+2
View File
@@ -30,6 +30,7 @@ export default {
computed: {
filteredProjects() {
// FIX: KRAVARIK pozriet co sa robi tunak, a ci staci vytiahnut mastertasky z BE podla date range
if (!this.mastertasks)
return null
@@ -123,6 +124,7 @@ export default {
},
openMasterTaskModal(mastertaskId) {
// FIX: Request na BE pre mastertasks/{id}
const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
this.$events.emit('show-mastertask-modal', {mastertask, editMode: false})
}
app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
+1
View File
@@ -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) : ''
app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+1
View File
@@ -262,6 +262,7 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
if (subtask?.deadline)
return subtask.deadline
app/src/plugins/tm@modal/task/z-task-modal.vue
+1
View File
@@ -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
app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+1
View File
@@ -65,6 +65,7 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
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)
app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
+1
View File
@@ -97,6 +97,7 @@ export default {
},
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 masterTask ? masterTask.deadline : ''
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+1
View File
@@ -60,6 +60,7 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
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)
app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
+1
View File
@@ -96,6 +96,7 @@ export default {
},
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 masterTask ? masterTask.deadline : ''