Skip to content

Commit

Permalink
[5.1] MSPB-246: Do not allow duplicate names when importing a holiday (
Browse files Browse the repository at this point in the history
  • Loading branch information
pcandia authored Jul 13, 2022
1 parent cc44587 commit 65cbdd2
Showing 1 changed file with 30 additions and 5 deletions.
35 changes: 30 additions & 5 deletions submodules/strategyHolidays/strategyHolidays.js
Original file line number Diff line number Diff line change
Expand Up @@ -607,15 +607,15 @@ define(function(require) {

strategyHolidaysGetHolidaysForCurrentYear: function(parent) {
var self = this,
holidaysData = self.appFlags.strategyHolidays.allHolidays,
allHolidays = self.appFlags.strategyHolidays.allHolidays,
yearSelected = parseInt(parent.find('#year').val()),
isCurrentYear = _.flow(
_.partial(_.get, _, 'endYear'),
_.partial(_.isEqual, _, yearSelected)
),
isImported = _.partial(_.get, _, 'isImported'),
importedHolidaysList = _
.chain(holidaysData)
.chain(allHolidays)
.map(function(holiday, key) {
var holidayData = _.get(holiday, 'holidayData');

Expand Down Expand Up @@ -679,7 +679,8 @@ define(function(require) {
isOrdinalValid,
isValid
]);
};
},
allHolidays = self.appFlags.strategyHolidays.allHolidays;

monster.pub('common.csvUploader.renderPopup', {
title: i18n.importOfficeHolidays.title,
Expand Down Expand Up @@ -717,12 +718,36 @@ define(function(require) {
end: _.stubTrue
}),
isStartDateValid = datesValidator.start(start_date),
isEndDateValid = datesValidator.end(end_date);
isEndDateValid = datesValidator.end(end_date),
isSameName = _.flow(
_.partial(_.get, _, 'name'),
_.partial(_.isEqual, _, row.name)
),
isSameYear = _.partial(_.get, _, 'isSameYear'),
isNameValid = _
.chain(allHolidays)
.map(function(holiday, key) {
var data = _.get(holiday, 'holidayData');

return _.merge({
isSameYear: _.get(data, 'recurring')
? true
: row.year === data.endYear
}, _.pick(data, [
'name'
]));
})
.filter(_.overEvery(
isSameYear,
isSameName
))
.value();

return _.every([
isTypeValid,
isStartDateValid,
isEndDateValid
isEndDateValid,
_.isEmpty(isNameValid)
]);
}
},
Expand Down

0 comments on commit 65cbdd2

Please sign in to comment.