Merge pull request #154 from sparc-request/jl-procedure-group-saving-bug

Jl procedure group saving bug (2.2.0)
sparc-request · May 5, 2016 · 6160cca · 6160cca
2 parents 9a29c49 + 55cc6d4
commit 6160cca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/app/assets/javascripts/appointments.js.coffee b/app/assets/javascripts/appointments.js.coffee
@@ -10,9 +10,11 @@ $ ->
     pg = new ProcedureGrouper(core)
     group = $(this).parents('.procedure-group')
     group_id = $(group).data('group-id')
+    groups = $('.procedure-group')
 
     if $(group).find('span.glyphicon').hasClass('glyphicon-chevron-right')
       pg.show_group(group_id)
+      close_open_procedure_groups(groups, group_id)
     else
       pg.hide_group(group_id)
 
@@ -349,6 +351,12 @@ $ ->
 
       return procedure_ids
 
+  close_open_procedure_groups = (groups, group_id) ->
+    groups.each ->
+      if $(this).find('span.glyphicon').hasClass('glyphicon-chevron-down') && ($(this).data('group-id') != group_id)
+        pg = new ProcedureGrouper($(this).closest('tr.core'))
+        pg.hide_group($(this).data('group-id'))
+
   # Display a helpful message when user clicks on a disabled UI element
   $(document).on 'click', '.pre_start_disabled, .complete-all-container.contains_disabled, .incomplete-all-container.contains_disabled', ->
     alert(I18n["appointment"]["warning"])

diff --git a/app/assets/javascripts/procedure_grouper.coffee b/app/assets/javascripts/procedure_grouper.coffee
@@ -43,7 +43,7 @@ $ ->
       row_count         = rows.length
       procedures_table  = $(rows).first().parents('.procedures tbody')
 
-      $(procedures_table).prepend("<tr class='procedure-group' data-group-id='#{group_id}'><td colspan='8'><button type='button' class='btn btn-xs btn-primary'><span class='count'>#{row_count}</span><span class='glyphicon glyphicon-chevron-right'></span></button>#{title} #{service_billing_type}</td></tr>")
+      $(procedures_table).prepend("<tr class='procedure-group' id='group-#{group_id}' data-group-id='#{group_id}'><td colspan='8'><button type='button' class='btn btn-xs btn-primary'><span class='count'>#{row_count}</span><span class='glyphicon glyphicon-chevron-right'></span></button>#{title} #{service_billing_type}</td></tr>")
 
       return this.find_group(group_id)
 

diff --git a/app/views/procedures/update.js.coffee b/app/views/procedures/update.js.coffee
@@ -54,5 +54,6 @@ $(".completed_date_field").datetimepicker(format: 'MM-DD-YYYY')
 
 $('.row.appointment [data-toggle="tooltip"]').tooltip()
 
+$("#group-<%= @procedure.group_id %> button").trigger('click')
 $("#modal_place").modal 'hide'
 <% end %>