124 structure make rides associated with shifts #127
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.
This PR updated our ride model so now it is not directly associated with a date and driver, but instead gets those data from its associated shift.
This required making small changes in many files (eg everywhere there was
@ride.driver
had to be changed to@ride.shift.driver
)All the rspec and cucumber tests pass, although that isn't really a guarantee the app is completely functional.
Additional changes:
This issue actually ended up being much more involved than I previously thought as I had to add completely new functionality for selecting a shift when creating a new ride. Right now you select a date, and then an ajax call collects the shifts on that date and you can associate a ride to that shift. There currently is no way to create a ride without associating it to a shift. All the javascript for this was put into a new file. A bunch of work also had to be done to get it to automatically select the right shift if you came to that page from the shift view page, but it all seems to work decently well
Also, I took the opportunity to change
shift.shift_date
to simplyshift.date
because that was bothering me.Also I need to add tests for the new shift selection functionality