From a4154b864760d170097c1b26f8e50a7a13320305 Mon Sep 17 00:00:00 2001 From: BOHUNG Date: Fri, 15 Nov 2019 17:02:17 +0800 Subject: [PATCH] fix --- app/assets/javascripts/react.js | 2 +- .../admin/cancerpredicts_controller.rb | 2 +- app/controllers/cancerpredicts_controller.rb | 27 ++++++++++++++++++ app/views/cancerpredicts/index.html.erb | 1 + config/locales/en.yml | 2 +- config/locales/zh_tw.yml | 6 ++-- lib/cancerpredict/engine.rb | 3 +- .../_cancer_predict_widget.html.erb | 20 +++++++++++++ .../cancer_predict_index.html.erb | 16 +++++++++++ modules/cancerpredict/info.json | 22 ++++++++++++++ modules/cancerpredict/thumbs/thumb.png | Bin 0 -> 4075 bytes 11 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 app/controllers/cancerpredicts_controller.rb create mode 100644 app/views/cancerpredicts/index.html.erb create mode 100644 modules/cancerpredict/_cancer_predict_widget.html.erb create mode 100644 modules/cancerpredict/cancer_predict_index.html.erb create mode 100644 modules/cancerpredict/info.json create mode 100644 modules/cancerpredict/thumbs/thumb.png diff --git a/app/assets/javascripts/react.js b/app/assets/javascripts/react.js index dcee495..bce11ff 100644 --- a/app/assets/javascripts/react.js +++ b/app/assets/javascripts/react.js @@ -1328,7 +1328,7 @@ if (typeof Math.imul == "undefined" || (Math.imul(0xffffffff, 5) == 0)) { null), new R(null, 2, 5, S, [XE, "Curves"], null), new R(null, 2, 5, S, [$v, "Chart"], null), new R(null, 2, 5, S, [Qp, "Texts"], null), new R(null, 2, 5, S, [ru, "Icons"], null)], null), null, Vr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), NB.c(wL(new m(null, 1, [NB, on], null)))), BL(eo, "Enable bisphosphonates", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [cF, "No"], null), new R(null, 2, 5, S, [Bm, "Yes"], null)], null), null, Vr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), eo.c(wL(new m(null, 1, [eo, Bm], null)))), BL(fF, "Enable 10 year hormone treatment?", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [cF, "No"], null), new R(null, 2, 5, S, [cF, "Not yet implemented"], null)], null), null, Vr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), fF.c(wL(new m(null, 1, [fF, cF], null)))), BL(VA, "Enable disease free survival", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [cF, "No"], null), new R(null, 2, 5, S, [cF, "Not yet implemented"], null)], null), null, Vr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), VA.c(wL(new m(null, 1, [VA, cF], null)))), BL(PF, "Hormone Therapy", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [null, "No"], null), new R(null, 2, 5, S, [Bm, "Yes"], null)], null), null, Ip, new Ri(null, new m(null, 2, ["v1.2", null, "v2.1", null], null), null), null), BL($m, "Bisphosphonates", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [null, "No"], null), new R(null, 2, 5, S, [Bm, "Yes"], null)], null), null, Ip, new Ri(null, new m(null, 1, ["v2.1", null], null), null), null), BL(up, "Trastuzumab", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [null, "No"], null), new R(null, 2, 5, S, [Bm, "Yes"], null)], null), null, Ip, new Ri(null, new m(null, 2, ["v1.2", null, "v2.1", null], - null), null), null), BL(BA, "Prior treatments", At, "Surgery is assumed", !1, Bp, new Ri(null, new m(null, 1, ["v2.1", null], null), null), null), BL(fn, "Age at diagnosis", mx, new m(null, 4, [Ll, 25, yx, 85, fD, 1, Qq, 0], null), !0, yr, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), ""), BL(Zk, "Post Menopausal?", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bz, "Yes"], null), new R(null, 2, 5, S, [Ln, "No"], null)], null), !0, yr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), null), BL(Br, "Detected by", + null), null), null), BL(BA, "Prior treatments", At, "Surgery is assumed", !1, Bp, new Ri(null, new m(null, 1, ["v2.1", null], null), null), null), BL(fn, <%=t(cancerpredict)%>, mx, new m(null, 4, [Ll, 25, yx, 85, fD, 1, Qq, 0], null), !0, yr, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), ""), BL(Zk, "Post Menopausal?", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bz, "Yes"], null), new R(null, 2, 5, S, [Ln, "No"], null)], null), !0, yr, new Ri(null, new m(null, 1, ["v2.1", null], null), null), null), BL(Br, "Detected by", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [ln, "Screening"], null), new R(null, 2, 5, S, [uB, "Symptoms"], null)], null), !0, Bp, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), null), BL(Qw, "Tumour grade", Wl, new R(null, 3, 5, S, [new R(null, 2, 5, S, [sp, 1], null), new R(null, 2, 5, S, [Ko, 2], null), new R(null, 2, 5, S, [Dx, 3], null)], null), !1, Bp, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), null), BL(vu, "Tumour size (mm)", mx, new m(null, 4, [Ll, 0, yx, 500, fD, 5, Qq, 0], null), !0, Bp, new Ri(null, new m(null, 2, ["v1.2", null, "v2.1", null], null), null), ""), BL(Pw, "Positive nodes", mx, new m(null, 4, [Ll, 0, yx, 100, fD, 1, Qq, 0], null), !0, kl, new Ri(null, new m(null, 2, ["v1.2", null, "v2.1", null], null), null), ""), BL(tC, "Micrometastases only", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bm, "Yes"], null), new R(null, 2, 5, S, [cF, "No"], null)], null), !0, kl, new Ri(null, new m(null, 2, ["v2.1", null, "research", null], null), null), ho), BL(SB, "ER status", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bm, "Positive"], null), new R(null, 2, 5, S, [cF, "Negative"], null)], null), !1, kl, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), null), BL(Tp, "HER2 status", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bm, "Positive"], null), new R(null, 2, 5, S, [cF, "Negative"], null)], null), !0, kl, new Ri(null, new m(null, 4, ["next-gen", null, "v1.2", null, "v2.1", null, "research", null], null), null), null), BL(Kt, "Ki-67 status", Wl, new R(null, 2, 5, S, [new R(null, 2, 5, S, [Bm, "Positive"], null), new R(null, 2, diff --git a/app/controllers/admin/cancerpredicts_controller.rb b/app/controllers/admin/cancerpredicts_controller.rb index b3abb99..3dbc1e4 100644 --- a/app/controllers/admin/cancerpredicts_controller.rb +++ b/app/controllers/admin/cancerpredicts_controller.rb @@ -1,7 +1,7 @@ # encoding: utf-8 require 'rubyXL' class Admin::CancerpredictsController < OrbitAdminController - include Admin::CancerpredictsHelper + #include Admin::CancerpredictsHelper before_action ->(module_app = @app_title) { set_variables module_app } #before_action :load_access_levels def initialize diff --git a/app/controllers/cancerpredicts_controller.rb b/app/controllers/cancerpredicts_controller.rb new file mode 100644 index 0000000..0812c49 --- /dev/null +++ b/app/controllers/cancerpredicts_controller.rb @@ -0,0 +1,27 @@ +# encoding: utf-8 +require 'rubyXL' +class CancerpredictsController < ApplicationController + before_filter :set_I18n + before_action ->(module_app = @app_title) { set_variables module_app } + #before_action :load_access_levels + def initialize + super + @app_title = "cancerpredict" + end + + def index + uid = OrbitHelper.params[:uid] rescue "" + tags = OrbitHelper.widget_tags + categories = OrbitHelper.widget_categories || [] + locale = OrbitHelper.get_site_locale.to_s + end + def widget + uid = OrbitHelper.params[:uid] rescue "" + tags = OrbitHelper.widget_tags + categories = OrbitHelper.widget_categories || [] + locale = OrbitHelper.get_site_locale.to_s + end + def set_I18n + I18n.locale = params[:lang] if params[:lang].present? + end +end \ No newline at end of file diff --git a/app/views/cancerpredicts/index.html.erb b/app/views/cancerpredicts/index.html.erb new file mode 100644 index 0000000..648b75c --- /dev/null +++ b/app/views/cancerpredicts/index.html.erb @@ -0,0 +1 @@ +<%= render_view %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cd82fa..b4b6017 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -11,7 +11,7 @@ en: HER2: HER2 status PR: PR status Tumoursize: Tumour size(mm) - Tumourgrade :Tumour grade + Tumourgrade: Tumour grade lymphnodes: lymph nodes positive: positive negative: negative diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index ad59eaa..7dc965c 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -1,8 +1,8 @@ zh_tw: cancerpredict: cancerpredict: 乳癌預測 - table: - welcome:歡迎使用台灣準備乳癌癒後系統！\n若要開始 請在下方輸入相關資訊 + table: + welcome: 歡迎使用台灣準備乳癌癒後系統！\n若要開始 請在下方輸入相關資訊 Reset: 重置 Submit: 提交 age: 確認年齡 @@ -11,7 +11,7 @@ zh_tw: HER2: HER2狀態 PR: PR狀態 Tumoursize: 腫瘤大小(mm) - Tumourgrade :腫瘤分級 + Tumourgrade: 腫瘤分級 lymphnodes: 淋巴結數目 positive: 陽性 negative: 陰性 diff --git a/lib/cancerpredict/engine.rb b/lib/cancerpredict/engine.rb index 6aa69c1..4747a8e 100644 --- a/lib/cancerpredict/engine.rb +++ b/lib/cancerpredict/engine.rb @@ -9,11 +9,12 @@ module Cancerpredict authorizable widget_methods ["widget"] widget_settings [{"data_count"=>1}] + frontend_enabled side_bar do head_label_i18n 'cancerpredict.cancerpredict', icon_class: "icons-megaphone" available_for "users" active_for_controllers (['admin/cancerpredicts']) - head_link_path "admin_cancerPredicts_path" + head_link_path "admin_cancerpredicts_path" context_link 'cancerpredict.cancerpredict', :link_path=>"admin_cancerpredicts_path" , diff --git a/modules/cancerpredict/_cancer_predict_widget.html.erb b/modules/cancerpredict/_cancer_predict_widget.html.erb new file mode 100644 index 0000000..e7cfe43 --- /dev/null +++ b/modules/cancerpredict/_cancer_predict_widget.html.erb @@ -0,0 +1,20 @@ +
+ + + +

+ {{widget-title}} +

+
+
+
+
+
+
 
+
Loading...
+
+
+
+
+
+
\ No newline at end of file diff --git a/modules/cancerpredict/cancer_predict_index.html.erb b/modules/cancerpredict/cancer_predict_index.html.erb new file mode 100644 index 0000000..56f76aa --- /dev/null +++ b/modules/cancerpredict/cancer_predict_index.html.erb @@ -0,0 +1,16 @@ +
+ + + +

{{page-title}}

+
+
+
+
+
 
+
Loading...
+
+
+
+
+
\ No newline at end of file diff --git a/modules/cancerpredict/info.json b/modules/cancerpredict/info.json new file mode 100644 index 0000000..7b4c1d1 --- /dev/null +++ b/modules/cancerpredict/info.json @@ -0,0 +1,22 @@ +{ + "frontend": [ + { + "filename" : "cancer_predict_index", + "name" : { + "zh_tw" : "1. 乳癌預測工具", + "en" : "1. Breast cancer predict tool" + }, + "thumbnail" : "thumb.png" + } + ], + "widgets" : [ + { + "filename" : "cancer_predict_widget", + "name" : { + "zh_tw" : "1. 乳癌預測工具", + "en" : "1. Breast cancer predict tool" + }, + "thumbnail" : "thumb.png" + } + ] +} \ No newline at end of file diff --git a/modules/cancerpredict/thumbs/thumb.png b/modules/cancerpredict/thumbs/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..266af5606742714c262a949cd58aedc2b84b1959 GIT binary patch literal 4075 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