This commit is contained in:
kolaente 2020-11-25 18:51:44 +01:00
parent a5905a87e2
commit a60ef1c6df
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 19 additions and 15 deletions

View File

@ -107,6 +107,7 @@ import 'flatpickr/dist/flatpickr.css'
import {calculateDayInterval} from '@/helpers/time/calculateDayInterval' import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
import {format} from 'date-fns' import {format} from 'date-fns'
import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
export default { export default {
name: 'datepicker', name: 'datepicker',
@ -165,6 +166,9 @@ export default {
const interval = calculateDayInterval(date) const interval = calculateDayInterval(date)
const newDate = new Date() const newDate = new Date()
newDate.setDate(newDate.getDate() + interval) newDate.setDate(newDate.getDate() + interval)
newDate.setHours(calculateNearestHours(newDate))
newDate.setMinutes(0)
newDate.setSeconds(0)
this.date = newDate this.date = newDate
this.updateData() this.updateData()
}, },

View File

@ -1,4 +1,4 @@
export function calculateNearestTime(currentDate = new Date()) { export function calculateNearestHours(currentDate = new Date()) {
if (currentDate.getHours() <= 9 || currentDate.getHours() > 21) { if (currentDate.getHours() <= 9 || currentDate.getHours() > 21) {
return 9 return 9
} }

View File

@ -1,90 +1,90 @@
import {calculateNearestTime} from './calculateNearestTime' import {calculateNearestHours} from './calculateNearestHours'
test('5:00', () => { test('5:00', () => {
const date = new Date() const date = new Date()
date.setHours(5) date.setHours(5)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })
test('7:00', () => { test('7:00', () => {
const date = new Date() const date = new Date()
date.setHours(7) date.setHours(7)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })
test('7:41', () => { test('7:41', () => {
const date = new Date() const date = new Date()
date.setHours(7) date.setHours(7)
date.setMinutes(41) date.setMinutes(41)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })
test('9:00', () => { test('9:00', () => {
const date = new Date() const date = new Date()
date.setHours(9) date.setHours(9)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })
test('10:00', () => { test('10:00', () => {
const date = new Date() const date = new Date()
date.setHours(10) date.setHours(10)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(12) expect(calculateNearestHours(date)).toBe(12)
}) })
test('12:00', () => { test('12:00', () => {
const date = new Date() const date = new Date()
date.setHours(12) date.setHours(12)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(12) expect(calculateNearestHours(date)).toBe(12)
}) })
test('13:00', () => { test('13:00', () => {
const date = new Date() const date = new Date()
date.setHours(13) date.setHours(13)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(15) expect(calculateNearestHours(date)).toBe(15)
}) })
test('15:00', () => { test('15:00', () => {
const date = new Date() const date = new Date()
date.setHours(15) date.setHours(15)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(15) expect(calculateNearestHours(date)).toBe(15)
}) })
test('16:00', () => { test('16:00', () => {
const date = new Date() const date = new Date()
date.setHours(16) date.setHours(16)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(18) expect(calculateNearestHours(date)).toBe(18)
}) })
test('18:00', () => { test('18:00', () => {
const date = new Date() const date = new Date()
date.setHours(18) date.setHours(18)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(18) expect(calculateNearestHours(date)).toBe(18)
}) })
test('19:00', () => { test('19:00', () => {
const date = new Date() const date = new Date()
date.setHours(19) date.setHours(19)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(21) expect(calculateNearestHours(date)).toBe(21)
}) })
test('22:00', () => { test('22:00', () => {
const date = new Date() const date = new Date()
date.setHours(22) date.setHours(22)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })
test('22:40', () => { test('22:40', () => {
const date = new Date() const date = new Date()
date.setHours(22) date.setHours(22)
date.setMinutes(0) date.setMinutes(0)
expect(calculateNearestTime(date)).toBe(9) expect(calculateNearestHours(date)).toBe(9)
}) })