View public holiday and optional holiday cards on leave management #1753
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
|
Can you please fix the specs @prasanthchaduvula ? |
nisusam
reviewed
Mar 22, 2024
nisusam
reviewed
Mar 22, 2024
Comment on lines
+16
to
+29
| json.optional_timeoff_entries optional_timeoff_entries do |timeoff_entry| | ||
| json.id timeoff_entry.id | ||
| json.duration timeoff_entry.duration | ||
| json.leave_date CompanyDateFormattingService.new(timeoff_entry.leave_date, company: current_company).process | ||
| json.holiday_info timeoff_entry.holiday_info if timeoff_entry.holiday_info.present? | ||
| json.type timeoff_entry.holiday_info.present? ? "holiday" : "leave" | ||
| end | ||
|
|
||
| json.national_timeoff_entries national_timeoff_entries do |timeoff_entry| | ||
| json.id timeoff_entry.id | ||
| json.duration timeoff_entry.duration | ||
| json.leave_date CompanyDateFormattingService.new(timeoff_entry.leave_date, company: current_company).process | ||
| json.holiday_info timeoff_entry.holiday_info if timeoff_entry.holiday_info.present? | ||
| json.type timeoff_entry.holiday_info.present? ? "holiday" : "leave" |
Collaborator
There was a problem hiding this comment.
Can we send timeoff_type as national or optional?
Contributor
Author
There was a problem hiding this comment.
No, as we need two different arrays on client side and if we make it into one array with timeoff_type as national or optional then we have to filter on client side.
nisusam
approved these changes
Mar 22, 2024
Collaborator
nisusam
left a comment
There was a problem hiding this comment.
Please fix the failing specs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1735
What