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

加班補休額度申請 (#272) #296

Merged
merged 15 commits into from Sep 5, 2019
Merged

加班補休額度申請 (#272) #296

merged 15 commits into from Sep 5, 2019

Conversation

DC7806
Copy link
Contributor

@DC7806 DC7806 commented Mar 2, 2019 •
edited

Added

  • Add Overtimes frontend CRUD - model, settings
  • Add Overtimes frontend CRUD - routes, controller
  • Add Overtimes frontend CRUD - views, locales
  • Add OvertimePay model
  • Add OvertimePay association to User
  • Add Overtimes backend CRUD - routes, controller
  • Add Overtimes backend CRUD - views, helper, locales
  • Add Overtime model specs

Changed

  • Update Overtimes table

cindyliu923
cindyliu923 reviewed Mar 19, 2019
View reviewed changes
db/schema.rb Outdated Show resolved Hide resolved
@DC7806
Update Overtimes table
b3ac5dd
@DC7806
Add Overtimes frontend CRUD - model, settings
3f27127
@DC7806
Add Overtimes frontend CRUD - routes, controller
9f7fa55
@DC7806
Add Overtimes frontend CRUD - views, locales
a9726e4
@DC7806
Add OvertimePay model
1896ba6
@DC7806
Add OvertimePay association to User
92c551e
@DC7806
Add Overtimes backend CRUD - routes, controller
700db22
@DC7806
Add Overtimes backend CRUD - views, helper, locales
6849165
@DC7806
Add model specs
f13495a
@DC7806
Amend overtimes attribute :comment typo in schema
6f1b471
@DC7806
update overtime_pay association with user
9dd66b3
@DC7806
Update OvertimesHelper #render_append_hours_options
079b580
@DC7806
Add safe navigation operator to overtime_pay hour attribute
5901782
@DC7806
Update overtimes#create_leave_time, overtimes#create_compensatory_pay…
e64f54c 
… request
@DC7806
Add OvertimesHelper#overtime_submit_disabled? to add disabled conditi…
b9a3576 
…on for approval button
@jodeci jodeci merged commit b429f52 into 5xRuby:development Sep 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cindyliu923 cindyliu923 cindyliu923 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@DC7806 @cindyliu923 @jodeci