Skip to content
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

Jump to bottom

Show only kept holidays #1738

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Show only kept holidays #1738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/views/internal_api/v1/holidays/index.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ json.holidays holidays do |holiday|
json.holiday_types holiday.holiday_types
json.time_period_optional_holidays holiday.time_period_optional_holidays

json.national_holidays holiday.holiday_infos.national.each do |holiday_info|
json.national_holidays holiday.holiday_infos.kept.national.each do |holiday_info|
json.id holiday_info.id
json.date CompanyDateFormattingService.new(holiday_info.date, company: current_company).process
json.name holiday_info.name
json.category holiday_info.category
end

json.optional_holidays holiday.holiday_infos.optional.each do |holiday_info|
json.optional_holidays holiday.holiday_infos.kept.optional.each do |holiday_info|
json.id holiday_info.id
json.date CompanyDateFormattingService.new(holiday_info.date, company: current_company).process
json.name holiday_info.name
Expand Down
Loading