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

Hide Surveys column in Admin Edit if the ssr doesn't have any available surveys #2079

Merged
merged 3 commits into from
Dec 10, 2019
Merged

Hide Surveys column in Admin Edit if the ssr doesn't have any available surveys #2079

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
49ed760
Hide Surveys column when the SSR does not have any available surveys …
ying-pbrc Dec 4, 2019
1e24d65
Merge branch 'v3.6.0' into admin-edit-surveys-header-fix
ying-pbrc Dec 9, 2019
f929491
Merge branch 'v3.6.0' into admin-edit-surveys-header-fix
Dec 10, 2019
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: 5 additions & 2 deletions app/models/sub_service_request.rb
View file
Open in desktop
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
View file
Open in desktop
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