This repository was archived by the owner on Dec 16, 2019. It is now read-only.
Controllers #7
Closed
Controllers #7
Conversation
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
donjar
reviewed
Feb 21, 2017
app/controllers/duties_controller.rb
Outdated
|
|
||
| redirect_to action: 'index' if @timeslot_id.update(@user_id) | ||
| end | ||
|
|
app/controllers/duties_controller.rb
Outdated
| redirect_to action: 'index' if @duty_id.update(@user_id) | ||
| end | ||
|
|
||
| def setdefault |
app/controllers/duties_controller.rb
Outdated
| def index | ||
| date = params[:date] | ||
| starting_date = date - (date.cwdays - 1) | ||
| @duties = Array.new(7) |
Contributor
There was a problem hiding this comment.
Array.new(starting_date..(starting_date + 7)) does this work?
app/controllers/duties_controller.rb
Outdated
| end | ||
|
|
||
| def process_grab | ||
| @user_id = User.find(user_id_params) |
app/controllers/duties_controller.rb
Outdated
| redirect_to action: 'index' if @duty_id.update(:user_id, nil) | ||
| end | ||
|
|
||
| def edit |
Contributor
There was a problem hiding this comment.
We're going to do a mass update, just like in the old duty website. Maybe check the current admin panel?
app/controllers/duties_controller.rb
Outdated
| @user_id = User.find(user_id_params) | ||
| @duty_id = Duty.find(duty_id_params) | ||
|
|
||
| # user_id of duty_id should and must be null |
app/controllers/duties_controller.rb
Outdated
| redirect_to action: 'index' if @timeslot_id.update(@user_id) | ||
| end | ||
|
|
||
| def user_id_params |
Contributor
There was a problem hiding this comment.
Wait, actually what is this for?
… update function in the action 'update'
Contributor
|
Progress? |
donjar
approved these changes
Mar 15, 2017
| expect(flash[:notice]).to eq 'Successfully grabbed duty!' | ||
| end | ||
|
|
||
| it 'shows error if user is not found' do |
| week_offset = params[:week_offset] | ||
| day_offset = (Time.zone.now.wday - 1) % 7 | ||
| start_date = Time.zone.now - day_offset.days + week_offset.weeks | ||
| @duties = Duty.where("date >= #{start_date} && " \ |
Contributor
There was a problem hiding this comment.
I think this should be abstracted out to be a model function, something like Duty.week_of(Time.zone.now - 7.days)?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.