Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fdow taken into account when calculating daysBefore #2444

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: fdow taken into account when calculating daysBefore #2444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aea43e
fix: fdow taken into account when calculating daysBefore
ThomasGuenard Apr 5, 2024
aa79b71
Update src/dateutils.ts
ThomasGuenard Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/dateutils.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@ describe('dateutils', function () {
expect(days[days.length - 1].toString()).toBe(XDate(2014, 3, 5, 0, 0, 0, true).toString());
});

it('2023 November - week starts on monday', function () {
const days = page(XDate(2023, 9, 1, true), 1, true);
expect(days.length).toBe(42);
expect(days[0].toString()).toBe(XDate(2023, 8, 25, 0, 0, 0, true).toString());
expect(days[days.length - 1].toString()).toBe(XDate(2023, 10, 5, 0, 0, 0, true).toString());
});

it('2014 May', function () {
const days = page(XDate(2014, 4, 23));
expect(days.length).toBe(35);
Expand Down
16 changes: 8 additions & 8 deletions src/dateutils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,25 +131,25 @@ export function page(date: XDate, firstDayOfWeek = 0, showSixWeeks = false) {
let after: XDate[] = [];

const fdow = (7 + firstDayOfWeek) % 7 || 7;
const ldow = (fdow + 6) % 7;

const ldow = (fdow + 6) % 7;
firstDayOfWeek = firstDayOfWeek || 0;

const from = days[0].clone();
const daysBefore = from.getDay();
const daysBefore = (from.getDay() + 7 - fdow) % 7;

if (from.getDay() !== fdow) {
if (from.getDay() !== fdow) {
from.addDays(-(from.getDay() + 7 - fdow) % 7);
}

const to = days[days.length - 1].clone();
const day = to.getDay();
if (day !== ldow) {
const day = to.getDay();
if (day !== ldow) {
to.addDays((ldow + 7 - day) % 7);
}

const daysForSixWeeks = (daysBefore + days.length) / 6 >= 6;

if (showSixWeeks && !daysForSixWeeks) {
to.addDays(7);
}
Expand Down