Merge pull request #1245 from sparc-request/kg-survey_form_builder_merge

KG - Survey/Form Builder Merge

Gemfile

@@ -42,8 +42,6 @@ gem 'json', '>= 1.8'
 gem 'letter_opener'
 gem 'momentjs-rails', '>= 2.8.1'
 gem 'mysql2', '~> 0.3.18'
-gem 'nested_form'
-gem 'nested_form_fields'
 gem 'newrelic_rpm'
 gem 'nokogiri'
 gem 'nori'

Gemfile.lock

@@ -307,11 +307,6 @@ GEM
     multi_json (1.12.2)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
-    nested_form (0.3.2)
-    nested_form_fields (0.8.2)
-      coffee-rails (>= 3.2.1)
-      jquery-rails
-      rails (>= 3.2.0)
     net-ldap (0.16.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -614,8 +609,6 @@ DEPENDENCIES
   letter_opener
   momentjs-rails (>= 2.8.1)
   mysql2 (~> 0.3.18)
-  nested_form
-  nested_form_fields
   net-ldap (~> 0.16.0)
   newrelic_rpm
   nokogiri

app/assets/javascripts/application.js

@@ -38,7 +38,6 @@
 //= require bootstrap-datetimepicker
 //= require jquery_ujs
 //= require jquery.remotipart
-//= require jquery_nested_form
 //= require jquery.cookie
 //= require jquery.form
 //= require editable/bootstrap-editable

app/assets/javascripts/catalog.js.coffee

@@ -82,10 +82,12 @@ $(document).ready ->
       limit: 100,
       templates: {
         suggestion: Handlebars.compile('<button class="text-left" data-container="body" data-placement="right" data-toggle="tooltip" data-animation="false" title="{{description}}">
-                                          <span><strong class="{{inst_css_class}}">{{institution}}</strong>{{parents}}</span><br>
+                                          <strong>{{{parents}}}</strong><br>
                                           <span><strong>Service: {{label}}</strong></span><br>
                                           <span><strong>Abbreviation: {{abbreviation}}</strong></span><br>
-                                          <span><strong>CPT Code: {{cpt_code}}</strong></span>
+                                          {{#if cpt_code}}
+                                            <span><strong>CPT Code: {{cpt_code}}</strong></span>
+                                          {{/if}}
                                         </button>')
         notFound: '<div class="tt-suggestion">No Results</div>'
       }

app/assets/javascripts/catalog_manager/application.js

@@ -33,7 +33,6 @@
 //= require jquery.toastmessage
 //= require catalog_manager/jquery.jstree
 //= require jquery-ui
-//= require jquery_nested_form
 //= require catalog_manager/jquery.formatCurrency-1.4.0.min
 //= require catalog_manager/catalog
 //= require catalog_manager/services

app/assets/javascripts/dashboard/application.js

@@ -34,7 +34,6 @@
 //= require bootstrap-datetimepicker
 //= require jquery_ujs
 //= require jquery.remotipart
-//= require jquery_nested_form
 //= require jquery.cookie
 //= require jquery.form
 //= require jquery.toastmessage
@@ -59,6 +58,8 @@
 //= require associated_users_form
 //= require study_schedule_tabs
 //= require subsidy_form
+//= require surveyor/responses
+//= require surveyor/surveys
 //= require dashboard/navbar
 
 window.Sparc = {};

app/assets/javascripts/dashboard/protocols.js.coffee

@@ -148,26 +148,21 @@ $(document).ready ->
             $('.service-requests-table').bootstrapTable()
             reset_service_requests_handlers()
 
-      $(document).on 'change', '.complete-details', ->
-        $selected_options = $('option:selected', this)
-
-        if $selected_options.length > 0
-          $selected_option    = $selected_options.first()
-          questionnaire_id    = $selected_option.data('questionnaire-id')
-          protocol_id         = $selected_option.data('protocol-id')
-          ssr_id              = $selected_option.data('ssr-id')
-          $this               = $(this)
-
-          $.ajax
-            method: 'GET'
-            url: "/additional_details/submissions/new.js"
-            data:
-              protocol_id: protocol_id
-              ssr_id: ssr_id
-              questionnaire_id: questionnaire_id
-            success: ->
-              $this.selectpicker('deselectAll')
-              $this.selectpicker('render')
+      $(document).on 'change', '.complete-forms', ->
+        $option = $('option:selected', this)
+        $this   = $(this)
+
+        $.ajax
+          method: 'GET'
+          url: "/surveyor/responses/new.js"
+          data:
+            type:             $option.data('type')
+            survey_id:        $option.data('survey-id')
+            respondable_id:   $option.data('respondable-id')
+            respondable_type: $option.data('respondable-type')
+          success: ->
+            $this.selectpicker('deselectAll')
+            $this.selectpicker('render')
 
       reset_service_requests_handlers()
       # Protocol Show End
@@ -201,7 +196,11 @@ $(document).ready ->
           url: "/dashboard/protocols.js"
           data: data
 
-(exports ? this).reset_service_requests_handlers = -> 
+(exports ? this).reset_service_requests_handlers = ->
+  $('.view-consolidated').tooltip()
+  $('.export-consolidated').tooltip()
+  $('.coverage-analysis-report').tooltip()
+
   $('.service-requests-table').on 'all.bs.table', ->
     #Enable selectpickers
     $(this).find('.selectpicker').selectpicker()

app/assets/javascripts/document_management.js.coffee

@@ -20,6 +20,7 @@
 
 #= require navigation
 #= require cart
+#= require forms
 
 $(document).ready ->
   $(document).on 'click', '#document-new', ->