mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Projects] Added filters
This commit is contained in:
Matej Glasnák committed
1 parent
919b2eebbe
commit
302286bff8
29 files changed
+508
-350
No files matched your search
@@ -1,25 +1,25 @@
|
||||
<template>
|
||||
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
|
||||
<W-loadable :content="masterTask" class="h-100">
|
||||
<W-loadable :content="mastertask" class="h-100">
|
||||
<v-card v-if="editMode" height="100%" class="d-flex flex-column scrolling">
|
||||
<div class="d-flex justify-space-between align-center modal-header">
|
||||
<h1>{{ masterTask?.id ? 'Upraviť master task' : 'Vytvoriť master task' }}</h1>
|
||||
<h1>{{ mastertask?.id ? 'Upraviť master task' : 'Vytvoriť master task' }}</h1>
|
||||
<v-icon @click.stop="closeModal()" icon="mdi-close" size="large"></v-icon>
|
||||
</div>
|
||||
|
||||
<v-card-actions class="d-flex flex-column modal-content">
|
||||
<Z-autocomplete label="Kód projektu" :options="projects.map((project) => ({ key: project.id, value: project.code }))" :validations="v$.masterTask.project_code" :clear-on-submit="false" :value="masterTask.project_code" :class="{ error: v$.masterTask.project_code.$errors.length }" class="modal-input" @option-selected="onProjectSelected" />
|
||||
<Z-autocomplete label="Kód projektu" :options="projects.map((project) => ({ key: project.id, value: project.code }))" :validations="v$.mastertask.project_code" :clear-on-submit="false" :value="mastertask.project_code" :class="{ error: v$.mastertask.project_code.$errors.length }" class="modal-input" @option-selected="onProjectSelected" />
|
||||
|
||||
<v-text-field v-model="masterTask.name" @focus="onInputFocus" class="modal-input" label="Názov mastertasku" variant="solo" :class="{ error: v$.masterTask.name.$errors.length }" :hint="v$.masterTask.name.$errors ? errorUtils.parseErrors(v$.masterTask.name.$errors) : null"></v-text-field>
|
||||
<v-text-field v-model="mastertask.name" @focus="onInputFocus" class="modal-input" label="Názov mastertasku" variant="solo" :class="{ error: v$.mastertask.name.$errors.length }" :hint="v$.mastertask.name.$errors ? errorUtils.parseErrors(v$.mastertask.name.$errors) : null"></v-text-field>
|
||||
|
||||
<Datepicker v-model="masterTask.deadline" @focus="onDateFocus" class="modal-input" format="dd.MM.yyyy, HH:mm" locale="sk" :class="{ error: v$.masterTask.deadline.$errors.length }" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Deadline" />
|
||||
<Datepicker v-model="mastertask.deadline" @focus="onDateFocus" class="modal-input" format="dd.MM.yyyy, HH:mm" locale="sk" :class="{ error: v$.mastertask.deadline.$errors.length }" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Deadline" />
|
||||
|
||||
<v-text-field v-model="masterTask.duration" @focus="onInputFocus" class="modal-input mt-5" variant="solo" type="number" disabled :label="`${masterTask.duration} h`"></v-text-field>
|
||||
<v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input mt-5" variant="solo" type="number" disabled :label="`${mastertask.duration} h`"></v-text-field>
|
||||
|
||||
<v-select v-model="this.masterTask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{ error: v$.masterTask.team_id.$errors.length }" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name"></v-select>
|
||||
<v-select v-model="this.mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{ error: v$.mastertask.team_id.$errors.length }" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name"></v-select>
|
||||
|
||||
<template v-if="!masterTask.id">
|
||||
<v-text-field v-for="(employee, index) in masterTask.employees" :key="employee.id" @focus="onInputFocus" :class="{ error: !masterTask.employees[index].duration }" class="modal-input" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="masterTask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
|
||||
<template v-if="!mastertask.id">
|
||||
<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" :class="{ error: !mastertask.employees[index].duration }" class="modal-input" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
|
||||
<p class="employee-select-avatar d-flex justify-center align-center">
|
||||
{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
|
||||
</p>
|
||||
@@ -28,40 +28,40 @@
|
||||
|
||||
<Z-autocomplete label="Vyhľadať zamestnanca" v-if="showAddEmployeeInput" :options="employeesOptions" class="modal-input" @option-selected="onEmployeeSelected" />
|
||||
|
||||
<v-btn class="w-100 mb-5 button secondary" :disabled="!masterTask.team?.id" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
|
||||
<v-btn class="w-100 mb-5 button secondary" :disabled="!mastertask.team?.id" @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 }">
|
||||
<QuillEditor ref="description" v-model="masterTask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @input="masterTask.description = $event.srcElement.innerHTML" />
|
||||
<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" @input="mastertask.description = $event.srcElement.innerHTML" />
|
||||
</div>
|
||||
|
||||
<Z-files-upload class="mt-15 files" :files="masterTask.files" @files-uploaded="filesUploaded" />
|
||||
<Z-files-upload class="mt-15 files" :files="mastertask.files" @files-uploaded="filesUploaded" />
|
||||
</v-card-actions>
|
||||
|
||||
<v-btn class="button primary" @click="save()">{{ masterTask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }}</v-btn>
|
||||
<v-btn class="button primary" @click="save()">{{ mastertask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }}</v-btn>
|
||||
</v-card>
|
||||
|
||||
<v-card v-else height="100%" class="d-flex flex-column scrolling">
|
||||
<div class="d-flex justify-space-between align-center">
|
||||
<p>{{ masterTask.project_code }}</p>
|
||||
<p>{{ mastertask.project_code }}</p>
|
||||
<v-icon @click.stop="closeModal()" icon="mdi-close" size="large" class="pb-5"></v-icon>
|
||||
</div>
|
||||
<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
|
||||
<h1>{{ masterTask.name }}</h1>
|
||||
<h1>{{ mastertask.name }}</h1>
|
||||
<div class="d-flex justify-start">
|
||||
<img class="icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
|
||||
<img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" />
|
||||
<img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(mastertask)" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<v-card-actions class="d-flex flex-column modal-content">
|
||||
<div class="w-100">
|
||||
<A-mastertask-description :master-task="masterTask" />
|
||||
<A-mastertask-description :mastertask="mastertask" />
|
||||
|
||||
<div class="d-flex justify-start align-center mt-8">
|
||||
<v-btn class="button primary" @click="save()">Ukončiť mastertask</v-btn>
|
||||
</div>
|
||||
|
||||
<A-tasks-table :tasks="masterTask.subtasks" :employees="enrichedEmployees" />
|
||||
<A-tasks-table :tasks="mastertask.subtasks" :employees="enrichedEmployees" />
|
||||
|
||||
<div class="d-flex align-center ">
|
||||
<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať task</v-btn>
|
||||
@@ -96,7 +96,7 @@ export default {
|
||||
// MIXINS
|
||||
// computed: employeesOptions
|
||||
// methods: onProjectSelected, onEmployeeSelected, onEmployeeDurationChanged
|
||||
// watch: masterTask.team_id
|
||||
// watch: mastertask.team_id
|
||||
|
||||
emits: ['master-task-edited', 'close'],
|
||||
mixins: [VuetifyFixFocusMixin, SelectsMixin],
|
||||
@@ -116,7 +116,7 @@ export default {
|
||||
visible: false,
|
||||
errorUtils,
|
||||
v$: useVuelidate(),
|
||||
masterTask: null,
|
||||
mastertask: null,
|
||||
showAddEmployeeInput: false,
|
||||
date: null,
|
||||
}
|
||||
@@ -132,7 +132,7 @@ export default {
|
||||
|
||||
validations() {
|
||||
return {
|
||||
masterTask: {
|
||||
mastertask: {
|
||||
project_code: { required },
|
||||
team_id: { required },
|
||||
name: { required },
|
||||
@@ -143,22 +143,22 @@ export default {
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.$events.on('on-master-task-deleted', (masterTask) => {
|
||||
if (masterTask?.id == this.masterTask?.id) this.closeModal()
|
||||
this.$events.on('on-master-task-deleted', (mastertask) => {
|
||||
if (mastertask?.id == this.mastertask?.id) this.closeModal()
|
||||
})
|
||||
|
||||
this.$events.on('on-task-deleted', (task) => {
|
||||
if (!this.masterTask) return
|
||||
this.masterTask.subtasks = this.masterTask.subtasks.filter((subtask) => subtask.id != task.id)
|
||||
if (!this.mastertask) return
|
||||
this.mastertask.subtasks = this.mastertask.subtasks.filter((subtask) => subtask.id != task.id)
|
||||
})
|
||||
|
||||
this.$events.on('on-subtask-edited', (task) => {
|
||||
if (!this.masterTask?.subtasks) return
|
||||
if (!this.mastertask?.subtasks) return
|
||||
|
||||
if (this.masterTask.subtasks.find(subtask => subtask.id == task.id)) {
|
||||
this.masterTask.subtasks = this.masterTask.subtasks.map(t => t.id == task.id ? task : t)
|
||||
if (this.mastertask.subtasks.find(subtask => subtask.id == task.id)) {
|
||||
this.mastertask.subtasks = this.mastertask.subtasks.map(t => t.id == task.id ? task : t)
|
||||
} else {
|
||||
this.masterTask.subtasks.push(task)
|
||||
this.mastertask.subtasks.push(task)
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -170,25 +170,25 @@ export default {
|
||||
},
|
||||
|
||||
methods: {
|
||||
async showModal(masterTask, editMode = false) {
|
||||
async showModal(mastertask, editMode = false) {
|
||||
this.v$.$reset()
|
||||
this.visible = true
|
||||
this.masterTask = null
|
||||
this.mastertask = null
|
||||
|
||||
try {
|
||||
if (masterTask?.id) {
|
||||
this.masterTask = await this.$axios.get_auth_data(`v1/mastertasks/${masterTask.id}`)
|
||||
if (mastertask?.id) {
|
||||
this.mastertask = await this.$axios.get_auth_data(`v1/mastertasks/${mastertask.id}`)
|
||||
|
||||
const project = this.projects.find((project) => project.code == this.masterTask?.project_code)
|
||||
const project = this.projects.find((project) => project.code == this.mastertask?.project_code)
|
||||
|
||||
this.masterTask.team_id = this.masterTask.team.id
|
||||
this.masterTask.project_id = project.id
|
||||
this.masterTask.project_code = project.code
|
||||
this.mastertask.team_id = this.mastertask.team?.id || null
|
||||
this.mastertask.project_id = project.id
|
||||
this.mastertask.project_code = project.code
|
||||
} else {
|
||||
this.masterTask = { employees: [], duration: 0 }
|
||||
this.mastertask = { employees: [], duration: 0 }
|
||||
}
|
||||
|
||||
this.editMode = editMode || !this.masterTask.id
|
||||
this.editMode = editMode || !this.mastertask.id
|
||||
} catch (error) {
|
||||
this.$toast.error(error)
|
||||
}
|
||||
@@ -197,24 +197,24 @@ export default {
|
||||
async save() {
|
||||
if (!(await this.v$.$validate())) return
|
||||
|
||||
this.masterTask.description = this.$refs['description'].getHTML()
|
||||
this.mastertask.description = this.$refs['description'].getHTML()
|
||||
|
||||
// this.masterTask.subtasks = this.masterTask.subtasks.map(subtask => {
|
||||
// const employee = this.masterTask.employees.find(employee => employee.id == subtask.employee_id)
|
||||
// this.mastertask.subtasks = this.mastertask.subtasks.map(subtask => {
|
||||
// const employee = this.mastertask.employees.find(employee => employee.id == subtask.employee_id)
|
||||
// subtask.duration = employee.duration
|
||||
|
||||
// return subtask
|
||||
// })
|
||||
|
||||
// this.masterTask.project_code = null
|
||||
// this.mastertask.project_code = null
|
||||
|
||||
try {
|
||||
this.masterTask.deadline = moment(this.masterTask.deadline).format('YYYY-MM-DD HH:MM:SS')
|
||||
this.mastertask.deadline = moment(this.mastertask.deadline).format('YYYY-MM-DD HH:MM:SS')
|
||||
|
||||
if (this.masterTask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.masterTask.id}`, this.masterTask)
|
||||
else await this.$axios.post_auth_data('v1/mastertasks', this.masterTask)
|
||||
if (this.mastertask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.mastertask.id}`, this.mastertask)
|
||||
else await this.$axios.post_auth_data('v1/mastertasks', this.mastertask)
|
||||
|
||||
this.$emit('master-task-edited', this.masterTask)
|
||||
this.$emit('master-task-edited', this.mastertask)
|
||||
this.closeModal()
|
||||
} catch (error) {
|
||||
this.$toast.error(error)
|
||||
@@ -222,26 +222,26 @@ export default {
|
||||
},
|
||||
|
||||
filesUploaded(files) {
|
||||
this.masterTask.files = files
|
||||
this.mastertask.files = files
|
||||
},
|
||||
|
||||
closeModal() {
|
||||
this.visible = false
|
||||
},
|
||||
|
||||
openDeleteMasterTaskModal(masterTask) {
|
||||
this.$events.emit('show-delete-master-task-modal', { masterTask })
|
||||
openDeleteMasterTaskModal(mastertask) {
|
||||
this.$events.emit('show-delete-master-task-modal', { mastertask })
|
||||
},
|
||||
|
||||
addTask() {
|
||||
this.$events.emit('show-task-modal', { task: null, editMode: false, masterTask: this.masterTask })
|
||||
this.$events.emit('show-task-modal', { task: null, editMode: false, mastertask: this.mastertask })
|
||||
}
|
||||
},
|
||||
|
||||
watch: {
|
||||
editMode() {
|
||||
this.$nextTick(() => {
|
||||
this.$refs['description']?.setHTML(this.masterTask.description || '')
|
||||
this.$refs['description']?.setHTML(this.mastertask.description || '')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user