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

[Fix] Handling of deleted employee in master task

Browse Source
This commit is contained in:
Matej Glasnák committed 2024-10-17 08:36:08 +02:00
1 parent 7457616e0c
commit 8a0e9072c1
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
+2 -2
View File
@@ -47,8 +47,8 @@ export default {
return { return {
...subtask, ...subtask,
_employeeInitials: employee._initials, _employeeInitials: employee ? employee._initials : '?',
_employeeFullName: employee._fullName _employeeFullName: employee ? employee._fullName : ''
} }
}) })
} }
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+9 -4
View File
@@ -23,7 +23,7 @@
<v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" :label="`${mastertask.duration} h`" :disabled="true"></v-text-field> <v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" :label="`${mastertask.duration} h`" :disabled="true"></v-text-field>
<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="mastertask.id" :clearable="true" /> <v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name" :disabled="!!mastertask.id" :clearable="true" />
<template v-if="!mastertask.id"> <template v-if="!mastertask.id">
<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged"> <v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
@@ -50,7 +50,7 @@
<!-- <Z-autocomplete label="Vyhľadať zamestnanca" :options="employeesOptions" class="modal-input" @option-selected="onEmployeeSelected" /> --> <!-- <Z-autocomplete label="Vyhľadať zamestnanca" :options="employeesOptions" class="modal-input" @option-selected="onEmployeeSelected" /> -->
<v-btn :disabled="mastertask.id" class="w-100 mb-5 button secondary" :class="{error: v$.mastertask.project_id.$errors.length}" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn> <v-btn :disabled="!!mastertask.id" class="w-100 mb-5 button secondary" :class="{error: v$.mastertask.project_id.$errors.length}" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
<div class="w-100 modal-input" :class="{ error: v$.mastertask.description.$errors.length }"> <div class="w-100 modal-input" :class="{ error: v$.mastertask.description.$errors.length }">
<QuillEditor ref="description" v-model="mastertask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @keyup="onQuillEditorInput" /> <QuillEditor ref="description" v-model="mastertask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @keyup="onQuillEditorInput" />
@@ -170,7 +170,7 @@ export default {
_initials: employee ? employee.name.charAt(0) + employee.surname.charAt(0) : '?', _initials: employee ? employee.name.charAt(0) + employee.surname.charAt(0) : '?',
_fullName: employee ? `${employee.name} ${employee.surname}` : '' _fullName: employee ? `${employee.name} ${employee.surname}` : ''
} }
}) }).filter(subtask => subtask !== null)
} }
}, },
@@ -275,10 +275,15 @@ export default {
this.mastertask._allEmployees = this.mastertask.subtasks.map(({ employee_id, duration}) => { this.mastertask._allEmployees = this.mastertask.subtasks.map(({ employee_id, duration}) => {
const employee = this.enrichedEmployees.find(({ id }) => id == employee_id) const employee = this.enrichedEmployees.find(({ id }) => id == employee_id)
if (!employee) {
return null
}
employee.duration = duration employee.duration = duration
return employee return employee
}) }).filter(employee => employee !== null)
// this.mastertask.project_code = project.code // this.mastertask.project_code = project.code
} else { } else {