UI: custom leaves #1833
Merged
UI: custom leaves #1833
Conversation
This file contains 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
… into UI_custom_leaves Backend changes for custom leaves
nisusam
reviewed
May 16, 2024
| update_custom_leaves: [:id, :name, :color, :icon, :allocation_value, | ||
| :allocation_period, user_ids: [], | ||
| ], | ||
| remove_custom_leaves: [] |
There was a problem hiding this comment.
Its not required here. It will accept array of ids
|
@Shruti-Apte Please resolve conflicts |
|
@nisusam I've resolved conflicts. Please have another look. @Shruti-Apte Backend code was updated. Please check if everything working as expected. |
added 4 commits
May 21, 2024 10:39
nisusam
requested changes
May 27, 2024
| CustomLeavesService.new(leave, update_params).process | ||
| render json: { notice: "Leaves updated successfully" }, status: :ok | ||
| CustomLeavesService.new(@leave, update_params).process | ||
| render json: { notice: "Custom Leaves updated successfully" }, status: :ok |
| > | ||
| {employees.map((emp, index) => ( | ||
| <Fragment key={emp.value}> | ||
| <span>{emp.label}</span>{" "} |
added 2 commits
May 30, 2024 10:41
merge with develop
nisusam
approved these changes
May 31, 2024
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 #1795
Preview:
Figma:
https://www.figma.com/file/4gdPDRPqGqQqPYsO3Qj8CG/Miru-App?type=design&node-id=19945-56573&mode=design&t=YmWWda4Jzv5OeBl6-0