Applied fix as suggested by the code review

sql-bi · Apr 10, 2024 · 3b136ea · 3b136ea
1 parent c6cecee
commit 3b136ea
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Dax.Template/Tables/Dates/HolidaysTable.cs b/src/Dax.Template/Tables/Dates/HolidaysTable.cs
@@ -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] IN {{ 0, 1, 2, 3, 4, 5, 6 }},
+                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 )