Jjh bs fixes

app/assets/javascripts/service_calendar.js.coffee

@@ -62,7 +62,7 @@ $(document).ready ->
 
     $.ajax
       type: 'PUT'
-      data: 
+      data:
         checked:  checked
         visit_id: $(this).data('visit-id')
         portal: $(this).data('portal')
@@ -101,6 +101,25 @@ calculate_max_rates = (arm_id) ->
     $(".arm-calendar-container-#{arm_id}:visible #{column}.max-total-per-patient").html(max_total_display)
 
 (exports ? this).setup_xeditable_fields = () ->
+  reload_calendar = (arm_id) ->
+    # E.g. "billing-strategy-tab" -> "billing_strategy"
+    tab = $('li.custom-tab.active a').last().attr('id')
+    tab = tab.substring(0, tab.indexOf("tab") - 1).replace("-", "_");
+
+    # Reload calendar
+    $.get '/service_calendars/table.js', {
+      tab: tab,
+      review: $("#review").val(),
+      portal: $("#portal").val(),
+      admin: $("#admin").val(),
+      merged: $("#merged").val(),
+      consolidated: $("#consolidated").val(),
+      pages: $("pages").val(),
+      arm_id: arm_id,
+      protocol_id: $('#protocol_id').val(),
+      sub_service_request_id: $('#sub_service_request_id').val()
+    }
+
   # Override x-editable defaults
   $.fn.editable.defaults.send = 'always'
   $.fn.editable.defaults.ajaxOptions =
@@ -122,6 +141,7 @@ calculate_max_rates = (arm_id) ->
     params: (params) ->
       data = 'visit_group': { 'day': params.value }
       return data
+    emptytext: '(?)'
 
   $('.window-after').editable
     params: (params) ->
@@ -132,6 +152,7 @@ calculate_max_rates = (arm_id) ->
     params: (params) ->
       data = 'visit_group': { 'name': params.value }
       return data
+    emptytext: '(?)'
 
   $('.edit-your-cost').editable
     display: (value) ->
@@ -146,11 +167,15 @@ calculate_max_rates = (arm_id) ->
     params: (params) ->
       data = 'line_items_visit': { 'subject_count': params.value }
       return data
+    success: () ->
+      reload_calendar($(this).data('armId'))
 
   $('.edit-research-billing-qty').editable
     params: (params) ->
       data = 'visit': { 'research_billing_qty': params.value }
       return data
+    success: () ->
+      reload_calendar($(this).data('armId'))
 
   $('.edit-insurance-billing-qty').editable
     params: (params) ->

app/controllers/dashboard/line_items_controller.rb

@@ -71,17 +71,26 @@ def edit
   def update
     @sub_service_request  = @line_item.sub_service_request
     @otf                  = @line_item.service.one_time_fee
-    if @line_item.displayed_cost_valid?(params[:line_item][:displayed_cost]) && @line_item.update_attributes(params[:line_item])
-      if @otf
-        flash[:success] = t(:dashboard)[:study_level_activities][:updated]
-      else
-        render partial: 'service_calendars/update_service_calendar'
+    success = @line_item.displayed_cost_valid?(params[:line_item][:displayed_cost]) && @line_item.update_attributes(params[:line_item])
+
+    respond_to do |format|
+      format.js do
+        if success
+          if @otf
+            flash[:success] = t(:dashboard)[:study_level_activities][:updated]
+          else
+            render partial: 'service_calendars/update_service_calendar'
+          end
+        elsif @otf
+          @errors = @line_item.errors
+        end
       end
-    else
-      if @otf
-        @errors = @line_item.errors
-      else
-        render json: @line_item.errors, status: :unprocessable_entity
+      format.json do
+        if success
+          render json: { success: true }
+        else
+          render json: @line_item.errors, status: :unprocessable_entity
+        end
       end
     end
   end

app/controllers/dashboard/line_items_visits_controller.rb

@@ -25,11 +25,11 @@ class Dashboard::LineItemsVisitsController < Dashboard::BaseController
   def update
     @line_items_visit = LineItemsVisit.find( params[:id] )
     @service_request  = ServiceRequest.find( params[:srid] )
-    
+
     if @line_items_visit.update_attributes( params[:line_items_visit] )
       @service_request.update_attributes(status: 'draft')
       @line_items_visit.sub_service_request.update_attributes(status: 'draft')
-      render nothing: true
+      render json: { success: true }
     else
       render json: @line_items_visit.errors, status: :unprocessable_entity
     end

app/views/service_calendars/master_calendar/pppv/_billing_strategy_line_items.html.haml

@@ -65,7 +65,7 @@
         - if locked
           = liv.subject_count
         - else
-          %a.edit-subject-count{ href: 'javascript:void(0)', data: { name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
+          %a.edit-subject-count{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
       - visits      = liv.visits.paginate(page: page.to_i, per_page: 5)
       - totals_hash = liv.try(:per_subject_subtotals, visits)
       - visits.each_with_index do |v, index|

app/views/service_calendars/master_calendar/pppv/_line_item_visit_input.html.haml

@@ -33,11 +33,11 @@
         .effort-billing-qty
           = visit.effort_billing_qty
     - else
-      .col-xs-4.text-center
-        %a.edit-research-billing-qty{ href: 'javascript:void(0)', data: { name: 'research_qty', title: t(:calendars)[:pppv][:editable_fields][:research], value: visit.research_billing_qty, url: dashboard_visit_path(visit) } }
-      .col-xs-4.text-center
+      .col-xs-4.text-center.no-padding
+        %a.edit-research-billing-qty{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'research_qty', title: t(:calendars)[:pppv][:editable_fields][:research], value: visit.research_billing_qty, url: dashboard_visit_path(visit) } }
+      .col-xs-4.text-center.no-padding
         %a.edit-insurance-billing-qty{ href: 'javascript:void(0)', data: { name: 'third_party_qty', title: t(:calendars)[:pppv][:editable_fields][:third_party], value: visit.insurance_billing_qty, url: dashboard_visit_path(visit) } }
-      .col-xs-4.text-center
+      .col-xs-4.text-center.no-padding
         %a.edit-effort-billing-qty{ href: 'javascript:void(0)', data: { name: 'percent_effort_qty', title: t(:calendars)[:pppv][:editable_fields][:percent], value: visit.effort_billing_qty, url: dashboard_visit_path(visit) } }
 - when 'calendar'
   = label_tag nil, qty_cost_label(visit.research_billing_qty + visit.insurance_billing_qty, currency_converter(totals_hash["#{visit.id}"])) || "0 - $0.00", class: 'line_item_visit_pricing'

app/views/service_calendars/master_calendar/pppv/_template_line_items.html.haml

@@ -51,7 +51,7 @@
         - if locked
           = liv.subject_count
         - else
-          %a.edit-subject-count{ class: locked ? 'locked' : '', href: 'javascript:void(0)', data: { name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
+          %a.edit-subject-count{ class: locked ? 'locked' : '', href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
       %td.text-center
         = Dashboard::ServiceCalendars.select_row(liv, sub_service_request, portal, locked)
       - visits      = liv.visits.paginate(page: page.to_i, per_page: 5)

app/views/service_calendars/master_calendar/pppv/_visit_groups.html.haml

@@ -34,9 +34,9 @@
           %a.window-before{ href: 'javascript:void(0)', data: { name: 'window_before', title: t(:calendars)[:pppv][:editable_fields][:window_before], value: visit_group.window_before, url: visit_group_path(visit_group) } }
       .col-xs-4.no-padding.text-center
         - if portal || tab == 'calendar'
-          = visit_group.day || "!"
+          = visit_group.day
         - else
-          %a.day{ href: 'javascript:void(0)', data: { name: 'day', value: visit_group.day || "!", title: t(:calendars)[:pppv][:editable_fields][:day], url: visit_group_path(visit_group) } }
+          %a.day{ href: 'javascript:void(0)', data: { name: 'day', value: visit_group.day, title: t(:calendars)[:pppv][:editable_fields][:day], url: visit_group_path(visit_group) } }
       .col-xs-4.no-padding.text-center
         - if portal || tab == 'calendar'
           = visit_group.window_after

app/views/service_calendars/table.html.haml

@@ -18,7 +18,16 @@
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'service_calendar_logic'
+
 = hidden_field_tag :indirect_rate, @service_request.protocol.indirect_cost_rate
+= hidden_field_tag :review, @review
+= hidden_field_tag :portal, @portal
+= hidden_field_tag :admin, @admin
+= hidden_field_tag :merged, @merged
+= hidden_field_tag :consolidated, @consolidated
+= hidden_field_tag :pages, @pages
+= hidden_field_tag :protocol_id, @service_request.protocol_id
+= hidden_field_tag :sub_service_request_id, @sub_service_request.try(:id)
 
 - if @sub_service_request ? @sub_service_request.has_per_patient_per_visit_services? : @service_request.has_per_patient_per_visit_services?
   - @service_request.arms.each do |arm|

app/views/service_calendars/table.js.coffee

@@ -17,7 +17,7 @@
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-$(".arm-calendar-container-<%= @arm.id %>").html("<%= escape_javascript(render( '/service_calendars/master_calendar/pppv/pppv_calendar', tab: @tab, arm: @arm, service_request: @service_request, sub_service_request: @sub_service_request, page: @pages[@arm.id], pages: @pages, review: @review, portal: @portal, admin: @admin, merged: @merged, consolidated: @consolidated )) %>")
+$(".arm-calendar-container-<%= @arm.id %>").replaceWith("<%= escape_javascript(render( '/service_calendars/master_calendar/pppv/pppv_calendar', tab: @tab, arm: @arm, service_request: @service_request, sub_service_request: @sub_service_request, page: @pages[@arm.id], pages: @pages, review: @review, portal: @portal, admin: @admin, merged: @merged, consolidated: @consolidated )) %>")
 $('.selectpicker').selectpicker()
 setup_xeditable_fields()
 changing_tabs_calculating_rates()

config/locales/dashboard.en.yml

@@ -158,6 +158,7 @@ en:
     protocol_filters:
       header: "Filter Protocols"
       archived: "Archived"
+      inactive: "(inactive)"
       status: "Status"
       organization: "Organization"
       owner: "Owner"
@@ -377,4 +378,4 @@ en:
       day: "Day:"
       position: "Position:"
       window_before: "Window Before:"
-      window_after: "Window After:"
+      window_after: "Window After:"