Merge branch 'feature/chr-7' of bitbucket.org:studiotem/jandl-taskmanager-app

This commit is contained in:
Matej Glasnák committed 2023-04-17 23:39:07 +02:00
commit 5dac57a81b
1 file changed
+22 -2
+22 -2
View File
@@ -1,6 +1,6 @@
<template> <template>
<div> <div ref="page">
<A-task-filter v-if="$store.getters['tm/isInitialized']" :split-days="timelineData ? splitDays : null" @filter-changed="onFilterChanged" /> <A-task-filter v-if="$store.getters['tm/isInitialized']" :split-days="timelineData ? splitDays : null" @filter-changed="onFilterChanged" :style="{marginTop: headerMarginTop}" ref="filter" />
<Z-timeline v-if="timelineData" :calData="timelineData" :calConfig="config" :splits="splitDays" /> <Z-timeline v-if="timelineData" :calData="timelineData" :calConfig="config" :splits="splitDays" />
</div> </div>
</template> </template>
@@ -23,6 +23,8 @@ export default {
return { return {
filter: null, filter: null,
subtasks: null, subtasks: null,
headerMarginTop: '0px',
previousScrollTop: 0,
config: { config: {
date: subDays(new Date(), 1), date: subDays(new Date(), 1),
scrollHour: 7, scrollHour: 7,
@@ -145,6 +147,11 @@ export default {
this.$events.on('on-blocker-deleted', () => { this.$events.on('on-blocker-deleted', () => {
this.onFilterChanged(this.filter) this.onFilterChanged(this.filter)
}) })
setTimeout(() => {
this.$refs.page?.querySelector('.vuecal__bg')?.addEventListener('scroll', this.handleScroll)
}, 1000)
// window
}, },
unmounted() { unmounted() {
@@ -152,6 +159,8 @@ export default {
this.$events.off('on-subtask-deleted') this.$events.off('on-subtask-deleted')
this.$events.off('on-blocker-edited') this.$events.off('on-blocker-edited')
this.$events.off('on-blocker-deleted') this.$events.off('on-blocker-deleted')
this.$refs.page?.querySelector('.vuecal__bg')?.removeEventListener('scroll', this.handleScroll)
}, },
methods: { methods: {
@@ -173,6 +182,17 @@ export default {
} catch (error) { } catch (error) {
this.$toast.error('Nepodarilo sa nacitat data!') this.$toast.error('Nepodarilo sa nacitat data!')
} }
},
handleScroll(e) {
if (this.previousScrollTop > e.target.scrollTop)
this.headerMarginTop = '0px'
else
this.headerMarginTop = `-${this.$refs.filter.$el.offsetHeight}px`
console.log(this.headerMarginTop)
this.previousScrollTop = e.target.scrollTop
} }
} }
} }