Merge branch 'task000/concepts' of bitbucket.org:studiotem/jandl-taskmanager-app

This commit is contained in:
Matej Glasnák committed 2025-12-03 13:16:19 +01:00
commit b889d153cf
126 files changed
+744 -21762

No files matched your search

+46 -8
View File
@@ -273,12 +273,42 @@
/>
</v-card-actions>
<v-btn v-if="!isSaving" class="button primary" @click="save()">{{
subtask.id ? 'UPRAVIŤ' : 'VYTVORIŤ'
}}</v-btn>
<v-btn v-else class="button primary disabled" disabled>{{
$t('Ukladám...')
}}</v-btn>
<template v-if="!subtask.id">
<v-btn class="button primary" :disabled="isSaving" @click="save()"
>VYTVORIŤ</v-btn
>
<v-btn
class="button primary outline mt-2"
@click="save(true)"
:disabled="isSaving"
>ULOŽIŤ KONCEPT</v-btn
>
</template>
<template v-else>
<template v-if="subtask.is_draft">
<v-btn
class="button primary"
:disabled="isSaving"
@click="save(true)"
>ULOŽIŤ A PUBLIKOVAŤ</v-btn
>
<v-btn
class="button primary outline mt-2"
@click="save(true)"
:disabled="isSaving"
>ULOŽIŤ KONCEPT</v-btn
>
</template>
<template v-else>
<v-btn class="button primary" :disabled="isSaving" @click="save()"
>UPRAVIŤ</v-btn
>
</template>
</template>
</v-card>
<v-card v-else height="100%" class="d-flex flex-column scrolling">
@@ -709,7 +739,7 @@ export default {
}
},
async save() {
async save(concept = false) {
this.wasFormValidationTriggered = true;
if (!(await this.validateAllFields())) return;
@@ -741,9 +771,14 @@ export default {
};
});
const payload = { ...this.subtask, timesheets, timeblocks };
if (concept) {
payload.concept = true;
}
const { subtask } = await this.$axios.patch_auth_form(
`v1/subtasks/${this.subtask.id}`,
{ ...this.subtask, timesheets, timeblocks },
payload,
);
localStorage.removeItem('subtaskData');
@@ -775,6 +810,9 @@ export default {
...this.subtask,
employees: validEmployees,
};
if (concept) {
subtaskCopy.is_draft = true;
}
delete subtaskCopy._master_task;
const { subtasks } = await this.$axios.post_auth(
`v1/mastertasks/${this.subtask.master_task_id}/subtasks`,