Skip to content

Commit

Permalink
Fix error when 0 (Sunday) is used as WeekDayNumber in HolidaysDefin…
Browse files Browse the repository at this point in the history
…ition.json (#45)

* Fix configuration error when WeekDayNumber is 0 (Sunday)

* Applied fix as suggested by the code review
  • Loading branch information
albertospelta committed Apr 10, 2024
1 parent 1d7a13a commit 8f32168
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/Dax.Template/Tables/Dates/HolidaysTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ public HolidaysTable(IHolidaysConfig config): base(config)
__SeptemberEquinox + '{config.HolidaysDefinitionTable}'[DayNumber],
IF ( '{config.HolidaysDefinitionTable}'[MonthNumber] = 96, -- March Equinox
__MarchEquinox + '{config.HolidaysDefinitionTable}'[DayNumber],
IF ( '{config.HolidaysDefinitionTable}'[WeekDayNumber] <> 0,
IF ( '{config.HolidaysDefinitionTable}'[WeekDayNumber] IN {{ 0, 1, 2, 3, 4, 5, 6 }}
&& '{config.HolidaysDefinitionTable}'[DayNumber] = 0
&& '{config.HolidaysDefinitionTable}'[OffsetWeek] <> 0
&& '{config.HolidaysDefinitionTable}'[MonthNumber] IN {{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }},
VAR _ReferenceDate =
DATE ( __HolidayYear, 1
+ MOD ( '{config.HolidaysDefinitionTable}'[MonthNumber] - 1 + IF ( '{config.HolidaysDefinitionTable}'[OffsetWeek] < 0, 1 ), 12 ), 1 )
Expand Down

0 comments on commit 8f32168

Please sign in to comment.