Compare commits

..

2 Commits

Author SHA1 Message Date
邱博亞 e7a44ed090 Fix English title. 2024-08-22 23:53:52 +08:00
邱博亞 17c1674beb Fix js not reload bug. 2024-08-22 23:53:52 +08:00
3 changed files with 12 additions and 15 deletions

View File

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

View File

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

View File

@ -9,10 +9,7 @@ class Coloncancerpredictfields1s
AdvanceFields = ["revert_value","map_values","coloncancer_predict_mapping_file1"] AdvanceFields = ["revert_value","map_values","coloncancer_predict_mapping_file1"]
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/cc1_tool_js_filename.txt" JSFileName = "cc1_tool_js_filename.txt"
ToolTableMap = I18n.available_locales.map do |locale|
[locale, "public/colon_cancer_tool_table_tmp_#{locale}1.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: {
@ -259,7 +256,7 @@ class Coloncancerpredictfields1s
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(JSFileName, 'w+'){|f| f.write(new_path)} File.open("#{Rails.root}/public/#{JSFileName}",'w+'){|f| f.write(new_path)}
end end
end end
def generate_eval_formula def generate_eval_formula
@ -454,8 +451,8 @@ class Coloncancerpredictfields1s
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?(JSFileName)) elsif !(File.exist?("#{Rails.root}/public/#{JSFileName}"))
File.open(JSFileName, 'w+'){|f| f.write(save_path)} File.open("#{Rails.root}/public/#{JSFileName}.txt",'w+'){|f| f.write(save_path)}
end end
end end
def get_years_settings_dict def get_years_settings_dict