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

[Refactoring]

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-03-03 10:36:11 +01:00
1 parent 26138f69b3
commit ca1cbd723a
25 files changed
+215 -206
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/app/_config/App.vue
+30 -23
View File
@@ -9,7 +9,7 @@
<Z-delete-team-modal ref="z-delete-team-modal" @update="onTeamUpdate" />
<Z-task-modal ref="z-task-modal" @on-subtask-edited="onTaskEdited" />
<Z-delete-task-modal ref="z-delete-task-modal" @on-task-deleted="onTaskDeleted" />
<Z-delete-task-modal ref="z-delete-task-modal" @on-subtask-deleted="onTaskDeleted" />
<Z-delete-master-task-modal ref="z-delete-master-task-modal" @on-mastertask-deleted="onMasterTaskDeleted" />
<Z-complete-task-modal ref="z-complete-task-modal" @on-subtask-edited="onTaskEdited" />
<Z-task-add-time-modal ref="z-task-add-time-modal" />
@@ -44,35 +44,35 @@ export default {
mounted() {
this.$events.on('show-delete-team-modal', ({team}) => {
this.$refs['z-delete-team-modal'].showModal(team)
this.$refs['z-delete-team-modal'].showModal({ team })
})
this.$events.on('show-team-modal', ({team}) => {
this.$refs['z-team-modal'].showModal(team)
this.$events.on('show-team-modal', ({ team }) => {
this.$refs['z-team-modal'].showModal({ team })
})
this.$events.on('show-delete-task-modal', ({task}) => {
this.$refs['z-delete-task-modal'].showModal(task)
this.$events.on('show-delete-task-modal', ({subtask}) => {
this.$refs['z-delete-task-modal'].showModal({subtask})
})
this.$events.on('show-delete-master-task-modal', ({mastertask}) => {
this.$refs['z-delete-master-task-modal'].showModal(mastertask)
this.$refs['z-delete-master-task-modal'].showModal({mastertask})
})
this.$events.on('show-task-modal', ({task, editMode, mastertask}) => {
if(task && task.id) {
const id = task.id
this.$router.push({ query: { 'task': id }})
this.$events.on('show-subtask-modal', ({subtask, editMode, mastertask}) => {
if(subtask && subtask.id) {
const id = subtask.id
this.$router.push({ query: { 'subtask': id }})
}
this.$refs['z-task-modal'].showModal(task, editMode, mastertask)
this.$refs['z-task-modal'].showModal({subtask, editMode, mastertask})
})
this.$events.on('show-master-task-modal', ({ mastertask, editMode }) => {
this.$events.on('show-mastertask-modal', ({ mastertask, editMode }) => {
if (mastertask && mastertask.id) {
const id = mastertask.id
this.$router.push({ query: { 'master-task': id } })
this.$router.push({ query: { 'mastertask': id } })
}
this.$refs['z-master-task-modal'].showModal(mastertask, editMode)
this.$refs['z-master-task-modal'].showModal({mastertask, editMode})
})
this.$events.on('show-complete-task-modal', ({ subtask }) => {
@@ -98,6 +98,8 @@ export default {
this.$events.on('on-mastertask-deleted', () => {
this.$store.dispatch('tm/reloadMastertasks')
})
this._showModalsAfterInicialization()
},
methods: {
@@ -106,7 +108,7 @@ export default {
},
onTaskDeleted(task) {
this.$events.emit('on-task-deleted', task)
this.$events.emit('on-subtask-deleted', task)
},
onTaskEdited(task) {
@@ -119,14 +121,19 @@ export default {
onMasterTaskEdited(mastertask){
this.$events.emit('on-mastertask-edited', mastertask)
}
},
},
watch: {
'$route'() {
// if (this.$route.query['master-task']) {
// this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
// }
_showModalsAfterInicialization(repeat = 0) {
setTimeout(() => {
if (repeat > 50)
return this.$router.push({name: this.$route.name})
else if (!this.$store.getters['tm/isInitialized'])
return this._showModalsAfterInicialization(repeat + 1)
else if (this.$route.query['mastertask'])
return this.$events.emit('show-mastertask-modal', { mastertask: { id: this.$route.query['mastertask'] }, editMode: false })
else if (this.$route.query['subtask'])
return this.$events.emit('show-subtask-modal', { subtask: { id: this.$route.query['subtask'] }, editMode: false })
}, 300)
}
}
}