-
Notifications
You must be signed in to change notification settings - Fork 77
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.
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
UI: custom leaves #1833
UI: custom leaves #1833
Conversation
… into UI_custom_leaves Backend changes for custom leaves
update_custom_leaves: [:id, :name, :color, :icon, :allocation_value, | ||
:allocation_period, user_ids: [], | ||
], | ||
remove_custom_leaves: [] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
id
is missing here IMO
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. |
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Leaves
=> leaves
> | ||
{employees.map((emp, index) => ( | ||
<Fragment key={emp.value}> | ||
<span>{emp.label}</span>{" "} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove {" "}
merge with develop
closes #1795
Preview:
Figma:
https://www.figma.com/file/4gdPDRPqGqQqPYsO3Qj8CG/Miru-App?type=design&node-id=19945-56573&mode=design&t=YmWWda4Jzv5OeBl6-0