Skip to content

Commit

Permalink
fix(period-week-number): added testcase for the period week number ca…
Browse files Browse the repository at this point in the history 
…lculations
  • Loading branch information
@AhsanAyaz
Mohammad Taha authored and AhsanAyaz committed Apr 9, 2024
1 parent 63161ee commit 5daae5d
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 60 deletions.
174 changes: 116 additions & 58 deletions ...ts/angular-year-calendar/src/lib/components/year-calendar/year-calendar.component.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { async, ComponentFixture, TestBed } from "@angular/core/testing";

import { YearCalendarComponent } from './year-calendar.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { HeatmapColorDirective } from '../../directives/heatmap-color.directive';
import { OverlayModule } from '@angular/cdk/overlay';
import { DEFAULT_CONFIG } from '../../constants/default-config';
import { YearCalendarComponent } from "./year-calendar.component";
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
import { HeatmapColorDirective } from "../../directives/heatmap-color.directive";
import { OverlayModule } from "@angular/cdk/overlay";
import { DEFAULT_CONFIG } from "../../constants/default-config";

describe('YearCalendarComponent', () => {
describe("YearCalendarComponent", () => {
let component: YearCalendarComponent;
let fixture: ComponentFixture<YearCalendarComponent>;
const twentyNineteen = 2019;
const twentyTwentyOne = 2021;
const twentyTwentyTwo = 2022;
const twentyTwentySeven = 2027;
const twentyTwentyFour = 2024;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [OverlayModule],
declarations: [YearCalendarComponent, HeatmapColorDirective],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
.compileComponents();
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
}));

beforeEach(() => {
Expand All @@ -30,87 +30,115 @@ describe('YearCalendarComponent', () => {
fixture.detectChanges();
});

describe('default config', () => {
describe("default config", () => {
beforeEach(() => {
component.ycConfig = {...DEFAULT_CONFIG};
component.ycConfig = { ...DEFAULT_CONFIG };
});
afterEach(() => {
component.ycConfig = {...DEFAULT_CONFIG};
component.ycConfig = { ...DEFAULT_CONFIG };
});

it('should start the day from Sunday with default (0) weekStartsOn', () => {
it("should start the day from Sunday with default (0) weekStartsOn", () => {
component.render(twentyNineteen);
expect(component.daysOfWeek).toEqual([ 'Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa' ]);
});

it('should start the days from Wednesday with weekStartsOn set to 3', () => {
expect(component.daysOfWeek).toEqual([
"Su",
"Mo",
"Tu",
"We",
"Th",
"Fr",
"Sa",
]);
});

it("should start the days from Wednesday with weekStartsOn set to 3", () => {
component.ycConfig.weekStartsOn = 3;
component.render(twentyNineteen);
expect(component.daysOfWeek).toEqual([ 'We', 'Th', 'Fr', 'Sa', 'Su', 'Mo', 'Tu' ]);
expect(component.daysOfWeek).toEqual([
"We",
"Th",
"Fr",
"Sa",
"Su",
"Mo",
"Tu",
]);
});
});

describe('weekStartsOn set to 1. I.e. Monday', () => {
describe("weekStartsOn set to 1. I.e. Monday", () => {
beforeEach(() => {
component.ycConfig = {...DEFAULT_CONFIG, ...{showWeekNumbers: true, weekStartsOn: 1}};
component.ycConfig = {
...DEFAULT_CONFIG,
...{ showWeekNumbers: true, weekStartsOn: 1 },
};
});

afterEach(() => {
component.ycConfig = {...DEFAULT_CONFIG, ...{showWeekNumbers: true, weekStartsOn: 1}};
component.ycConfig = {
...DEFAULT_CONFIG,
...{ showWeekNumbers: true, weekStartsOn: 1 },
};
});

it('should have the correct first week numbers for 2019', () => {
it("should have the correct first week numbers for 2019", () => {
component.render(twentyNineteen);
expect(component.yearData[0].weekNumbers).toEqual([ 1, 2, 3, 4, 5 ]);
expect(component.yearData[0].weekNumbers).toEqual([1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2021', () => {
it("should have the correct first week numbers for 2021", () => {
component.render(twentyTwentyOne);
expect(component.yearData[0].weekNumbers).toEqual([ 53, 1, 2, 3, 4]);
expect(component.yearData[0].weekNumbers).toEqual([53, 1, 2, 3, 4]);
});

it('should have the correct first week numbers for 2022', () => {
it("should have the correct first week numbers for 2022", () => {
component.render(twentyTwentyTwo);
expect(component.yearData[0].weekNumbers).toEqual([ 52, 1, 2, 3, 4, 5]);
expect(component.yearData[0].weekNumbers).toEqual([52, 1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2027', () => {
it("should have the correct first week numbers for 2027", () => {
component.render(twentyTwentySeven);
expect(component.yearData[0].weekNumbers).toEqual([ 53, 1, 2, 3, 4]);
expect(component.yearData[0].weekNumbers).toEqual([53, 1, 2, 3, 4]);
});
});

describe('weekStartsOn set to 3. I.e. Wednesday', () => {
describe("weekStartsOn set to 3. I.e. Wednesday", () => {
beforeEach(() => {
component.ycConfig = {...DEFAULT_CONFIG, ...{showWeekNumbers: true, weekStartsOn: 3}};
component.ycConfig = {
...DEFAULT_CONFIG,
...{ showWeekNumbers: true, weekStartsOn: 3 },
};
});

afterEach(() => {
component.ycConfig = {...DEFAULT_CONFIG, ...{showWeekNumbers: true, weekStartsOn: 3}};
component.ycConfig = {
...DEFAULT_CONFIG,
...{ showWeekNumbers: true, weekStartsOn: 3 },
};
});

it('should have the correct first week numbers for 2019', () => {
it("should have the correct first week numbers for 2019", () => {
component.render(twentyNineteen);
expect(component.yearData[0].weekNumbers).toEqual([ 52, 1, 2, 3, 4, 5 ]);
expect(component.yearData[0].weekNumbers).toEqual([52, 1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2021', () => {
it("should have the correct first week numbers for 2021", () => {
component.render(twentyTwentyOne);
expect(component.yearData[0].weekNumbers).toEqual([ 1, 2, 3, 4, 5]);
expect(component.yearData[0].weekNumbers).toEqual([1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2022', () => {
it("should have the correct first week numbers for 2022", () => {
component.render(twentyTwentyTwo);
expect(component.yearData[0].weekNumbers).toEqual([ 1, 2, 3, 4, 5]);
expect(component.yearData[0].weekNumbers).toEqual([1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2027', () => {
it("should have the correct first week numbers for 2027", () => {
component.render(twentyTwentySeven);
expect(component.yearData[0].weekNumbers).toEqual([ 1, 2, 3, 4, 5]);
expect(component.yearData[0].weekNumbers).toEqual([1, 2, 3, 4, 5]);
});
});

describe('Week 5 is the first week of the year', () => {
describe("Week 5 is the first week of the year", () => {
beforeEach(() => {
component.ycConfig = {
...DEFAULT_CONFIG,
Expand All @@ -119,24 +147,26 @@ describe('YearCalendarComponent', () => {
weekStartsOn: 0,
firstWeekMonth: {
month: 0,
week: 4
}
}
week: 4,
},
},
};
});

it('should have the correct first week numbers for 2019', () => {
it("should have the correct first week numbers for 2019", () => {
component.render(twentyNineteen);
expect(component.yearData[0].weekNumbers).toEqual([ 49, 50, 51, 52, 1 ]);
expect(component.yearData[0].weekNumbers).toEqual([49, 50, 51, 52, 1]);
});

it('should have the correct first week numbers for 2021', () => {
it("should have the correct first week numbers for 2021", () => {
component.render(twentyTwentyOne);
expect(component.yearData[0].weekNumbers).toEqual([ 49, 50, 51, 52, 53, 1 ]);
expect(component.yearData[0].weekNumbers).toEqual([
49, 50, 51, 52, 53, 1,
]);
});
});

describe('With sunday as week start and march 7th as forced date', () => {
describe("With sunday as week start and march 7th as forced date", () => {
beforeEach(() => {
component.ycConfig = {
...DEFAULT_CONFIG,
Expand All @@ -145,26 +175,54 @@ describe('YearCalendarComponent', () => {
weekStartsOn: 0,
firstWeekMonth: {
month: 0,
week: 4
week: 4,
},
forceWeekDate: {
month: 2,
date: 7
date: 7,
},
forceWeek: true
}
forceWeek: true,
},
};
});

it('should have the correct first week numbers for 2019', () => {
it("should have the correct first week numbers for 2019", () => {
component.render(twentyNineteen);
expect(component.yearData[2].weekNumbers).toEqual([ 52, 1, 2, 3, 4, 5 ]);
expect(component.yearData[2].weekNumbers).toEqual([52, 1, 2, 3, 4, 5]);
});

it('should have the correct first week numbers for 2021', () => {
it("should have the correct first week numbers for 2021", () => {
component.render(twentyTwentyOne);
expect(component.yearData[2].weekNumbers).toEqual([ 52, 1, 2, 3, 4 ]);
expect(component.yearData[2].weekNumbers).toEqual([52, 1, 2, 3, 4]);
});
});

describe("With period week number set true for 13 month calculations", () => {
beforeEach(() => {
component.ycConfig = {
...DEFAULT_CONFIG,
...{
showWeekNumbers: true,
weekStartsOn: 1,
forceWeekDate: {
month: 0,
date: 1,
},
periodWeekNumber: true,
forceWeek: true,
},
};
});

it("should have the correct period numbers for 2024", () => {
component.render(twentyTwentyFour);
expect(component.yearData[0].weekNumbers).toEqual([
"P:1-W:1/4",
"P:1-W:2/4",
"P:1-W:3/4",
"P:1-W:4/4",
"P:2-W:1/4",
]);
});
});
});
11 changes: 9 additions & 2 deletions projects/angular-year-calendar/src/lib/pipes/week-number/week-number.pipe.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,14 @@ export class WeekNumberPipe implements PipeTransform {
const dateClone = new Date(date);
const millisecondsInADay = 86400000;

const { firstWeekMonth, weekStartsOn, forceWeek, forceWeekDate } = ycConfig;
const {
firstWeekMonth,
weekStartsOn,
forceWeek,
forceWeekDate,
periodWeekNumber,
} = ycConfig;

let result;
if (
firstWeekMonth === undefined ||
Expand Down Expand Up @@ -108,7 +115,7 @@ export class WeekNumberPipe implements PipeTransform {
}
}

if (ycConfig.periodWeekNumber) {
if (periodWeekNumber) {
// if forceWeek then use currentWeekStartDate instead of provided date
const currentYearStartDiff =
((forceWeek ? currentWeekStartDate : dateClone).getTime() -
Expand Down

0 comments on commit 5daae5d

Please sign in to comment.