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

Feat(task) Added estimated hours, fixed edit for office tasks

Browse Source
This commit is contained in:
Matej Glasnák committed 2024-11-08 16:19:45 +01:00
1 parent 687681865c
commit 86bc41450e
10 files changed
+72 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+6 -10
View File
@@ -30,7 +30,7 @@
<div class="d-flex justify-start align-center">
<!-- TODO office365: Only for office365 events -->
<template v-if="true">
<img class="pencil-icon" :src="eye" @click.stop="editOfficeEvent(subtask)">
<img class="pencil-icon" :src="eye" @click.stop="editTask(subtask, false)">
<img class="office-icon" :src="office365" />
</template>
@@ -75,14 +75,14 @@ export default {
methods: {
editTask(subtask, editMode = false) {
// TODO office365: Only for office365 events
return this.editOfficeEvent(subtask)
// this.$events.emit('show-subtask-modal', {subtask, editMode})
this.$events.emit('show-subtask-modal', {subtask, editMode})
},
deleteTask(subtask) {
this.$events.emit('show-delete-task-modal', {subtask})
// TODO office365: Only for office365 events
this.$events.emit('show-unable-to-edit-office-task-modal', { mode: 'delete' })
// this.$events.emit('show-delete-task-modal', {subtask})
},
getDeadline(subtask) {
@@ -111,10 +111,6 @@ export default {
const timeblockDeadline = this.getSelectedTimeblockDeadline(subtask.timeblocks)
return timeblockDeadline !== '' ? timeblockDeadline : 'Žiadny termín'
},
editOfficeEvent(subtask) {
this.$events.emit('show-unable-to-edit-office-task-modal', { subtask })
}
}
}
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+4 -9
View File
@@ -69,14 +69,13 @@ export default {
methods: {
editTask(subtask, editMode) {
// TODO office365: Only for office365 events
return this.editOfficeEvent(subtask)
// this.$events.emit('show-subtask-modal', {subtask, editMode})
this.$events.emit('show-subtask-modal', {subtask, editMode})
},
deleteTask(subtask) {
this.$events.emit('show-delete-task-modal', {subtask})
// TODO office365: Only for office365 events
this.$events.emit('show-unable-to-edit-office-task-modal', { mode: 'delete' })
// this.$events.emit('show-delete-task-modal', {subtask})
},
getDeadline(subtask) {
@@ -84,10 +83,6 @@ export default {
return moment(subtask.deadline).format('DD.MM.yyyy')
return moment(subtask.master_task_deadline).format('DD.MM.yyyy')
},
editOfficeEvent(subtask) {
this.$events.emit('show-unable-to-edit-office-task-modal', { subtask })
}
}
}