diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue index 9aff4fa..e61cb51 100644 --- a/app/src/plugins/app/_config/App.vue +++ b/app/src/plugins/app/_config/App.vue @@ -13,6 +13,7 @@ + @@ -28,6 +29,7 @@ import ZDeleteTaskModal from '@/plugins/tm@modal/task/z-delete-task-modal.vue' import ZTaskModal from '@/plugins/tm@modal/task/z-task-modal.vue' import ZDeleteBlockerModal from '@/plugins/tm@modal/blocker/z-delete-blocker-modal.vue' import ZCompleteTaskModal from '@/plugins/tm@modal/task/z-complete-task-modal.vue' +import ZCompleteMasterTaskModal from '@/plugins/tm@modal/master-task/z-complete-master-task-modal.vue' import ZTaskAddTimeModal from '@/plugins/tm@modal/task/z-task-add-time-modal.vue' import ZBlockerModal from '@/plugins/tm@modal/blocker/z-blocker-modal.vue' import ZDeleteMasterTaskModal from '@/plugins/tm@modal/master-task/z-delete-master-task-modal.vue' @@ -48,7 +50,8 @@ export default { ZBlockerModal, ZDeleteMasterTaskModal, ZDeleteTeamMemberModal, - ZShowMenuModal + ZShowMenuModal, + ZCompleteMasterTaskModal }, mounted() { @@ -100,6 +103,10 @@ export default { this.$refs['z-complete-task-modal'].showModal({ subtask }) }) + this.$events.on('show-complete-master-task-modal', ({ mastertask }) => { + this.$refs['z-complete-master-task-modal'].showModal({ mastertask }) + }) + this.$events.on('show-blocker-modal', ({blocker = {}}) => { this.$refs['z-blocker-modal'].showModal({blocker}) }) diff --git a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue index 2fccd21..1f25dbb 100644 --- a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue +++ b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue @@ -15,7 +15,7 @@ :class="{ active: isActive(page.pageName) }" @click="$router.push({ name: page.pageName }); closeMenu()"> {{ page.title }} {{ unscheduledSubtasks?.length }} diff --git a/app/src/plugins/tm@_mixins/autocomplete.mixin.ts b/app/src/plugins/tm@_mixins/autocomplete.mixin.ts index 1b4c5ff..410471d 100644 --- a/app/src/plugins/tm@_mixins/autocomplete.mixin.ts +++ b/app/src/plugins/tm@_mixins/autocomplete.mixin.ts @@ -10,8 +10,8 @@ export default { const cleanedItem = normalizedItem.replace(pattern, ''); const cleanedInput = normalizedInput.replace(pattern, ''); - // Check if the cleaned item starts with the cleaned input - return cleanedItem.toLowerCase().includes(cleanedInput.toLowerCase()); + // Check if the cleaned item starts with the cleaned input and return empty value for dropdown if present + return cleanedItem.toLowerCase().includes(cleanedInput.toLowerCase()) || item === ''; } } } \ No newline at end of file diff --git a/app/src/plugins/tm@_utils/tm.utils.ts b/app/src/plugins/tm@_utils/tm.utils.ts index bc09bc1..021e3cc 100644 --- a/app/src/plugins/tm@_utils/tm.utils.ts +++ b/app/src/plugins/tm@_utils/tm.utils.ts @@ -18,6 +18,9 @@ export default { return moment(date).format('YYYY-MM-DD HH:mm:ss') }, + formatDate(date) { + return moment(date).format('DD.MM.yyyy') + }, isBefore(date, compareTo = null) { return moment(date).isBefore(moment(compareTo)) diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index 40b0a0e..9e8c314 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -82,6 +82,11 @@ {{ event.date?.toLocaleDateString('sk-SK') }} + +
+ + {{ tmUtils.formatDate(event.subtask?.deadline) }} +
@@ -144,7 +149,8 @@ export default { } }, focusedEventId: null, - timeCellHeight: 100 + timeCellHeight: 100, + tmUtils } }, @@ -437,6 +443,7 @@ export default { .custom-event-body padding: 20px 10px + width: 100% .event-content &.is-blocker diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue index 82bc51d..6fb8ca5 100644 --- a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue +++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue @@ -89,7 +89,7 @@ export default { margin-top: 5px display: -webkit-box -webkit-line-clamp: 3 - -webkit-box-orient: vertical + -webkit-box-orient: vertical overflow: hidden &:after background: unset diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue index 638ec05..d53cd52 100644 --- a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue +++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue @@ -1,12 +1,12 @@ diff --git a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue index 777ab30..30abd81 100644 --- a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue +++ b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue @@ -7,12 +7,10 @@ - + \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue new file mode 100644 index 0000000..3b175d1 --- /dev/null +++ b/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue @@ -0,0 +1,53 @@ + + + \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index 9a46d76..e5b4a34 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -14,10 +14,10 @@
- -
@@ -30,7 +30,7 @@

{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}

- + @@ -70,7 +70,7 @@
- {{ mastertask.is_finished === 1 ? 'Otvoriť mastertask' : 'Ukončiť mastertask' }} + {{ mastertask.is_finished ? 'Otvoriť mastertask' : 'Ukončiť mastertask' }}
@@ -150,12 +150,12 @@ export default { enrichedSubtasks() { if (!this.mastertask?.subtasks) return null - + return this.mastertask.subtasks.map(subtask => { const employee = this.enrichedEmployees.find(employee => employee.id == subtask.employee_id) return { - ...subtask, + ...subtask, _initials: employee ? employee.name.charAt(0) + employee.surname.charAt(0) : '?', _fullName: employee ? `${employee.name} ${employee.surname}` : '' } @@ -167,7 +167,7 @@ export default { const quillEditorRequired = (value) => { if (!value || !value.length || !value.replace(/<[^>]*>/g, '').length) return false - + return true } @@ -220,12 +220,12 @@ export default { methods: { removeEmployee({ id }) { - const isEmployeeInTeam = this.mastertask.team?.employees.find(employee => employee.id == id) + // const isEmployeeInTeam = this.mastertask.team?.employees.find(employee => employee.id == id) - if (isEmployeeInTeam) { - this.mastertask.team_id = null - this.mastertask.team = null - } + // if (isEmployeeInTeam) { + // this.mastertask.team_id = null + // this.mastertask.team = null + // } this.mastertask.employees = this.mastertask.employees.filter(employee => employee.id != id) }, @@ -264,9 +264,8 @@ export default { } }, - toggleIsFinished() { - this.mastertask.is_finished = this.mastertask.is_finished === 0 ? 1 : 0 - this.save() + async toggleIsFinished(mastertask) { + this.$events.emit('show-complete-master-task-modal', { mastertask }) }, async save() { diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue index a0a8c53..d75eb9a 100644 --- a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue +++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue @@ -15,11 +15,6 @@ {{ employee.name.charAt(0) + employee.surname.charAt(0) }}

- @@ -32,6 +27,19 @@ export default { type: Object, required: true } - } + }, + + // methods: { + // async deleteEmployee() { + // try { + // const tempSubtask = {...this.subtask, employee_id: null, deadline: moment(this.subtask.deadline).format('YYYY-MM-DD HH:mm:ss') } + // const { subtask } = await this.$axios.put_auth(`v1/subtasks/${tempSubtask.id}`, tempSubtask) + // // employee_id + // this.$emit('on-subtask-edited', subtask) + // } catch (error) { + // this.$toast.error(error) + // } + // }, + // } } \ No newline at end of file diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue new file mode 100644 index 0000000..02f081a --- /dev/null +++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue index a0a9c69..28dfaed 100644 --- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue +++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue @@ -181,7 +181,6 @@ export default { this.closeModal() this.$events.emit('on-subtask-edited', subtask) } catch (error) { - console.error(error) this.$toast.error(error.message || error) } }, diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue index 3ef482f..43fe465 100644 --- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue +++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue @@ -1,6 +1,7 @@ diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index 5d0a671..b750e56 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -268,7 +268,6 @@ export default { this.closeModal() } catch (error) { - console.error(error) this.$toast.error(error) } finally { this.isSaving = true diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue index 078ce4b..428a8fe 100644 --- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue +++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue @@ -2,8 +2,10 @@ - Kód projektu + Kód projektu Názov + Deadline + Najbližší neuzavretý Naplánované Zostávajúce Akcia @@ -14,6 +16,13 @@ {{ subtask.project_code }} {{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }} + {{ getDeadline(subtask) }} + + + + {{ displayTimeblock(subtask) }} {{ subtask.duration }} h {{ (subtask.duration - subtask.spent_time).toFixed(2) }} h @@ -31,6 +40,9 @@