From a90a842a4c6812e6de09e8669ec9e001204a39c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@rulingcom.com>
Date: Thu, 22 Aug 2024 22:22:21 +0800
Subject: [PATCH] Fix js not reload bug.

---
 .../coloncancerpredict2s_controller.rb        | 24 +++++++++++++++++--
 .../_colon_cancer_predict2_widget.html.erb    |  2 +-
 .../colon_cancer_predict2_index.html.erb      |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

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 @@
 <script type="text/javascript" src="/assets/jquery.smartmenus.min.js"></script>
 <script type="text/javascript" src="/assets/jquery.smartmenus.bootstrap.min.js"></script>
-<script type="text/javascript" src="/assets/colon_cancer_predict2.js"></script>
+<script type="text/javascript" src="{{preidct_js_url}}"></script>
 {{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 @@
 <script type="text/javascript" src="/assets/jquery.smartmenus.min.js"></script>
 <script type="text/javascript" src="/assets/jquery.smartmenus.bootstrap.min.js"></script>
-<script type="text/javascript" src="/assets/colon_cancer_predict2.js"></script>
+<script type="text/javascript" src="{{preidct_js_url}}"></script>
 {{table}}
 <%= stylesheet_link_tag "colon_cancer_predict2", media: "screen" %>
 <%= stylesheet_link_tag "bootstrap.min.print", media: "print" %>