Commit4a4ed57

authored

refactor: useisLeapYear (#1638)

1 parentd8cfdcd commit4a4ed57Copy full SHA for 4a4ed57

File tree

+34

-23

lines changed

+34

-23

lines changed

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,8 @@`
`6`	`6`	`Algorithm & Explanation : https://ncalculators.com/time-date/date-difference-calculator.htm`
`7`	`7`	`*/`
`8`	`8`
`9`		`-// Internal method for make calculations easier`
`10`		`-constisLeap=(year)=>{`
`11`		`-if(year%400===0)returntrue`
`12`		`-elseif(year%100===0)returnfalse`
`13`		`-elseif(year%4===0)returntrue`
`14`		`-elsereturnfalse`
`15`		`-}`
	`9`	`+import{isLeapYear}from'../Maths/LeapYear'`
	`10`	`+`
`16`	`11`	`constDateToDay=(dd,mm,yyyy)=>{`
`17`	`12`	`return(`
`18`	`13`	`365*(yyyy-1)+`
`@@ -21,7 +16,7 @@ const DateToDay = (dd, mm, yyyy) => {`
`21`	`16`	`Math.floor((yyyy-1)/400)+`
`22`	`17`	`dd+`
`23`	`18`	`Math.floor((367*mm-362)/12)+`
`24`		`-(mm<=2 ?0 :isLeap(yyyy) ?-1 :-2)`
	`19`	`+(mm<=2 ?0 :isLeapYear(yyyy) ?-1 :-2)`
`25`	`20`	`)`
`26`	`21`	`}`
`27`	`22`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`e.g.: mahfoudh.arous.com ->false`
`7`	`7`	`*/`
`8`	`8`
	`9`	`+import{isLeapYear}from'../Maths/LeapYear'`
	`10`	`+`
`9`	`11`	`constgetMonthDays=(monthNumber,year)=>{`
`10`	`12`	`constthe31DaysMonths=[1,3,5,7,8,10,12]`
`11`	`13`	`constthe30DaysMonths=[4,6,9,11]`
`@@ -26,11 +28,8 @@ const getMonthDays = (monthNumber, year) => {`
`26`	`28`	`return30`
`27`	`29`	`}`
`28`	`30`
`29`		`-// Check for Leap year`
`30`		`-if(year%4===0){`
`31`		`-if(year%100!==0\|\|(year%100===0&&year%400===0)){`
`32`		`-return29`
`33`		`-}`
	`31`	`+if(isLeapYear(year)){`
	`32`	`+return29`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`return28`

Lines changed: 27 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,33 @@`
`1`	`1`	`import{getMonthDays}from'../GetMonthDays'`
`2`	`2`
`3`	`3`	`describe('Get the Days of a Month',()=>{`
`4`		`-it('expects to return 28',()=>{`
`5`		`-expect(getMonthDays(2,2018)).toEqual(28)`
`6`		`-})`
`7`		`-`
`8`		`-it('expects to return 30',()=>{`
`9`		`-expect(getMonthDays(6,254)).toEqual(30)`
`10`		`-})`
`11`		`-`
`12`		`-it('expects to return 29',()=>{`
`13`		`-expect(getMonthDays(2,2024)).toEqual(29)`
	`4`	`+it.each([`
	`5`	`+[1,2024,31],`
	`6`	`+[2,2024,29],`
	`7`	`+[3,2024,31],`
	`8`	`+[4,2024,30],`
	`9`	`+[5,2024,31],`
	`10`	`+[6,2024,30],`
	`11`	`+[7,2024,31],`
	`12`	`+[8,2024,31],`
	`13`	`+[9,2024,30],`
	`14`	`+[10,2024,31],`
	`15`	`+[11,2024,30],`
	`16`	`+[12,2024,31],`
	`17`	`+[1,2023,31],`
	`18`	`+[2,2023,28],`
	`19`	`+[3,2023,31],`
	`20`	`+[4,2023,30],`
	`21`	`+[5,2023,31],`
	`22`	`+[6,2023,30],`
	`23`	`+[7,2023,31],`
	`24`	`+[8,2023,31],`
	`25`	`+[9,2023,30],`
	`26`	`+[10,2023,31],`
	`27`	`+[11,2023,30],`
	`28`	`+[12,2023,31]`
	`29`	`+])('Month %i in year %i has %i days',(month,year,expected)=>{`
	`30`	`+expect(getMonthDays(month,year)).toBe(expected)`
`14`	`31`	`})`
`15`	`32`
`16`	`33`	`it('expects to throw a type error',()=>{`

Comments

(0)