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

[production] endpoints update

Browse Source
This commit is contained in:
romankko2 committed 2024-01-26 19:10:08 +01:00
1 parent bb262c1348
commit 5578cc9c76
12 files changed
+29 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/.env
+2 -1
View File
@@ -1 +1,2 @@
VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
# VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/
app/src/plugins/tm@_store/store/index.ts
+10 -9
View File
@@ -66,20 +66,20 @@ export default {
state.unscheduledSubtasks = state.unscheduledSubtasks.map(st => st.id == subtask.id ? subtask : st)
state.ongoingSubtasks = state.ongoingSubtasks.map(st => st.id == subtask.id ? subtask : st)
state.mastertasks = state.mastertasks.map(mastertask => {
mastertask.subtasks = mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st)
return mastertask
})
// state.mastertasks = state.mastertasks.map(mastertask => {
// mastertask.subtasks = mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st)
// return mastertask
// })
},
delete_subtask(state: any, subtask: any) {
state.unscheduledSubtasks = state.unscheduledSubtasks.filter(st => st.id != subtask.id)
state.ongoingSubtasks = state.ongoingSubtasks.filter(st => st.id != subtask.id)
state.mastertasks = state.mastertasks.map(mastertask => {
mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id)
return mastertask
})
// state.mastertasks = state.mastertasks.map(mastertask => {
// mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id)
// return mastertask
// })
},
initialized(state: any) {
@@ -116,7 +116,8 @@ export default {
loadMastertasks({commit}: {commit: any}) {
return new Promise((resolve, reject) => {
axios.get_auth('v1/mastertasks')
// axios.get_auth('v1/mastertasks')
axios.get_auth('v1/mastertasks/?simple=true')
.then(({ mastertasks }) => {
commit('set_mastertasks', mastertasks)
resolve(mastertasks)
app/src/plugins/tm@dashboard/_components/z-timeline.vue
+1 -10
View File
@@ -157,10 +157,6 @@ export default {
}
},
async created() {
console.log('splits', this.splits)
},
data() {
return {
vueCalConfig: {
@@ -202,15 +198,10 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
if (subtask?.deadline)
return subtask.deadline
if (!this.mastertasks)
return null
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
return masterTask.deadline
return subtask.master_task_deadline
},
weekChanged() {
app/src/plugins/tm@dashboard/projects/projects.vue
-2
View File
@@ -30,7 +30,6 @@ 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
@@ -124,7 +123,6 @@ 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/master-task/z-master-task-modal.vue
+1 -1
View File
@@ -28,7 +28,7 @@
<template v-if="!mastertask.id">
<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
<p class="employee-select-avatar d-flex justify-center align-center">
{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}
{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}+ľš21s
</p>
<v-icon @click.stop="removeEmployee(employee)" class="remove-input" icon="mdi-close" size="small"></v-icon>
app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
+4 -4
View File
@@ -53,10 +53,10 @@ 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) : ''
if (subtask?.deadline)
return subtask.deadline
return subtask.master_task_deadline
}
}
}
app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+1 -6
View File
@@ -262,15 +262,10 @@ export default {
},
getDeadline(subtask) {
// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
if (subtask?.deadline)
return subtask.deadline
if (!this.mastertasks)
return null
const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
return masterTask.deadline
return subtask.master_task_deadline
},
closeModal() {
app/src/plugins/tm@modal/task/z-task-modal.vue
-2
View File
@@ -296,7 +296,6 @@ export default {
this.$events.emit('task-created')
this.$events.emit('close-both-modals')
}
this.closeModal()
} catch (error) {
this.$toast.error(this.$parseError(error))
@@ -393,7 +392,6 @@ 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
+4 -5
View File
@@ -65,11 +65,10 @@ 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)
return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
if (subtask?.deadline)
return moment(subtask.deadline).format('DD.MM.yyyy')
return moment(subtask.master_task_deadline).format('DD.MM.yyyy')
},
getSelectedTimeblockDeadline(timeblocks) {
app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
+1 -4
View File
@@ -97,10 +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 : ''
return subtask.master_task_deadline
}
}
}
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+4 -5
View File
@@ -60,11 +60,10 @@ 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)
return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
if (subtask?.deadline)
return moment(subtask.deadline).format('DD.MM.yyyy')
return moment(subtask.master_task_deadline).format('DD.MM.yyyy')
}
}
}
app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
+1 -4
View File
@@ -96,10 +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 : ''
return subtask.master_task_deadline
}
}
}