diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 58a42aaa7..37305b83f 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -1,4 +1,3 @@ -//= require handsontable.full.min //= require Sortable.min //= require canvas-to-blob.min //= require assets diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb index bbd8f980a..15a5bb251 100644 --- a/app/views/my_modules/results.html.erb +++ b/app/views/my_modules/results.html.erb @@ -56,11 +56,6 @@ <%= javascript_include_tag "handsontable.full.min" %> -<%= javascript_include_tag("canvas-to-blob.min") %> -<%= javascript_include_tag "my_modules/results" %> -<%= javascript_include_tag "results/result_texts" %> -<%= javascript_include_tag "results/result_tables" %> -<%= javascript_include_tag "results/result_assets" %> <%= javascript_include_tag "lodash" %> @@ -74,3 +69,9 @@ <%= javascript_include_tag "handsontable.formula" %> <%= javascript_include_tag "big.min" %> <%= stylesheet_link_tag "handsontable.formula" %> + +<%= javascript_include_tag("canvas-to-blob.min") %> +<%= javascript_include_tag "my_modules/results" %> +<%= javascript_include_tag "results/result_texts" %> +<%= javascript_include_tag "results/result_tables" %> +<%= javascript_include_tag "results/result_assets" %> diff --git a/app/views/protocols/_steps.html.erb b/app/views/protocols/_steps.html.erb index d319b4c51..7d31f8e86 100644 --- a/app/views/protocols/_steps.html.erb +++ b/app/views/protocols/_steps.html.erb @@ -36,7 +36,7 @@ <% end %> -<%= javascript_include_tag "protocols/steps" %> +<%= javascript_include_tag "handsontable.full.min" %> <%= javascript_include_tag "lodash" %> @@ -50,3 +50,5 @@ <%= javascript_include_tag "handsontable.formula" %> <%= javascript_include_tag "big.min" %> <%= stylesheet_link_tag "handsontable.formula" %> + +<%= javascript_include_tag "protocols/steps" %> diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb index 7623b1c49..25b66fad5 100644 --- a/app/views/protocols/index.html.erb +++ b/app/views/protocols/index.html.erb @@ -147,9 +147,7 @@ <%= render partial: "protocols/import_export/import_elements.html.erb" %> -<%= stylesheet_link_tag 'datatables' %> -<%= javascript_include_tag "protocols/index" %> -<%= javascript_include_tag "protocols/steps" %> +<%= javascript_include_tag "handsontable.full.min" %> <%= javascript_include_tag "lodash" %> @@ -163,3 +161,7 @@ <%= javascript_include_tag "handsontable.formula" %> <%= javascript_include_tag "big.min" %> <%= stylesheet_link_tag "handsontable.formula" %> + +<%= stylesheet_link_tag 'datatables' %> +<%= javascript_include_tag "protocols/index" %> +<%= javascript_include_tag "protocols/steps" %> diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb index aeee310ad..6a15272ce 100644 --- a/app/views/reports/new.html.erb +++ b/app/views/reports/new.html.erb @@ -81,8 +81,6 @@ <%= render partial: 'reports/new/save_PDF_to_inventory_modal' %> <%= javascript_include_tag "handsontable.full.min" %> -<%= javascript_include_tag("reports/new") %> -<%= javascript_include_tag 'reports/save_pdf_to_inventory' %> <%= javascript_include_tag "lodash" %> @@ -96,3 +94,6 @@ <%= javascript_include_tag "handsontable.formula" %> <%= javascript_include_tag "big.min" %> <%= stylesheet_link_tag "handsontable.formula" %> + +<%= javascript_include_tag("reports/new") %> +<%= javascript_include_tag 'reports/save_pdf_to_inventory' %> diff --git a/app/views/search/results/_protocols.html.erb b/app/views/search/results/_protocols.html.erb index 89f41d768..9b1d68728 100644 --- a/app/views/search/results/_protocols.html.erb +++ b/app/views/search/results/_protocols.html.erb @@ -122,9 +122,7 @@ <% end %> -<%= stylesheet_link_tag 'datatables' %> -<%= javascript_include_tag "protocols/index" %> -<%= javascript_include_tag "protocols/steps" %> +<%= javascript_include_tag "handsontable.full.min" %> <%= javascript_include_tag "lodash" %> @@ -138,3 +136,7 @@ <%= javascript_include_tag "handsontable.formula" %> <%= javascript_include_tag "big.min" %> <%= stylesheet_link_tag "handsontable.formula" %> + +<%= stylesheet_link_tag 'datatables' %> +<%= javascript_include_tag "protocols/index" %> +<%= javascript_include_tag "protocols/steps" %>