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.

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

KG - Add CPT Code to Services Dropdowns #1541

Merged
merged 1 commit into from Sep 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/helpers/dashboard/study_level_activities_helper.rb
Expand Up @@ -72,11 +72,11 @@ def sla_options_buttons line_item
def sla_form_services_select form, line_item
service = line_item.service
if service.present? and not service.is_available
service_name = service.name + ' (Disabled)'
service_name = service.display_service_name + ' (Disabled)'
form.select "service_id", options_for_select([service_name], service_name), {include_blank: true}, class: 'form-control selectpicker', disabled: 'disabled'
else
service_list = line_item.sub_service_request.candidate_services.select {|x| x.one_time_fee}
form.select "service_id", options_from_collection_for_select(service_list, 'id', 'name', line_item.service_id), {include_blank: true}, class: 'form-control selectpicker'
form.select "service_id", options_from_collection_for_select(service_list, 'id', 'display_service_name', line_item.service_id), {include_blank: true}, class: 'form-control selectpicker'
end
end

Expand Down
Expand Up @@ -37,7 +37,7 @@
.form-group
= label_tag "add_service_id", t(:dashboard)[:multiple_line_items][:service], class: "col-sm-4 control-label"
.col-sm-7
= select_tag "add_service_id", options_from_collection_for_select(services, 'id' , 'name'), class: "form-control selectpicker"
= select_tag "add_service_id", options_from_collection_for_select(services, 'id' , 'display_service_name'), class: "form-control selectpicker"
-#.form-group
-# - label_tag "arm_id", options_from_collection_for_select(arms, "id", "name")
.modal-footer
Expand Down
Expand Up @@ -36,7 +36,7 @@
.form-group
= label_tag "remove_service_id", t(:dashboard)[:multiple_line_items][:service], class: "col-sm-4 control-label"
.col-sm-7
= select_tag "remove_service_id", options_from_collection_for_select(all_services, 'id' , 'name', service.id), class: "form-control selectpicker"
= select_tag "remove_service_id", options_from_collection_for_select(all_services, 'id' , 'display_service_name', service.id), class: "form-control selectpicker"
.modal-footer
.center-block
%button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}}
Expand Down