Merge pull request #168 from sparc-request/jl-move-fulfillment-buttons

Jl move fulfillment buttons

app/assets/javascripts/study_level_activities.js.coffee

@@ -35,26 +35,6 @@ $ ->
         type: "DELETE"
         url: "/line_items/#{line_item_id}"
 
-  $(document).on 'click', '.otf_fulfillments', ->
-    selected_row = $(this).parents("tr")
-    fulfillments_row = $("#fulfillments_row") #already displayed
-    span = $(this).children('.glyphicon')
-    line_item_id = $(this).parents("table.study_level_activities").bootstrapTable("getData")[selected_row.data("index")].id
-    fulfillments_already_displayed = fulfillments_row.attr('data-line_item_id') == "#{line_item_id}"
-
-    fulfillments_row.prev('tr').first().find('.glyphicon-chevron-down').removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-right").parents(".otf_fulfillments").attr('data-original-title', 'View Fulfillment Buttons')
-    fulfillments_row.remove()
-    unless fulfillments_already_displayed
-      span.removeClass("glyphicon-chevron-right").addClass("glyphicon-refresh")
-      $(this).parents("tr").after("<tr id='fulfillments_row'></tr>")
-      line_item_id = $(this).data('line-item-id')
-      $.ajax
-        type: 'GET'
-        url: "/fulfillments/#{line_item_id}"
-    else
-      $(this).attr('data-original-title', 'View Fulfillment Buttons')
-      span.removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-right")
-
   # Fulfillment Bindings
 
   $(document).on 'click', '.otf_fulfillment_new', ->
@@ -65,7 +45,7 @@ $ ->
       url: "/fulfillments/new"
       data: data
 
-  $(document).on 'click', '.otf_fulfillment_list', ->
+  $(document).on 'click', '.otf-fulfillment-list', ->
     line_item_id = $(this).data('line-item-id')
     data = line_item_id: line_item_id
     $.ajax

app/assets/stylesheets/study_level_activities.sass

@@ -7,5 +7,5 @@
 td.wrap
   word-break: break-all
 
-.otf_fulfillment_new
-  margin-right: 10px
+.center-block
+  text-align: center

app/controllers/fulfillments_controller.rb

@@ -14,10 +14,6 @@ def index
     end
   end
 
-  def show
-    @line_item = LineItem.find(params[:id])
-  end
-
   def new
     @line_item = LineItem.find(params[:line_item_id])
     @clinical_providers = ClinicalProvider.where(organization_id: @line_item.protocol.sub_service_request.organization_id)

app/helpers/study_level_activities_helper.rb

@@ -39,10 +39,8 @@ def sla_options_buttons line_item
     raw content_tag(:div, button + ul, class: 'btn-group overflow_webkit_button')
   end
 
-  def fulfillments_drop_button line_item_id
-    content_tag(:button, class: 'btn btn-primary btn-sm otf_fulfillments list', title: t(:fulfillment)[:view], type: "button", aria: {label: "Fulfillments List"}, data: {line_item_id: line_item_id, toggle: "tooltip", animation: 'false'}) do
-      content_tag(:span, '', class: "glyphicon glyphicon-chevron-right", aria: {hidden: "true"})
-    end
+  def fulfillments_drop_button line_item
+    button = raw content_tag(:button, 'List', id: "list-#{line_item.id}", type: 'button', class: 'btn btn-success otf-fulfillment-list', title: 'List', type: "button", aria: {label: "List Fulfillments"}, data: {line_item_id: line_item.id})
   end
 
   def fulfillment_components_dropdown components=Array.new

app/views/fulfillments/create.js.coffee

@@ -5,3 +5,4 @@ if $("#modal_errors > .alert.alert-danger > p").length == 0
   $("#fulfillments_row").prev('tr').find('.qty_rem').text("<%= @line_item.quantity_remaining %>")
   $("#fulfillments_row").prev('tr').find('.last_fulfillment').text("<%= format_date(@line_item.last_fulfillment) %>")
   $("#modal_place").modal 'hide'
+  $("#list-<%= @line_item.id %>").trigger('click')

app/views/fulfillments/index.js.coffee

@@ -1,6 +1,4 @@
 $("#fulfillments_row").attr('data-line_item_id', "<%= @line_item.id %>")
-$("#fulfillments_row").html("<%= escape_javascript(render(:partial =>'study_level_activities/fulfillment_buttons', locals: {line_item: @line_item})) %>");
-$("#fulfillments_row").prev("tr").first().find(".otf_fulfillments > .glyphicon").removeClass("glyphicon-refresh").addClass("glyphicon-chevron-down").parents("button").attr('data-original-title', 'Hide Fulfillment Buttons')
 $("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/fulfillments_table', locals: {line_item: @line_item, header_text: 'Fulfillments List'})) %>");
 $("#modal_place").modal 'show'
 $("#fulfillments-table").bootstrapTable()

app/views/fulfillments/update.js.coffee

@@ -5,3 +5,4 @@ if $("#modal_errors > .alert.alert-danger > p").length == 0
   $("#fulfillments_row").prev('tr').find('.qty_rem').text("<%= @line_item.quantity_remaining %>")
   $("#fulfillments_row").prev('tr').find('.last_fulfillment').text("<%= format_date(@line_item.last_fulfillment) %>")
   $("#modal_place").modal 'hide'
+  $("#list-<%= @line_item.id %>").trigger('click')

app/views/line_items/_study_level_activity.json.jbuilder

@@ -11,4 +11,4 @@ json.date_started format_date(line_item.started_at)
 json.service_components sla_components_select(line_item.id, line_item.components.with_deleted)
 json.last_fulfillment format_date(line_item.last_fulfillment)
 json.options sla_options_buttons(line_item)
-json.fulfillments_button fulfillments_drop_button(line_item.id)
+json.fulfillments_button fulfillments_drop_button(line_item)

app/views/study_level_activities/_fulfillments_table.html.haml

@@ -4,7 +4,8 @@
       %button.close{type: 'button', data: {dismiss: 'modal'}}
         %span{aria: {hidden:'true'}} ×
         %span.sr-only= t(:actions)[:close]
-      %h4.modal-title.text-center= header_text
+      %h4.modal-title.text-center
+        = header_text
       .modal-body
         %td{colspan: 11}
           .bootstrap-table-dropdown-overflow
@@ -23,4 +24,10 @@
                   %th{data: {class: 'components', align: "center", field: "components"}}
                     = t(:fulfillment)[:components]
                   %th{data: {class: 'options', align: "center", field: "options"}}
-                    = t(:actions)[:actions]
+                    = t(:actions)[:actions]
+    .modal-footer
+      .center-block
+        %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}}
+          = t(:actions)[:close]
+        %button.btn.btn-success.otf_fulfillment_new{type: "button", "aria-label" => "Add Fulfillment", data: {line_item_id: line_item.id}}
+          = t(:fulfillment)[:add_fulfillment]

config/locales/en.yml

@@ -141,7 +141,7 @@ en:
 
   fulfillment:
     object: "Fulfillment"
-    add_fulfillment: "Add"
+    add_fulfillment: "Add Fulfillment"
     list_fulfillments: "List"
     components: "Fulfillment Components"
     edit: "Edit Fulfillment"

spec/features/study_level_activities/identity_manages_fulfillments_spec.rb

@@ -6,8 +6,6 @@
     it 'should list the fulfillments' do
       given_i_have_fulfillments
       and_i_have_opened_up_fulfillments
-      click_button "List"
-      wait_for_ajax
       expect(page).to have_content('Fulfillments List')
     end
   end
@@ -17,7 +15,7 @@
       given_i_have_fulfillments
       count = @line_item.fulfillments.count
       and_i_have_opened_up_fulfillments
-      click_button "Add"
+      click_button "Add Fulfillment"
       wait_for_ajax
       when_i_fill_out_the_fulfillment_form
       expect(page).to have_content('Fulfillment Created')
@@ -43,7 +41,7 @@ def and_i_have_opened_up_fulfillments
     wait_for_ajax
     click_link "Study Level Activities"
     wait_for_ajax
-    first('.otf_fulfillments.list').click
+    first('.otf-fulfillment-list').click
     wait_for_ajax
   end
 

spec/features/study_level_activities/identity_manages_notes_spec.rb

@@ -46,9 +46,7 @@ def when_i_open_up_a_new_line_item_note
   end
 
   def when_i_open_up_a_new_fulfillment_note
-    first('.otf_fulfillments.list').click
-    wait_for_ajax
-    click_button 'List'
+    first('.otf-fulfillment-list').click
     wait_for_ajax
     first("#fulfillments-table .available-actions-button").click
     wait_for_ajax