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

On the confirmation page, the status of the request should change to … #798

Merged
merged 2 commits into from
Dec 9, 2016
Merged

On the confirmation page, the status of the request should change to … #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f87f58
On the confirmation page, the status of the request should change to …
jleonardw9 Dec 8, 2016
5985d2d
Slight refactor.
jleonardw9 Dec 8, 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
9 changes: 4 additions & 5 deletions app/controllers/service_requests_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def confirmation
@sub_service_request.update_attributes(status: 'submitted', nursing_nutrition_approved: false,
lab_approved: false, imaging_approved: false, committee_approved: false) if UPDATABLE_STATUSES.include?(@sub_service_request.status)
else
to_notify = update_service_request_status(@service_request, 'submitted')
to_notify = update_service_request_status(@service_request, 'submitted', true, true)

@service_request.update_arm_minimum_counts
@service_request.sub_service_requests.update_all(nursing_nutrition_approved: false, lab_approved: false, imaging_approved: false, committee_approved: false)
Expand Down Expand Up @@ -614,20 +614,19 @@ def send_epic_notification_for_user_approval(protocol)
Notifier.notify_for_epic_user_approval(protocol).deliver unless QUEUE_EPIC
end

def update_service_request_status(service_request, status, validate=true)
def update_service_request_status(service_request, status, validate=true, submit=false)
requests = []
service_request.sub_service_requests.each do |ssr|
if UPDATABLE_STATUSES.include?(ssr.status)
if UPDATABLE_STATUSES.include?(ssr.status) || !submit
requests << ssr
end
end

if (status == 'submitted')
service_request.previous_submitted_at = service_request.submitted_at
service_request.update_attribute(:submitted_at, Time.now)
requests.each { |ssr| ssr.update_attributes(submitted_at: Time.now) }
end
to_notify = service_request.update_status(status, validate)
to_notify = service_request.update_status(status, validate, submit)

to_notify
end
Expand Down
4 changes: 2 additions & 2 deletions app/models/service_request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def additional_detail_services

# Change the status of the service request and all the sub service
# requests to the given status.
def update_status(new_status, use_validation=true)
def update_status(new_status, use_validation=true, submit=false)
to_notify = []

self.assign_attributes(status: new_status)
Expand All @@ -435,7 +435,7 @@ def update_status(new_status, use_validation=true)
changeable = available & editable

if changeable.include?(new_status)
if (ssr.status != new_status) && UPDATABLE_STATUSES.include?(ssr.status)
if (ssr.status != new_status) && (UPDATABLE_STATUSES.include?(ssr.status) || !submit)
ssr.update_attribute(:status, new_status)
to_notify << ssr.id
end
Expand Down