Compare commits
73 Commits
c298ea9d5b
...
d2b3464359
Author | SHA1 | Date |
---|---|---|
|
d2b3464359 | |
|
64626817e9 | |
|
2cb22f4f6f | |
|
e03e27dc17 | |
|
93ef387b68 | |
|
f8264413f0 | |
|
586f83142d | |
|
5ffa34b151 | |
|
dbbe675584 | |
|
2f7135e146 | |
|
19daac4173 | |
|
5206181fed | |
|
0ebff5a9e5 | |
|
543b5cf42f | |
|
ca4a48cb51 | |
|
40d4b889fd | |
|
163805f8c1 | |
|
f897f12ef5 | |
|
e3c123e5aa | |
|
dd52046c16 | |
|
5bf740d454 | |
|
742adb814d | |
|
7724fd5769 | |
|
ca5c47d7f5 | |
|
6a1cac01aa | |
|
4b4c960d14 | |
|
137e13ad1b | |
|
9f3f337dec | |
|
846024ac51 | |
|
f93a11d638 | |
|
9428475124 | |
|
e116f69577 | |
|
db59135626 | |
|
817ecf0377 | |
|
38e35fb560 | |
|
da1eed7786 | |
|
19b2afcab1 | |
|
65b96b9fdc | |
|
25e3ae7fde | |
|
4620557e72 | |
|
cf9bec7a61 | |
|
893fe1e33b | |
|
8f7a0ce704 | |
|
52a197a68d | |
|
5962eed8a0 | |
|
9aba9a3f0b | |
|
456ce12222 | |
|
4b8fed7e52 | |
|
77e92b7297 | |
|
0101f3bef0 | |
|
e2bc83ec2e | |
|
74fff06818 | |
|
190752a275 | |
|
24d14e2b3b | |
|
788f495c29 | |
|
7982622ca8 | |
|
1e41d84353 | |
|
f5af46731e | |
|
63bfb834ac | |
|
98738db5d1 | |
|
8945e3b64a | |
|
32bd2ffac5 | |
|
2e00a82db4 | |
|
6b1d72e54a | |
|
c1a2927e1e | |
|
d8d02fb590 | |
|
296e19929c | |
|
3353d1595b | |
|
be9c1f3d05 | |
|
741d440631 | |
|
88b5a9bbed | |
|
d9be851646 | |
|
d4afee639d |
|
@ -330,7 +330,7 @@ class Admin::CancerpredictsController < OrbitAdminController
|
||||||
Dir.chdir("public") do
|
Dir.chdir("public") do
|
||||||
@site_locales = Site.last.in_use_locales.each do |locale|
|
@site_locales = Site.last.in_use_locales.each do |locale|
|
||||||
I18n.with_locale(locale) do
|
I18n.with_locale(locale) do
|
||||||
@file_tmp = File.new('cancer_tool_table_tmp_'+locale.to_s+'.txt', 'w')
|
@file_tmp = File.new("#{Cancerpredictfields::ToolTablePrefix}#{I18n.locale}.txt", 'w')
|
||||||
tmp_table_texts = create_table(locale)
|
tmp_table_texts = create_table(locale)
|
||||||
@file_tmp.write(tmp_table_texts)
|
@file_tmp.write(tmp_table_texts)
|
||||||
@file_tmp.close
|
@file_tmp.close
|
||||||
|
@ -654,7 +654,7 @@ class Admin::CancerpredictsController < OrbitAdminController
|
||||||
Dir.chdir("public") do
|
Dir.chdir("public") do
|
||||||
@site_locales = Site.last.in_use_locales.each do |locale|
|
@site_locales = Site.last.in_use_locales.each do |locale|
|
||||||
I18n.with_locale(locale) do
|
I18n.with_locale(locale) do
|
||||||
@file_tmp = File.new('cancer_tool_table_tmp_'+locale.to_s+'.txt', 'w')
|
@file_tmp = File.new("#{Cancerpredictfields::ToolTablePrefix}#{I18n.locale}.txt", 'w')
|
||||||
tmp_table_texts = create_table(locale)
|
tmp_table_texts = create_table(locale)
|
||||||
@file_tmp.write(tmp_table_texts)
|
@file_tmp.write(tmp_table_texts)
|
||||||
@file_tmp.close
|
@file_tmp.close
|
||||||
|
|
|
@ -147,11 +147,11 @@ class CancerpredictsController < ApplicationController
|
||||||
uid = OrbitHelper.params[:uid] rescue ""
|
uid = OrbitHelper.params[:uid] rescue ""
|
||||||
tags = OrbitHelper.widget_tags
|
tags = OrbitHelper.widget_tags
|
||||||
categories = OrbitHelper.widget_categories || []
|
categories = OrbitHelper.widget_categories || []
|
||||||
@table_str = File.read('public/cancer_tool_table_tmp_'+I18n.locale.to_s+'.txt')
|
@table_str = File.read("#{Cancerpredictfields::ToolTablePrefix}#{I18n.locale}.txt")
|
||||||
preidct_js_url = '/assets/cancer_predict.js'
|
preidct_js_url = '/assets/cancer_predict.js'
|
||||||
if File.exist?('public/cancer_tool_js_filename.txt')
|
if File.exist?(Cancerpredictfields::JSFileName)
|
||||||
js_filename = File.read('public/cancer_tool_js_filename.txt')
|
js_filename = File.read(Cancerpredictfields::JSFileName)
|
||||||
if js_filename.match(/cancer_predict\.js$/)
|
if js_filename.include?('cancer_predict.js')
|
||||||
asset = Rails.application.assets[js_filename]
|
asset = Rails.application.assets[js_filename]
|
||||||
preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}"
|
preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}"
|
||||||
else
|
else
|
||||||
|
@ -167,11 +167,11 @@ class CancerpredictsController < ApplicationController
|
||||||
uid = OrbitHelper.params[:uid] rescue ""
|
uid = OrbitHelper.params[:uid] rescue ""
|
||||||
tags = OrbitHelper.widget_tags
|
tags = OrbitHelper.widget_tags
|
||||||
categories = OrbitHelper.widget_categories || []
|
categories = OrbitHelper.widget_categories || []
|
||||||
@table_str = File.read('public/cancer_tool_table_tmp_'+I18n.locale.to_s+'.txt')
|
@table_str = File.read("#{Cancerpredictfields::ToolTablePrefix}#{I18n.locale}.txt")
|
||||||
preidct_js_url = '/assets/cancer_predict.js'
|
preidct_js_url = '/assets/cancer_predict.js'
|
||||||
if File.exist?('public/cancer_tool_js_filename.txt')
|
if File.exist?(Cancerpredictfields::JSFileName)
|
||||||
js_filename = File.read('public/cancer_tool_js_filename.txt')
|
js_filename = File.read(Cancerpredictfields::JSFileName)
|
||||||
if js_filename.match(/cancer_predict\.js$/)
|
if js_filename.include?('cancer_predict.js')
|
||||||
asset = Rails.application.assets[js_filename]
|
asset = Rails.application.assets[js_filename]
|
||||||
preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}"
|
preidct_js_url = "#{Rails.application.config.assets.prefix}/#{asset.digest_path}"
|
||||||
else
|
else
|
||||||
|
|
|
@ -9,6 +9,8 @@ class Cancerpredictfields
|
||||||
AdvanceFields = ["revert_value","map_values","cancer_predict_mapping_file"]
|
AdvanceFields = ["revert_value","map_values","cancer_predict_mapping_file"]
|
||||||
TherapyFields = ["variable","name","hint","comment_text","choice_fields","lpv_impact","active_choice","disable_condition"]
|
TherapyFields = ["variable","name","hint","comment_text","choice_fields","lpv_impact","active_choice","disable_condition"]
|
||||||
TherapyOnly = ["lpv_impact","active_choice","disable_condition"]
|
TherapyOnly = ["lpv_impact","active_choice","disable_condition"]
|
||||||
|
JSFileName = "public/cancer_tool_js_filename.txt".freeze
|
||||||
|
ToolTablePrefix = "public/cancer_tool_table_tmp_".freeze
|
||||||
field :title ,type:String ,default:""
|
field :title ,type:String ,default:""
|
||||||
field :advance_mode, type: Boolean, default: false
|
field :advance_mode, type: Boolean, default: false
|
||||||
field :form_show , :type=> Hash ,default:{
|
field :form_show , :type=> Hash ,default:{
|
||||||
|
@ -287,7 +289,7 @@ class Cancerpredictfields
|
||||||
end
|
end
|
||||||
def reload_js_asset(path, force_reload=false)
|
def reload_js_asset(path, force_reload=false)
|
||||||
reload_any_asset(path, 'application/javascript', force_reload) do |new_path|
|
reload_any_asset(path, 'application/javascript', force_reload) do |new_path|
|
||||||
File.open("#{Rails.root}/public/cancer_tool_js_filename.txt",'w+'){|f| f.write(new_path)}
|
File.open(JSFileName, 'w+'){|f| f.write(new_path)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
def generate_eval_formula
|
def generate_eval_formula
|
||||||
|
@ -482,8 +484,8 @@ class Cancerpredictfields
|
||||||
if need_write
|
if need_write
|
||||||
File.write(save_path,file_texts)
|
File.write(save_path,file_texts)
|
||||||
reload_js_asset(save_path, force_reload)
|
reload_js_asset(save_path, force_reload)
|
||||||
elsif !(File.exist?("#{Rails.root}/public/cancer_tool_js_filename.txt"))
|
elsif !(File.exist?(JSFileName))
|
||||||
File.open("#{Rails.root}/public/cancer_tool_js_filename.txt",'w+'){|f| f.write(save_path)}
|
File.open(JSFileName, 'w+'){|f| f.write(save_path)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
def get_years_settings_dict
|
def get_years_settings_dict
|
||||||
|
|
Loading…
Reference in New Issue