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

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production

Browse Source
This commit is contained in:
Matej Glasnák committed 2025-05-09 13:37:08 +02:00
2 parents 0ecb6b6b62 6a550006d9
commit bf43f94d72
1 file changed
+24 -16
Download Patch File Download Diff File Expand all files Collapse all files
app/src/plugins/tm@modal/task/z-task-modal.vue
+24 -16
View File
@@ -675,23 +675,31 @@ export default {
this.$store.commit('tm/update_subtask', subtask);
this.$events.emit('on-subtask-edited', this.subtask);
} else {
this.subtask.employees.forEach((employee) => {
if (employee.id)
employee.timeblocks = this.timeblocks
.filter((timeblock) => timeblock.date)
.map((timeblock) => {
return {
start: `${moment(timeblock.date).format('YYYY-MM-DD')} ${
timeblock.starts_at_time
}:00`,
end: `${moment(timeblock.date).format('YYYY-MM-DD')} ${
timeblock.ends_at_time
}:00`,
id: null,
};
});
// Filter out employees that don't have both id and duration
const validEmployees = this.subtask.employees.filter(
(employee) => employee.id && employee.duration,
);
validEmployees.forEach((employee) => {
employee.timeblocks = this.timeblocks
.filter((timeblock) => timeblock.date)
.map((timeblock) => {
return {
start: `${moment(timeblock.date).format('YYYY-MM-DD')} ${
timeblock.starts_at_time
}:00`,
end: `${moment(timeblock.date).format('YYYY-MM-DD')} ${
timeblock.ends_at_time
}:00`,
id: null,
};
});
});
const subtaskCopy = this.subtask;
const subtaskCopy = {
...this.subtask,
employees: validEmployees,
};
delete subtaskCopy._master_task;
const { subtasks } = await this.$axios.post_auth(
`v1/mastertasks/${this.subtask.master_task_id}/subtasks`,