Merged
Conversation
again. revised backend/leave_application view and controller to block the exception in order to avoid bugs.
canceled. Prevent possible bugs by revising leave_application view and leave_applications#update
corresponding leave_application.js, leave_applications#index
corresponding js, controller and routes.
… leave_application#new instead of leave_applications#index
Features/leave application
…val (#142) * #125 Able to rollback when new application overlaps other applications * Refactor leave application error list with helper method: leave_application_error_list * Refactoring code including LeaveApplicationsController and _form view * Add leave_application spec including: scope .personal spec, scope boundary spec * Refactor error message in leave_application#new * Fix rspec: check if overlap application valid when leave application created * Code Refactoring * Revise LeaveApplication validation .should_not_overlaps_other_applications * Refactor form error messages code * Remove unnecessary factory trait * Refactor LeaveApplication .personal spec * Refactor LeaveApplication Scope .personal spec * Add error message spec to LeaveApplication validation shared_example invalid overlap spec * Revise error message
* Fix for manager can't delete employee * Delete useless code, 'uuid' and 'leave_application_logs'
…hods (#154) * #153 Fix LeaveApplication after_update .update_leave_time_usages callback function * #153 Add LeaveApplication after_update .update_leave_time_usages spec * Revise LeaveApplication after_update update_leave_time_usages condition * Separate AASM and LeaveApplication callbacks in order to fix AASM built-in status methods * #153 Add LeaveApplication AASM and callback spec * Fix rubocop syntax style * Fix user query bug in LeaveApplication controller private method .collection_scope * Fix aasm conditional transition approved to cancel unless LeaveApplication happened spec
…ld LeaveTimeUsage
…_time and assign_date (#167) * #29 Add non-user-model fields assign_leave_time and assign_date with validations * #29 Able to import User LeaveTime optionally with additional two fields: assign_leave_time and assign_date * #29 LeaveTimeBuilder auto_assign_leave_time spec with specific assign_date * Minor refectorization * Adding spec
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
No description provided.