mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Calendar] Fixed non working hours, added blockers to teams
This commit is contained in:
1 parent
f3f86261f4
commit
11c73b2b37
8 files changed
+281
-212
No files matched your search
@@ -12,8 +12,7 @@
|
||||
|
||||
<Z-autocomplete label="Master task" :options="mastertasks.map((mastertask) => ({ key: mastertask.id, value: mastertask.name }))" :validations="v$.subtask.master_task.id" :clear-on-submit="false" :value="subtask?.master_task?.name" :class="{ error: v$.subtask.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
|
||||
|
||||
<v-select v-model="subtask.employee_id" ref="employee-select" @focus="onInputFocus" class="modal-input border-select" label="Priradený" :class="{ error: v$.subtask.employee_id.$errors.length }" variant="solo" :items="filteredEmployees" item-value="id" item-title="_fullName"></v-select>
|
||||
|
||||
<Z-autocomplete label="Priradený" :value="subtask?.employee ? `${subtask?.employee?.name} ${subtask?.employee?.surname}` : ''" :options="enrichedEmployees.map(employee => ({key: employee.id, value: employee._fullName}))" :clear-on-submit="false" :class="{ error: v$.subtask.employee.$errors.length }" class="modal-input" @option-selected="onEmployeeSelected" />
|
||||
<v-text-field v-model="subtask.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" label="Časový odhad" :class="{ error: v$.subtask.duration.$errors.length }" :hint="v$.subtask.duration.$errors ? errorUtils.parseErrors(v$.subtask.duration.$errors) : null" append-inner-icon="mdi-clock-outline"></v-text-field>
|
||||
|
||||
<div class="w-100 modal-input">
|
||||
@@ -123,7 +122,7 @@ export default {
|
||||
id: { required }
|
||||
},
|
||||
duration: { required },
|
||||
employee_id: { required }
|
||||
employee: { required }
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -227,6 +226,10 @@ export default {
|
||||
this.subtask.files = files
|
||||
},
|
||||
|
||||
onEmployeeSelected({ key }) {
|
||||
this.subtask.employee_id = key
|
||||
},
|
||||
|
||||
_enrichTask(subtask) {
|
||||
subtask.master_task = this.mastertasks.find((mastertask) => mastertask.id == subtask.master_task_id)
|
||||
subtask.employee = this.enrichedEmployees.find((employee) => employee.id == subtask.employee_id)
|
||||
@@ -257,10 +260,6 @@ export default {
|
||||
editMode() {
|
||||
this.$nextTick(() => {
|
||||
this.$refs["description"]?.setHTML(this.subtask.description || "")
|
||||
|
||||
const employeeSelect = this.$refs['employee-select']?.$el?.querySelector('.v-select__selection-text')
|
||||
if (employeeSelect)
|
||||
employeeSelect.innerHTML = this.subtask?.employee?._fullName || ''
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user