From 70b66409dd526ea20e235ab3740c2de93fcdc2d4 Mon Sep 17 00:00:00 2001
From: BOHUNG <naruto0426@rulingcom.com>
Date: Wed, 18 Mar 2020 18:22:13 +0800
Subject: [PATCH] change table in tool.

---
 app/controllers/cancerpredicts_controller.rb | 7 ++++---
 config/locales/en.yml                        | 7 ++++---
 config/locales/zh_tw.yml                     | 8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/controllers/cancerpredicts_controller.rb b/app/controllers/cancerpredicts_controller.rb
index 1aaf2e1..395705e 100644
--- a/app/controllers/cancerpredicts_controller.rb
+++ b/app/controllers/cancerpredicts_controller.rb
@@ -66,9 +66,10 @@ class CancerpredictsController < ApplicationController
 		result['years'] = @years
 		@years.each{|year| result['table'] += ('<button class="cancer_years cancer_table_btn  btn btn-default btn-sm">'+year.to_s+'</button>')}
 		result['table'] += ('</a><a style="display: inline-block;">'+(locale == 'zh_tw' ? '年' : '')+'</a>')
-		@table_head = (locale == "zh_tw") ? ['治療','額外治療效益','總生存率(%)'] :['Treatment','Additional Benefit','Overall Survival(%)']
-		@head_name = ['Treatment','Additional_Benefit','Overall_Survival']
-		@therapy_choices = (locale == "zh_tw") ? ['純手術'] :['Surgery only']
+		#@head_name = ['Treatment','Additional_Benefit','Overall_Survival']
+		@head_name = ['Treatment','Overall_Survival']
+		@table_head = @head_name.map{|name| I18n.t('cancerpredict.table.'+name)}
+		@therapy_choices = [I18n.t('cancerpredict.table.Surgeryonly')]
 		@form_to_show.form_show_in_result.values.each{|choice| @therapy_choices.push choice["name"][locale]}
 		@therapy_names = ['Surgery_only']
 		@form_to_show.form_show_in_result.values.each{|choice| @therapy_names.push choice["variable"]}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9eec112..730b0a9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -46,9 +46,10 @@ en:
         no: no
         unknown: unknown
         Results: Results
-        AdditionalBenefit: 	Additional Benefit
-        OverallSurvival: Overall Survival(%)
-        Surgeryonly: Surgery only
+        Treatment: Event
+        Additional_Benefit: 	Additional Benefit
+        Overall_Survival: Probability(%)
+        Surgeryonly: Readmission or death
         Hormonetherapy: Hormone therapy
         Chemotherapy: Chemotherapy
         years: years
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 898d5bb..fc99162 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -46,10 +46,10 @@ zh_tw:
         no: 否
         unknown: 未知
         Results: 結果
-        Treatment: 治療
-        AdditionalBenefit: 額外治療效益
-        OverallSurvival: 總生存率(%)
-        Surgeryonly: 純手術
+        Treatment: Event(事件)
+        Additional_Benefit: 額外治療效益
+        Overall_Survival: Probability機率(%)
+        Surgeryonly: 再住院或死亡
         Hormonetherapy: 賀爾蒙治療
         Chemotherapy: 化學治療
         years: 年