Skip to content

Commit

Permalink
Merge pull request #2079 from sparc-request/admin-edit-surveys-header…
Browse files Browse the repository at this point in the history
…-fix

Hide Surveys column in Admin Edit if the ssr doesn't have any available surveys
  • Loading branch information
Stuart-Johnson committed Dec 10, 2019
2 parents 34667d2 + f929491 commit e3fd7ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions app/models/sub_service_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,6 @@ def all_forms_completed?
# Distributes all available surveys to primary pi and ssr requester
def distribute_surveys
primary_pi = protocol.primary_principal_investigator
# send all available surveys at once
available_surveys = line_items.map{|li| li.service.available_surveys}.flatten.compact.uniq
# do nothing if we don't have any available surveys
unless available_surveys.empty?
SurveyNotification.service_survey(available_surveys, primary_pi, self).deliver
Expand All @@ -437,6 +435,11 @@ def distribute_surveys
end
end
end

# send all available surveys at once
def available_surveys
self.line_items.map{|li| li.service.available_surveys}.flatten.compact.uniq
end

def surveys_completed?
self.line_items.
Expand Down
4 changes: 2 additions & 2 deletions app/views/dashboard/sub_service_requests/_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
- unless request_valid
= icon('fas', 'exclamation-circle text-warning mr-1')
= t('dashboard.sub_service_requests.header.fulfillment.header')
- if sub_service_request.is_complete?
- if sub_service_request.is_complete? && !sub_service_request.available_surveys.empty?
%th.text-center
= t('dashboard.sub_service_requests.header.surveys.header')
%th.text-center
Expand Down Expand Up @@ -88,7 +88,7 @@
- if use_fulfillment
%td.text-center#fulfillmentStatusContainer{ title: request_valid ? '' : t('dashboard.sub_service_requests.tooltips.request_invalid'), data: { toggle: 'tooltip' } }
= ready_for_fulfillment_display(sub_service_request, request_valid)
- if sub_service_request.is_complete?
- if sub_service_request.is_complete? && !sub_service_request.available_surveys.empty?
%td.text-center#surveys
= resend_surveys_ssr_button(sub_service_request)
%td.text-center#effectiveCost
Expand Down

0 comments on commit e3fd7ad

Please sign in to comment.