Merge pull request #2346 from sparc-request/kg-multiple_irbs

KG - Import/Remove IRB From RMID Search
sparc-request · May 15, 2020 · 9108cad · 9108cad
2 parents 32d2ffc + 855e689
commit 9108cad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/app/assets/javascripts/protocol_form.js.coffee b/app/assets/javascripts/protocol_form.js.coffee
@@ -230,10 +230,10 @@ resetRmidFields = () ->
   $('#protocol_research_master_id').parents('.form-group').removeClass('is-valid is-invalid')
   $('#protocol_short_title').val('').prop('readonly', false)
   $('#protocol_title').val('').prop('readonly', false)
-  $('#protocol_human_subjects_info_attributes_pro_number').val('').prop('readonly', false)
-  $('#protocol_human_subjects_info_attributes_initial_irb_approval_date').prop('readonly', false).datetimepicker('clear')
-  $('#protocol_human_subjects_info_attributes_irb_approval_date').prop('readonly', false).datetimepicker('clear')
-  $('#protocol_human_subjects_info_attributes_irb_expiration_date').prop('readonly', false).datetimepicker('clear')
+  if $('#protocol_research_types_info_attributes_human_subjects').prop('checked')
+    $('#protocol_research_types_info_attributes_human_subjects').click()
+    $('#protocol_research_master_id').click()
+  $('#irbRecords .irb-record').remove()
 
 fundingSource             = ""
 potentialFundingSource    = ""

diff --git a/app/views/irb_records/_form.html.haml b/app/views/irb_records/_form.html.haml
@@ -27,6 +27,8 @@
       .modal-header
         %h3.modal-title
           = t("irb_records.form.#{action_name}")
+        %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: t('actions.close') } }
+          %span{ aria: { hidden: 'true' } } &times;
       .modal-body
         .form-row
           .form-group.col-6

diff --git a/app/views/irb_records/create.js.coffee b/app/views/irb_records/create.js.coffee
@@ -37,5 +37,6 @@ $('.primary-irb .delete-irb').addClass('text-muted').removeClass('text-danger').
   attr('data-original-title', I18n.t('irb_records.tooltips.cant_delete_primary'))
 <% end %>
 
-$("#modalContainer").modal('hide')
+if $('#modalContainer').hasClass('show')
+  $("#modalContainer").modal('hide')
 <% end %>
diff --git a/app/views/protocols/validate_rmid.js.coffee b/app/views/protocols/validate_rmid.js.coffee
@@ -38,9 +38,12 @@ $('#protocol_short_title').val("<%= @rmid_record['short_title'] %>").prop('reado
 $('#protocol_title').val("<%= @rmid_record['long_title'] %>").prop('readonly', true)
 
 <% if @rmid_record['eirb_validated'] %>
-$('#protocol_human_subjects_info_attributes_pro_number').val("<%= @rmid_record['eirb_pro_number'] %>").prop('readonly', true)
-$('#protocol_human_subjects_info_attributes_initial_irb_approval_date').val("<%= @rmid_record['date_initially_approved'] %>").prop('readonly', true)
-$('#protocol_human_subjects_info_attributes_irb_approval_date').val("<%= @rmid_record['date_approved'] %>").prop('readonly', true)
-$('#protocol_human_subjects_info_attributes_irb_expiration_date').val("<%= @rmid_record['date_expiration'] %>").prop('readonly', true)
+if !$('#protocol_research_types_info_attributes_human_subjects').prop('checked')
+  $('#protocol_research_types_info_attributes_human_subjects').click()
+  $('#protocol_research_master_id').click()
+$.ajax
+  method: 'POST'
+  dataType: 'script'
+  url: "<%= irb_records_path(irb_record: { pro_number: @rmid_record['eirb_pro_number'], initial_irb_approval_date: @rmid_record['date_initially_approved'], irb_approval_date: @rmid_record['date_approved'], irb_expiration_date: @rmid_record['date_expiration'] }, primary: 'true', index: 0) %>"
 <% end %>
 <% end %>