diff --git a/app/controllers/coloncancerpredict2s_controller.rb b/app/controllers/coloncancerpredict2s_controller.rb index a1042ba..272debf 100644 --- a/app/controllers/coloncancerpredict2s_controller.rb +++ b/app/controllers/coloncancerpredict2s_controller.rb @@ -148,9 +148,19 @@ class Coloncancerpredict2sController < ApplicationController tags = OrbitHelper.widget_tags categories = OrbitHelper.widget_categories || [] @table_str = File.read('public/colon_cancer_tool_table_tmp_'+I18n.locale.to_s+'2.txt') + preidct_js_url = '/assets/colon_cancer_predict2.js' + if File.exist?("public/#{Coloncancerpredictfields2s::JSFileName}") + js_filename = File.read("public/#{Coloncancerpredictfields2s::JSFileName}") + if js_filename.include?('colon_cancer_predict2.js') + asset = Rails.application.assets[js_filename] + preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}" + else + preidct_js_url = "#{Rails.application.config.assets.prefix}/#{File.basename(js_filename)}" + end + end { "coloncancerpredict2" => [], - "extras"=>{"table"=> @table_str} + "extras"=>{"table"=> @table_str,'preidct_js_url'=>preidct_js_url} } end def widget @@ -158,9 +168,19 @@ class Coloncancerpredict2sController < ApplicationController tags = OrbitHelper.widget_tags categories = OrbitHelper.widget_categories || [] @table_str = File.read('public/colon_cancer_tool_table_tmp_'+I18n.locale.to_s+'2.txt') + preidct_js_url = '/assets/colon_cancer_predict2.js' + if File.exist?("public/#{Coloncancerpredictfields2s::JSFileName}") + js_filename = File.read("public/#{Coloncancerpredictfields2s::JSFileName}") + if js_filename.include?('colon_cancer_predict2.js') + asset = Rails.application.assets[js_filename] + preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}" + else + preidct_js_url = "#{Rails.application.config.assets.prefix}/#{File.basename(js_filename)}" + end + end { "coloncancerpredict2" => [], - "extras"=>{"table"=> @table_str} + "extras"=>{"table"=> @table_str,'preidct_js_url'=>preidct_js_url} } end def create_first_field diff --git a/modules/coloncancerpredict2/_colon_cancer_predict2_widget.html.erb b/modules/coloncancerpredict2/_colon_cancer_predict2_widget.html.erb index fcadabc..03382ea 100644 --- a/modules/coloncancerpredict2/_colon_cancer_predict2_widget.html.erb +++ b/modules/coloncancerpredict2/_colon_cancer_predict2_widget.html.erb @@ -1,6 +1,6 @@ - + {{table}} <%= stylesheet_link_tag "colon_cancer_predict2", media: "screen" %> <%= stylesheet_link_tag "bootstrap.min.print", media: "print" %> diff --git a/modules/coloncancerpredict2/colon_cancer_predict2_index.html.erb b/modules/coloncancerpredict2/colon_cancer_predict2_index.html.erb index fcadabc..03382ea 100644 --- a/modules/coloncancerpredict2/colon_cancer_predict2_index.html.erb +++ b/modules/coloncancerpredict2/colon_cancer_predict2_index.html.erb @@ -1,6 +1,6 @@ - + {{table}} <%= stylesheet_link_tag "colon_cancer_predict2", media: "screen" %> <%= stylesheet_link_tag "bootstrap.min.print", media: "print" %>