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

[Task modal] Fixed worked time

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-06-16 13:25:58 +02:00
1 parent 6b3402235c
commit e77e5b1ab7
6 files changed
+45 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/_components/z-timeline.vue
+5 -1
View File
@@ -166,7 +166,11 @@ export default {
is_finished: 0,
start: tmUtils.formatDateTimeForBackend(start),
end: tmUtils.formatDateTimeForBackend(end)
}]
}],
timesheets: event.subtask.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})
}
try {
app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+4
View File
@@ -122,6 +122,10 @@ export default {
async _update(data) {
try {
data.timesheets = data.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${data.id}`, data)
this.closeModal()
app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+5 -1
View File
@@ -166,7 +166,11 @@ export default {
async _update(data) {
try {
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${data.id}`, data)
const timesheets = data.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${data.id}`, {...data, timesheets})
this.closeModal()
this.$events.emit('on-subtask-edited', subtask)
app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+4 -1
View File
@@ -36,7 +36,10 @@ export default {
async complete() {
try {
const tempSubtask = {...this.subtask, is_finished: this.subtask.is_finished ? 0 : 1}
const tempSubtask = {...this.subtask, is_finished: this.subtask.is_finished ? 0 : 1, timesheets: this.subtask.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})}
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${tempSubtask.id}`, tempSubtask)
this.visible = false
app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
+9 -1
View File
@@ -60,8 +60,16 @@ export default {
time: typeof this.form.hours == 'string' ? parseFloat(this.form.hours) : this.form.hours
})
const payload = {
...this.subtask,
timesheets: this.subtask.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})
}
try {
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, this.subtask)
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, payload)
this.closeModal()
this.$events.emit('on-subtask-edited', subtask)
app/src/plugins/tm@modal/task/z-task-modal.vue
+18 -12
View File
@@ -195,15 +195,16 @@ export default {
try {
if (subtask?.id) {
const data = await this.$axios.get_auth_data(`v1/subtasks/${subtask.id}`)
const splittedDeadline = data.deadline.split(' ')
data.deadline = moment(splittedDeadline[0])
data._deadline_time = splittedDeadline[1]
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
} catch (error) {
this.$toast.error(error)
@@ -229,15 +230,19 @@ export default {
this._mergeDeadlineTimeDate()
try {
this.subtask.deadline = moment(this.subtask.deadline).format('YYYY-MM-DD HH:MM:SS')
this.subtask.deadline = moment(this.subtask.deadline).format('YYYY-MM-DD HH:mm:SS')
const timesheets = this.subtask.timesheets.map((timesheet) => {
delete timesheet.employee_name
return timesheet
})
if (this.subtask?.id) {
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, this.subtask)
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, {...this.subtask, timesheets})
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, timesheets})
this.subtask.id = subtasks[0].id
subtasks.forEach(subtask => {
@@ -280,10 +285,11 @@ export default {
},
_mergeDeadlineTimeDate() {
const date = new Date(this.subtask.deadline);
const timeParts = this.subtask._deadline_time.split(':');
date.setHours(parseInt(timeParts[0]));
date.setMinutes(parseInt(timeParts[1]));
const date = new Date(this.subtask.deadline)
const timeParts = this.subtask._deadline_time.split(':')
date.setHours(parseInt(timeParts[0]))
date.setMinutes(parseInt(timeParts[1]))
this.subtask.deadline = date
},