From d32a50e51ad4b333d66b2c4903e93dc385e0fe8c Mon Sep 17 00:00:00 2001 From: JakubPapso <“jakubpapso@gmail.com”> Date: Fri, 28 Jun 2024 13:56:39 +0200 Subject: [PATCH 1/2] [page filters scroll stuck fix] --- app/src/plugins/tm@dashboard/_mixins/Filter.mixin.ts | 2 +- app/src/plugins/tm@dashboard/projects/projects.vue | 4 +++- app/src/plugins/tm@dashboard/tasks/tasks.vue | 4 +++- app/src/plugins/tm@dashboard/teams/teams.vue | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/plugins/tm@dashboard/_mixins/Filter.mixin.ts b/app/src/plugins/tm@dashboard/_mixins/Filter.mixin.ts index 77468e3..eb3162d 100644 --- a/app/src/plugins/tm@dashboard/_mixins/Filter.mixin.ts +++ b/app/src/plugins/tm@dashboard/_mixins/Filter.mixin.ts @@ -16,7 +16,7 @@ export default { methods: { _initScrollListener(repeat = 0) { - if (this.initialized) return + if (this.initialized && repeat > 0) return const calendar = this.$refs.page?.querySelector('.vuecal__bg') diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue index f524cbc..ccd1624 100644 --- a/app/src/plugins/tm@dashboard/projects/projects.vue +++ b/app/src/plugins/tm@dashboard/projects/projects.vue @@ -120,7 +120,9 @@ export default { this.$toast.error('Nepodarilo sa nacitat data!') } - this._initScrollListener() + setTimeout(() => { + this._initScrollListener() + }, 100) }, openMasterTaskModal(mastertaskId) { diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index c1cb191..bd16ec9 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -181,7 +181,9 @@ export default { this.$toast.error('Nepodarilo sa nacitat data!') } - this._initScrollListener() + setTimeout(() => { + this._initScrollListener() + }, 100) } } } diff --git a/app/src/plugins/tm@dashboard/teams/teams.vue b/app/src/plugins/tm@dashboard/teams/teams.vue index fa43902..e902870 100644 --- a/app/src/plugins/tm@dashboard/teams/teams.vue +++ b/app/src/plugins/tm@dashboard/teams/teams.vue @@ -86,7 +86,9 @@ export default { this.$toast.error('Nepodarilo sa nacitat data!') } - this._initScrollListener() + setTimeout(() => { + this._initScrollListener() + }, 100) } } } From 8a4c438e496453b4183f76c332f18d66d682aa23 Mon Sep 17 00:00:00 2001 From: JakubPapso <“jakubpapso@gmail.com”> Date: Fri, 28 Jun 2024 15:33:00 +0200 Subject: [PATCH 2/2] [cleanup] --- app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts | 1 - app/src/plugins/tm@modal/master-task/z-master-task-modal.vue | 2 -- app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue | 1 - app/src/plugins/tm@modal/task/_components/a-timeblock.vue | 3 --- app/src/plugins/tm@modal/task/z-task-modal.vue | 1 - 5 files changed, 8 deletions(-) diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts index 5650f62..ca028a4 100644 --- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts +++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts @@ -43,7 +43,6 @@ export default { onEmployeeSelected(id) { const employee = this.enrichedEmployees.find(employee => employee.id == id) - console.log('add employee', employee) this.mastertask.employees.push(employee) this.showAddEmployeeInput = false }, 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 c309455..a23f31d 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 @@ -280,8 +280,6 @@ export default { return employee }) - console.log('NEW', this.mastertask) - // this.mastertask.project_code = project.code } else { this.mastertask = { employees: [], duration: 0, _deadline_time: '17:00' } diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue index 5109319..2c69a44 100644 --- a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue +++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue @@ -54,7 +54,6 @@ export default { }, createTask() { - console.log(this.localData.date, this.localData.time, this.localData.employees) this.$events.emit('show-subtask-modal', { subtask: { deadline: this.localData.date, diff --git a/app/src/plugins/tm@modal/task/_components/a-timeblock.vue b/app/src/plugins/tm@modal/task/_components/a-timeblock.vue index c1cb9eb..3e30ce9 100644 --- a/app/src/plugins/tm@modal/task/_components/a-timeblock.vue +++ b/app/src/plugins/tm@modal/task/_components/a-timeblock.vue @@ -71,9 +71,6 @@ export default { }) }) }, - onFocus() { - console.log('focus') - }, updateDate(date) { const timeblock = { ...this.timeblock } if (date) timeblock.date = date 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 da03cb8..e8d8596 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -368,7 +368,6 @@ export default { }, updateSubtask(subtask) { - console.log('UPDATE SUBTASK: ', subtask.timeblocks[0]) this.subtask = subtask },