chiu
/
Colon_Cancer_Predict2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chiu:d6de5dd99e855a3b2af9be394dea2b1a77a7bb00
Branches Tags
chiu:master
..
compare: chiu:5e7165d482322f103d0a1c8869204005dce25e35
Branches Tags
chiu:master

2 Commits
d6de5dd99e ... 5e7165d482

Author SHA1 Message Date
邱博亞 5e7165d482 Fix title. 2024-08-23 21:25:12 +08:00
邱博亞 46b63e9493 Fix js not reload bug and refine constant variables. 2024-08-23 21:25:12 +08:00
3 changed files with 15 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
app/controllers/admin/coloncancerpredict2s_controller.rb
View File

@ -330,7 +330,7 @@ class Admin::Coloncancerpredict2sController < 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('colon_cancer_tool_table_tmp_'+locale.to_s+'2.txt', 'w') @file_tmp = File.new(Coloncancerpredictfields2s::ToolTableMap[I18n.locale], '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::Coloncancerpredict2sController < 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('colon_cancer_tool_table_tmp_'+locale.to_s+'2.txt', 'w') @file_tmp = File.new(Coloncancerpredictfields2s::ToolTableMap[I18n.locale], '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

12
app/controllers/coloncancerpredict2s_controller.rb
View File

@ -147,10 +147,10 @@ class Coloncancerpredict2sController < 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/colon_cancer_tool_table_tmp_'+I18n.locale.to_s+'2.txt') @table_str = File.read(Coloncancerpredictfields2s::ToolTableMap[I18n.locale])
preidct_js_url = '/assets/colon_cancer_predict2.js' preidct_js_url = '/assets/colon_cancer_predict2.js'
if File.exist?("public/#{Coloncancerpredictfields2s::JSFileName}") if File.exist?(Coloncancerpredictfields2s::JSFileName)
js_filename = File.read("public/#{Coloncancerpredictfields2s::JSFileName}") js_filename = File.read(Coloncancerpredictfields2s::JSFileName)
if js_filename.include?('colon_cancer_predict2.js') if js_filename.include?('colon_cancer_predict2.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}"
@ -167,10 +167,10 @@ class Coloncancerpredict2sController < 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/colon_cancer_tool_table_tmp_'+I18n.locale.to_s+'2.txt') @table_str = File.read(Coloncancerpredictfields2s::ToolTableMap[I18n.locale])
preidct_js_url = '/assets/colon_cancer_predict2.js' preidct_js_url = '/assets/colon_cancer_predict2.js'
if File.exist?("public/#{Coloncancerpredictfields2s::JSFileName}") if File.exist?(Coloncancerpredictfields2s::JSFileName)
js_filename = File.read("public/#{Coloncancerpredictfields2s::JSFileName}") js_filename = File.read(Coloncancerpredictfields2s::JSFileName)
if js_filename.include?('colon_cancer_predict2.js') if js_filename.include?('colon_cancer_predict2.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}"

11
app/models/coloncancerpredictfields2s.rb
View File

@ -9,7 +9,10 @@ class Coloncancerpredictfields2s
AdvanceFields = ["revert_value","map_values","coloncancer_predict_mapping_file2"] AdvanceFields = ["revert_value","map_values","coloncancer_predict_mapping_file2"]
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 = "cc2_tool_js_filename.txt" JSFileName = "public/cc2_tool_js_filename.txt".freeze
ToolTableMap = I18n.available_locales.map do |locale|
[locale, "public/colon_cancer_tool_table_tmp_#{locale}2.txt".freeze]
end.to_h
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: {
@ -260,7 +263,7 @@ class Coloncancerpredictfields2s
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/#{JSFileName}",'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
@ -455,8 +458,8 @@ class Coloncancerpredictfields2s
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/#{JSFileName}")) elsif !(File.exist?(JSFileName))
File.open("#{Rails.root}/public/#{JSFileName}.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