mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Sticky header
This commit is contained in:
1 parent
1a1b6f99a8
commit
4d84bec298
4 files changed
+90
-5
No files matched your search
@@ -124,6 +124,7 @@ import Header from './header.vue'
|
||||
import WeekdaysHeadings from './weekdays-headings.vue'
|
||||
import AllDayBar from './all-day-bar.vue'
|
||||
import Cell from './cell.vue'
|
||||
import moment from 'moment'
|
||||
|
||||
import './styles.scss'
|
||||
import './scss/index.scss'
|
||||
@@ -496,12 +497,23 @@ export default {
|
||||
break
|
||||
}
|
||||
case 'week': {
|
||||
|
||||
// const isTodayInView = moment(date).week() == moment().week()
|
||||
|
||||
date = ud.getPreviousFirstDayOfWeek(date, this.startWeekOnSunday)
|
||||
const weekDaysCount = this.hideWeekends ? 5 : 7
|
||||
this.view.startDate = this.hideWeekends && this.startWeekOnSunday ? ud.addDays(date, 1) : date
|
||||
this.view.startDate.setHours(0, 0, 0, 0)
|
||||
|
||||
// if (isTodayInView) {
|
||||
// this.view.endDate = ud.addDays(date, weekDaysCount + 2)
|
||||
// } else {
|
||||
// this.view.endDate = ud.addDays(date, weekDaysCount)
|
||||
// }
|
||||
|
||||
this.view.endDate = ud.addDays(date, weekDaysCount)
|
||||
this.view.endDate.setSeconds(-1) // End at 23:59:59.
|
||||
|
||||
break
|
||||
}
|
||||
case 'day': {
|
||||
@@ -1422,6 +1434,7 @@ export default {
|
||||
},
|
||||
weekDays() {
|
||||
let { weekDays, weekDaysShort = [] } = this.texts
|
||||
|
||||
// Do not modify original for next instances.
|
||||
weekDays = weekDays.slice(0).map((day, i) => ({
|
||||
label: day,
|
||||
@@ -1528,6 +1541,8 @@ export default {
|
||||
if (!this.watchRealTime) this.now = new Date()
|
||||
const now = this.now
|
||||
|
||||
// console.log(this.view.id)
|
||||
|
||||
switch (this.view.id) {
|
||||
case 'years': {
|
||||
fromYear = this.view.startDate.getFullYear()
|
||||
@@ -1597,12 +1612,30 @@ export default {
|
||||
break
|
||||
}
|
||||
case 'week': {
|
||||
todayFound = false
|
||||
const firstDayOfWeek = this.view.startDate
|
||||
const weekDays = this.weekDays
|
||||
todayFound = false
|
||||
let firstDayOfWeek = this.view.startDate
|
||||
const weekDays = this.weekDays
|
||||
// const isTodayInView = moment(this.view.startDate).week() == moment().week()
|
||||
// const weekDayTemplate = {label: '', hide: 0}
|
||||
// let firstDayOfWeek = null
|
||||
|
||||
// if (isTodayInView) {
|
||||
// this.view.startDate = new Date(moment().subtract(1, 'days'))
|
||||
|
||||
// for (let i = 0; i <= 9 - weekDays.length ; i += 1) {
|
||||
// weekDays.push(weekDayTemplate)
|
||||
// }
|
||||
// } else {
|
||||
// while(weekDays.length > 7) {
|
||||
// weekDays.pop()
|
||||
// }
|
||||
// }
|
||||
|
||||
// firstDayOfWeek = this.view.startDate
|
||||
|
||||
cells = weekDays
|
||||
.map((cell, i) => {
|
||||
|
||||
const startDate = ud.addDays(firstDayOfWeek, this.startWeekOnSunday ? i - 1 : i)
|
||||
const endDate = new Date(startDate)
|
||||
endDate.setHours(23, 59, 59, 0) // End at 23:59:59.
|
||||
@@ -1618,6 +1651,9 @@ export default {
|
||||
}
|
||||
})
|
||||
.filter((cell, i) => !weekDays[i].hide)
|
||||
|
||||
|
||||
|
||||
break
|
||||
}
|
||||
case 'day': {
|
||||
@@ -1638,6 +1674,7 @@ export default {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return cells
|
||||
},
|
||||
// Only when hiding weekdays on month and week views.
|
||||
|
||||
Reference in new issue
Block a user