Skip to content

Draft: small fix for loading holidays correctly #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boekhorstb1 wants to merge 3 commits into
base: FRAMEWORK_6_0
Choose a base branch
from
Open

Draft: small fix for loading holidays correctly #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8782933
small fix for loading holidays correctly
boekhorstb1 Jan 24, 2023
9d35a24
adapting regex to deal with multiple calendars
boekhorstb1 Jan 24, 2023
ed5a8cf
iterating over list of unselected holidays retoggle them
boekhorstb1 Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions js/kronolith.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3853,8 +3853,21 @@ KronolithCore = {
data.owner_input = null;
}
if (data.type == 'holiday') {
this.insertCalendarInList('holiday', data.driver, Kronolith.conf.calendars.holiday[data.driver]);
this.toggleCalendar('holiday', data.driver);

// getting the holidays that are listed but unselected
let check = this.getCalendarList(data.type);
let checklist = check.select('span.horde-resource-off').map(
item => item = item.textContent
);

// checking if the new calendar is in the unselected list
if (checklist.indexOf(data.driver) > -1){
this.toggleCalendar('holiday', data.driver);
}else{
this.insertCalendarInList('holiday', data.driver, Kronolith.conf.calendars.holiday[data.driver]);
this.toggleCalendar('holiday', data.driver);
}

form.down('.kronolithCalendarSave').enable();
this.closeRedBox();
this.go(this.lastLocation);
Expand Down