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

KG - sub_service_request.submitted_at fix / updating functionality #677

Merged
merged 3 commits into from
Sep 26, 2016
Merged

KG - sub_service_request.submitted_at fix / updating functionality #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a7cafe
submitted_at fixes
Sep 22, 2016
1e71699
Merge branch 'master' into kg-ssr_submitted_at_fixes
Sep 22, 2016
61374e9
fixed typo
Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/controllers/service_requests_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@ def confirmation
if @sub_service_request.status != 'submitted'
to_notify << @sub_service_request.id
end

@sub_service_request.update_attributes(status: 'submitted', submitted_at: Time.now, nursing_nutrition_approved: false, lab_approved: false, imaging_approved: false, committee_approved: false)

@sub_service_request.update_attribute(:submitted_at, Time.now) unless @sub_service_request.status == 'submitted'
@sub_service_request.update_attributes(status: 'submitted', nursing_nutrition_approved: false, lab_approved: false, imaging_approved: false, committee_approved: false)
@sub_service_request.update_past_status(current_user)
else
to_notify = update_service_request_status(@service_request, 'submitted')
Expand Down Expand Up @@ -677,7 +678,7 @@ def update_service_request_status(service_request, status)
if (status == 'submitted')
service_request.previous_submitted_at = @service_request.submitted_at
service_request.update_attribute(:submitted_at, Time.now)
service_request.sub_service_requests.update_all(submitted_at: Time.now)
service_request.sub_service_requests.where.not(status: 'submitted').update_all(submitted_at: Time.now)
end
to_notify = service_request.update_status(status)
service_request.sub_service_requests.each {|ssr| ssr.update_past_status(current_user)}
Expand Down
1 change: 1 addition & 0 deletions app/models/sub_service_request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SubServiceRequest < ActiveRecord::Base
attr_accessible :documents
attr_accessible :service_requester_id
attr_accessible :requester_contacted_date
attr_accessible :submitted_at

accepts_nested_attributes_for :line_items, allow_destroy: true
accepts_nested_attributes_for :payments, allow_destroy: true
Expand Down