From ee7f67aa40059a3aaff22dc4f3aaf1f2b4f9e36c Mon Sep 17 00:00:00 2001 From: Alberto Spelta Date: Thu, 11 Apr 2024 14:03:48 +0200 Subject: [PATCH] Rename VAR __NextWorkingDay to __NextWorkingWeekDay --- src/Dax.Template/Tables/Dates/HolidaysTable.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Dax.Template/Tables/Dates/HolidaysTable.cs b/src/Dax.Template/Tables/Dates/HolidaysTable.cs index 866df93..9b682f5 100644 --- a/src/Dax.Template/Tables/Dates/HolidaysTable.cs +++ b/src/Dax.Template/Tables/Dates/HolidaysTable.cs @@ -165,16 +165,16 @@ public HolidaysTable(IHolidaysConfig config): base(config) ), IF ( '{config.HolidaysDefinitionTable}'[SubstituteHoliday] > 0 && NOT CONTAINS ( __WorkingDays, ''[Value], __HolidayWeekDay ), - VAR _NextWorkingDay = + VAR _NextWorkingWeekDay = MINX ( FILTER ( __WorkingDays, ''[Value] > __HolidayWeekDay ), ''[Value] ) VAR _SubstituteWeekDay = IF ( - ISBLANK ( _NextWorkingDay ), + ISBLANK ( _NextWorkingWeekDay ), MINX ( __WorkingDays, ''[Value] ) + 7, - _NextWorkingDay + _NextWorkingWeekDay ) RETURN _SubstituteWeekDay - __HolidayWeekDay @@ -263,16 +263,16 @@ RETURN ROW ( VAR _SubstituteHolidayOffsetNonWorkingDays = IF ( NOT CONTAINS ( __WorkingDays, ''[Value], _HolidayWeekDayStep1 ), - VAR _NextWorkingDayStep2 = + VAR _NextWorkingWeekDayStep2 = MINX ( FILTER ( __WorkingDays, ''[Value] > _HolidayWeekDayStep1 ), ''[Value] ) VAR _SubstituteWeekDay = IF ( - ISBLANK ( _NextWorkingDayStep2 ), + ISBLANK ( _NextWorkingWeekDayStep2 ), MINX ( __WorkingDays, ''[Value] ) + 7, - _NextWorkingDayStep2 + _NextWorkingWeekDayStep2 ) RETURN _SubstituteWeekDay - _HolidayWeekDayStep1 )