Merge pull request #1541 from sparc-request/kg-cpt_code

KG - Add CPT Code to Services Dropdowns
sparc-request · Sep 17, 2018 · cc42f22 · cc42f22
2 parents fafd610 + 297609b
commit cc42f22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/helpers/dashboard/study_level_activities_helper.rb b/app/helpers/dashboard/study_level_activities_helper.rb
@@ -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
 

diff --git a/app/views/dashboard/multiple_line_items/_add_line_items_form.html.haml b/app/views/dashboard/multiple_line_items/_add_line_items_form.html.haml
@@ -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

diff --git a/app/views/dashboard/multiple_line_items/_remove_line_items_form.html.haml b/app/views/dashboard/multiple_line_items/_remove_line_items_form.html.haml
@@ -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'}}