This commit is contained in:
romankko2 committed 2023-08-07 17:47:20 +02:00
1 parent bed6793b8b
commit b02a8c734d
18 files changed
+95 -23

No files matched your search

+16 -4
View File
@@ -66,7 +66,7 @@
<div class="d-flex justify-space-between align-center">
<div>
<p>{{ subtask._master_task.project_code }}</p>
<h1>{{ subtask._master_task.name }}</h1>
<h1>{{ subtask._master_task.name }}</h1>
</div>
<v-icon @click.stop="closeModal()" icon="mdi-close" size="large" class="pb-5"></v-icon>
@@ -120,10 +120,11 @@ import AutocompleteMixin from '@/plugins/tm@_mixins/autocomplete.mixin'
import ZTaskReadonlyInfo from "./_components/z-task-readonly-info.vue"
import { mapGetters } from "vuex"
import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
export default {
emits: ["close", "refresh"],
mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin],
mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin, modalMixin],
components: {
ZTaskReadonlyInfo,
@@ -209,6 +210,11 @@ export default {
this.subtask = this._enrichTask(data)
} else {
this.subtask = { master_task: mastertask, employees: [{}], _deadline_time: '17:00' }
if (subtask?.deadline && subtask._deadline_time) {
this.subtask.deadline = subtask.deadline
this.subtask._deadline_time = subtask._deadline_time
}
}
this.editMode = editMode || !this.subtask.id
@@ -250,13 +256,14 @@ export default {
this.$store.commit('tm/update_subtask', subtask)
this.$events.emit("on-subtask-edited", this.subtask)
} else {
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask)
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask, this.subtask.project_code)
this.subtask.id = subtasks[0].id
subtasks.forEach(subtask => {
this.$store.commit('tm/update_subtask', subtask)
this.$events.emit("on-subtask-edited", this.subtask)
})
this.$events.emit("task-created")
}
this.closeModal()
@@ -365,9 +372,14 @@ export default {
deep: true
},
'subtask.master_task_id'(value) {
'subtask.master_task_id'(value, newValue) {
if (!value) return
this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
// let selectedMasterTask = null
// if (newValue) selectedMasterTask = this.mastertasks.find((mastertask) => mastertask.id === newValue)
// if (selectedMasterTask) this.subtask.project_code = selectedMasterTask.project_code
},
editMode() {