MIM-2168: Fixed bug where weeknr is wrong

statisticsnorway · Jan 21, 2025 · eace5dc · eace5dc
1 parent a19f87e
commit eace5dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/main/resources/lib/ssb/utils/variantUtils.ts b/src/main/resources/lib/ssb/utils/variantUtils.ts
@@ -6,7 +6,7 @@ import { groupBy } from '/lib/vendor/ramda'
 
 import { getMainSubject, getMainSubjectStatistic } from '/lib/ssb/utils/parentUtils'
 import { sameDay, createMonthName, formatDate, isSameOrBefore } from '/lib/ssb/utils/dateUtils'
-import { parseISO, getMonth, getYear, getDate } from '/lib/vendor/dateFns'
+import { parseISO, getMonth, getYear, getDate, getISOWeek } from '/lib/vendor/dateFns'
 import * as util from '/lib/util'
 import {
   type DayReleases,
@@ -186,20 +186,12 @@ function calculateMonth(previousFrom: string, language: string): string {
   })
 }
 
-function getWeek(date: Date): number {
-  const onejan: number = new Date(date.getFullYear(), 0, 1).getTime()
-  const today: number = new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime()
-  const diff: number = today - onejan
-  const dayOfYear: number = (diff + 86400000) / 86400000
-  return Math.ceil(dayOfYear / 7)
-}
-
 function calculateWeek(previousFrom: string, language: string): string {
   const date: Date = new Date(previousFrom)
   return localize({
     key: 'period.week',
     locale: language,
-    values: [getWeek(date).toString(), date.getFullYear().toString()],
+    values: [getISOWeek(date).toString(), date.getFullYear().toString()],
   })
 }
 

diff --git a/src/main/resources/lib/vendor/dateFns.ts b/src/main/resources/lib/vendor/dateFns.ts
@@ -18,3 +18,4 @@ export { isBefore } from 'date-fns/isBefore'
 export { isSameDay } from 'date-fns/isSameDay'
 export { isSameSecond } from 'date-fns/isSameSecond'
 export { formatDistanceToNowStrict } from 'date-fns/formatDistanceToNowStrict'
+export { getISOWeek } from 'date-fns/getISOWeek'