From 79532af23512a9f70b652264297c4b2214ab80c6 Mon Sep 17 00:00:00 2001 From: Pilar Candia Date: Tue, 29 Oct 2024 09:38:45 -0400 Subject: [PATCH] [5.4] MSPB-376: Set 'range dates' as 'cycle=monthly' for non recurring (#557) --- submodules/strategyHolidays/strategyHolidays.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/submodules/strategyHolidays/strategyHolidays.js b/submodules/strategyHolidays/strategyHolidays.js index 3b79b46a..0ae4ebf4 100644 --- a/submodules/strategyHolidays/strategyHolidays.js +++ b/submodules/strategyHolidays/strategyHolidays.js @@ -1087,7 +1087,11 @@ define(function(require) { } else { holidayRule = _.merge({}, holidayRuleConfig, { name: name, - cycle: holidayData.recurring ? 'yearly' : 'date', + cycle: holidayData.recurring + ? 'yearly' + : holidayData.toDay + ? 'monthly' + : 'date', interval: 1, month: month, type: 'main_holidays' @@ -1149,7 +1153,7 @@ define(function(require) { days = _.range(fromDay, toDay + 1), rule = { name: name + '_' + month, - cycle: data.start_date ? 'date' : 'yearly', + cycle: data.start_date ? 'monthly' : 'yearly', days: days, interval: 1, month: month,