From 0aa6715a2ffd60738ce9d1d4fdd0590af57282ae Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 12:21:02 +0800
Subject: [PATCH 001/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 326c8ab..271bbca 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -75,7 +75,7 @@ class PersonalJournalsController < ApplicationController
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else
-          t << {"value" => journal_paper.send(fs)}
+          t << {"value" => (journal_paper.send(fs) rescue "")}
         end
       end
       journal_paper_list << {"jps" => t}

From b63aebc633d02a619278b9a4ee573d4b5841ec87 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:00:44 +0800
Subject: [PATCH 002/119] Update personal_journals_controller.rb fix paper_type
 show error

---
 app/controllers/personal_journals_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 271bbca..38f2bf2 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -72,6 +72,8 @@ class PersonalJournalsController < ApplicationController
           t << {"value" => (journal_paper.send(fs).strftime("%Y/%m") rescue "")}
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
+        when "paper_types"
+          t << {"value" => ( !journal_paper.paper_types.blank? ? "(#{journal_paper.paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From 2b2b1704f640659a098d85877e8ce4746083fc86 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:14:04 +0800
Subject: [PATCH 003/119] Update personal_journals_controller.rb fix paper_type
 error

---
 .../personal_journals_controller.rb           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 38f2bf2..dc2ea81 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -1,12 +1,8 @@
 class PersonalJournalsController < ApplicationController
-  def search_all_words(target,word)
-    target=target.upcase
-    words=word.upcase.split(' ')
-    return words.select{|value| target.include? value}==words
-  end
   def index
     params = OrbitHelper.params
-    journal_papers = JournalPaper.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
+    page_data_count = OrbitHelper.page_data_count
+    journal_papers = JournalPaper.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
     page = Page.where(:page_id => params[:page_id]).first rescue nil
     if page.custom_string_field == "table"
       fields_to_show = page.custom_array_field rescue []
@@ -40,6 +36,8 @@ class PersonalJournalsController < ApplicationController
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])}
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
+      when "paper_types"
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -50,8 +48,8 @@ class PersonalJournalsController < ApplicationController
       else
           page_to_show = params[:page_no].to_i
       end
-      journal_papers = journal_papers_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
-      journal_papers_total_pages = (journal_papers_show.length/OrbitHelper.page_data_count.to_f).ceil
+      journal_papers = journal_papers_show[(page_to_show-1)*page_data_count...page_to_show*page_data_count]
+      journal_papers_total_pages = (journal_papers_show.length/page_data_count.to_f).ceil
     else
       journal_papers_total_pages = journal_papers.total_pages
     end
@@ -73,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_types"
-          t << {"value" => ( !journal_paper.paper_types.blank? ? "(#{journal_paper.paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" => ( !journal_paper.journal_paper_type.blank? ? "(#{journal_paper.journal_paper_type.collect{|x| x.title}.join(', ')})" : nil)} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else
@@ -185,4 +183,10 @@ class PersonalJournalsController < ApplicationController
     page.save
     render :json => {"success" => true}.to_json
   end
+private
+  def search_all_words(target,word)
+    target=target.upcase
+    words=word.upcase.split(' ')
+    return words.select{|value| target.include? value}==words
+  end
 end

From 5881bbea9e8b0cd0f02affdf183f06d2fdc12af1 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:15:20 +0800
Subject: [PATCH 004/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index dc2ea81..5c63913 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_types"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_types.collect{|x| x.title}.join(", "), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -71,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_types"
-          t << {"value" => ( !journal_paper.journal_paper_type.blank? ? "(#{journal_paper.journal_paper_type.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" => ( !journal_paper.journal_paper_types.blank? ? "(#{journal_paper.journal_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From a5abf0b2ef22ab8c32f439228b433e3ac171295c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:17:03 +0800
Subject: [PATCH 005/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 5c63913..b5512b0 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -36,8 +36,8 @@ class PersonalJournalsController < ApplicationController
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])}
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
-      when "paper_types"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_types.collect{|x| x.title}.join(", "), params[:keywords])}
+      when "paper_type"
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -70,8 +70,8 @@ class PersonalJournalsController < ApplicationController
           t << {"value" => (journal_paper.send(fs).strftime("%Y/%m") rescue "")}
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
-        when "paper_types"
-          t << {"value" => ( !journal_paper.journal_paper_types.blank? ? "(#{journal_paper.journal_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
+        when "paper_type"
+          t << {"value" => ( !journal_paper.journal_paper_type.blank? ? "(#{journal_paper.journal_paper_type.collect{|x| x.title}.join(', ')})" : nil)} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From d6b7db3b08701be979c59ed10f9762cba2592ca7 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:18:17 +0800
Subject: [PATCH 006/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index b5512b0..3812f4e 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_types.collect{|x| x.title}.join(", "), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -71,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_type"
-          t << {"value" => ( !journal_paper.journal_paper_type.blank? ? "(#{journal_paper.journal_paper_type.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" => ( !journal_paper.journal_paper_types.blank? ? "(#{journal_paper.journal_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From 5aa2f7966e5446b670848270c29b365fddf3742f Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:24:24 +0800
Subject: [PATCH 007/119] Update personal_journals_controller.rb fix error

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 3812f4e..f084f59 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -71,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_type"
-          t << {"value" => ( !journal_paper.journal_paper_types.blank? ? "(#{journal_paper.journal_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" => (journal_paper.journal_paper_types.collect{|x| x.title}.join(', ') rescue "")} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From 1769d9008f94fa5d13bc30cc9c58117a82757d94 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:26:52 +0800
Subject: [PATCH 008/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index f084f59..14ba882 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_types.collect{|x| x.title}.join(", "), params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -71,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_type"
-          t << {"value" => (journal_paper.journal_paper_types.collect{|x| x.title}.join(', ') rescue "")} 
+          t << {"value" => (journal_paper.journal_paper_type.collect{|x| x.title}.join(', ') rescue "")} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From 9ab4bdefb00c1e55b51ff52fb53fae34f47eb3a6 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:54:10 +0800
Subject: [PATCH 009/119] Update personal_journals_controller.rb fix error?

---
 app/controllers/personal_journals_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 14ba882..0f04765 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.collect{|x| x.title}.join(", "), params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.title, params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
@@ -71,7 +71,7 @@ class PersonalJournalsController < ApplicationController
         when "author_type"
           t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
         when "paper_type"
-          t << {"value" => (journal_paper.journal_paper_type.collect{|x| x.title}.join(', ') rescue "")} 
+          t << {"value" => (journal_paper.journal_paper_type.title rescue "")} 
         when "language"
           t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
         else

From 67b787c3083052bf2d8a268c9fb540e31cfa6be8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:56:07 +0800
Subject: [PATCH 010/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 0f04765..9791270 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.title, params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.title.to_s, params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else

From ac15dccd1635eb478c7e5e2b09294f8c513dc957 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 13:57:47 +0800
Subject: [PATCH 011/119] Update personal_journals_controller.rb fix error

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 9791270..5a79635 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -37,7 +37,7 @@ class PersonalJournalsController < ApplicationController
       when "author_type"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
       when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_type.title.to_s, params[:keywords])}
+          journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.journal_paper_type.title rescue ""), params[:keywords])}
       when "language"
           journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else

From 099fc02d9e75d41c524f500b825817720bc4dad9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 14:17:45 +0800
Subject: [PATCH 012/119] Update en.yml add search translation

---
 config/locales/en.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c45e60..8e659ec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,9 @@ en:
     personal_journal: Journal Paper
     journal_paper: Journal Paper
   personal_journal:
+    select_class: "——select class——"
+    search_class: "search class:"
+    word_to_search: "word to search:"
     paper_title : "Paper Title"
     associated_project: Associated Project
     paper_type : "Paper Type"

From 00bc6b4355dee33401e0d2f874f10256f5bc964e Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 14:18:32 +0800
Subject: [PATCH 013/119] Update zh_tw.yml

---
 config/locales/zh_tw.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 5e59531..8d8b997 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -3,6 +3,9 @@ zh_tw:
     personal_journal: 期刊論文
     journal_paper: 期刊論文
   personal_journal:
+    select_class: "——選取分類——"
+    search_class: "搜尋類別:"
+    word_to_search: "關鍵字搜尋:"
     associated_project: "所屬計畫案"
     number_of_authors: "著作人數"
     paper_title : "論文名稱"

From b4e220918e1e7fd2db8469fa7c38d7c94b429c67 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 14:21:18 +0800
Subject: [PATCH 014/119] =?UTF-8?q?Update=20personal=5Fjournals=5Fcontroll?=
 =?UTF-8?q?er.rb=20=E6=94=B9=E6=90=9C=E5=B0=8B=E6=A1=86=E7=82=BA=E5=8F=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=9C=8B=E8=AA=9E=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/personal_journals_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 5a79635..e9042bf 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -96,13 +96,13 @@ class PersonalJournalsController < ApplicationController
     choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""}
     choice_select=choice_select.map{|value| {"choice_select" => value}}
     choice_value=choice_value.map{|value| {"choice_value" => value}}
-    choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——"
+    choice_default = t("personal_journal.select_class")
     choice_show.unshift(choice_default)
     choice_show=choice_show.map{|value| {"choice_show" => value}}
     choice=choice_value.zip(choice_show,choice_select)
     choice=choice.map{|value| value.inject:merge}
-    select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:"
-    search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:"
+    select_text = t("personal_journal.search_class")
+    search_text = t("word_to_search")
     {
       "journal_papers" => journal_paper_list,
       "headers" => headers,

From 8ba1b730ed4fa3449e8149eba4fd9661cb87b61f Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 14:22:45 +0800
Subject: [PATCH 015/119] Update personal_journals_controller.rb fix error

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index e9042bf..5bcff11 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -102,7 +102,7 @@ class PersonalJournalsController < ApplicationController
     choice=choice_value.zip(choice_show,choice_select)
     choice=choice.map{|value| value.inject:merge}
     select_text = t("personal_journal.search_class")
-    search_text = t("word_to_search")
+    search_text = t("personal_journal.word_to_search")
     {
       "journal_papers" => journal_paper_list,
       "headers" => headers,

From a8db77e659fed54bd06248137f0215cb67c6114c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:12:50 +0800
Subject: [PATCH 016/119] Update journal_paper.rb try destroy

---
 app/models/journal_paper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index 0152181..fdabd5e 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -159,13 +159,13 @@ class JournalPaper
   #   member_data.to_json
   # end
 
-  # def save_journal_paper_files
-  #   self.journal_paper_files.each do |t|
-  #     if t.should_destroy
-  #       t.destroy
-  #     end
-  #   end
-  # end
+  def save_journal_paper_files
+    self.journal_paper_files.each do |t|
+      if t.should_destroy
+         t.destroy
+      end
+    end
+  end
 
   # def save_journal_paper_authors
   #   self.journal_paper_authors.each do |t|

From 66a80eacd044985331d04551120a47fe71dc587e Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:15:45 +0800
Subject: [PATCH 017/119] =?UTF-8?q?Update=20journal=5Fpaper.rb=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=A8=BB=E8=A7=A3=EF=BC=8C=E5=9B=A0=E7=82=BA=E6=B2=92?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal_paper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index fdabd5e..a9aefb2 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -159,13 +159,13 @@ class JournalPaper
   #   member_data.to_json
   # end
 
-  def save_journal_paper_files
-    self.journal_paper_files.each do |t|
-      if t.should_destroy
-         t.destroy
-      end
-    end
-  end
+  # def save_journal_paper_files
+  #    self.journal_paper_files.each do |t|
+  #   if t.should_destroy
+  #      t.destroy
+  #    end
+  #  end
+  # end
 
   # def save_journal_paper_authors
   #   self.journal_paper_authors.each do |t|

From 750eeac9a30ac73ff9cdbb8f78b7cc373b9af8a0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:22:52 +0800
Subject: [PATCH 018/119] Update journal_papers_controller.rb try fix

---
 app/controllers/admin/journal_papers_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/journal_papers_controller.rb b/app/controllers/admin/journal_papers_controller.rb
index d8c675c..3073be8 100644
--- a/app/controllers/admin/journal_papers_controller.rb
+++ b/app/controllers/admin/journal_papers_controller.rb
@@ -116,7 +116,7 @@ class Admin::JournalPapersController < OrbitMemberController
   def destroy
     @journal_paper.destroy
      respond_to do |format|     
-      format.html { redirect_to(admin_journal_paper_url) }
+      format.html { redirect_to(admin_journal_papers_url) }
       # format.xml  { head :ok }
       format.js
       format.json {render json: {"success" => true}}

From c7fd7194c9f28bfedba3bd0f5d505d32baa70bdd Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:31:04 +0800
Subject: [PATCH 019/119] Update _form_file.html.erb try fix

---
 app/views/admin/journal_papers/_form_file.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/journal_papers/_form_file.html.erb b/app/views/admin/journal_papers/_form_file.html.erb
index 7d52692..a1d8251 100644
--- a/app/views/admin/journal_papers/_form_file.html.erb
+++ b/app/views/admin/journal_papers/_form_file.html.erb
@@ -38,7 +38,7 @@
       <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
         <%= f.hidden_field :id %>
         <a class="icon-remove"></a>
-        <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+        <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
       </span>
     <% end %>
   </div>

From 3ef7a8d3935ca677e65932152f8e48ff6c26d0b7 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:44:54 +0800
Subject: [PATCH 020/119] Update journal_paper.rb try fix error

---
 app/models/journal_paper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index a9aefb2..3110104 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -36,7 +36,7 @@ class JournalPaper
   has_and_belongs_to_many :journal_levels
 
   has_many :journal_paper_files, autosave: true, dependent: :destroy
-  accepts_nested_attributes_for :journal_paper_files
+  accepts_nested_attributes_for :journal_paper_files, :allow_destroy => true
 
   # has_and_belongs_to_many :journal_paper_authors, dependent: :destroy
   # accepts_nested_attributes_for :journal_paper_authors

From d3b6b159313d5c5b2271372c1a5ef7184faf16ae Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:53:18 +0800
Subject: [PATCH 021/119] Update journal_paper.rb fix error when no file

---
 app/models/journal_paper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index 3110104..6ca2312 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -210,9 +210,9 @@ class JournalPaper
     when "file"
       files = []
       self.journal_paper_files.each do |file|  
-        url = file.journal_file.url
+        url = (file.journal_file.url rescue "")
         title = (file.title.blank? ? File.basename(file.journal_file.path) : file.title)
-        files << "<li><a href='#{url}'' target='_blank'>#{title}</li>"
+        files << (url=="" ? "" : "<li><a href='#{url}'' target='_blank'>#{title}</li>")
       end
       value = files.join("")
     else

From a5a3008a5e22d441e775c065f515971b790dd748 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:55:16 +0800
Subject: [PATCH 022/119] Update journal_paper.rb fix error?

---
 app/models/journal_paper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index 6ca2312..a19aeb1 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -211,7 +211,7 @@ class JournalPaper
       files = []
       self.journal_paper_files.each do |file|  
         url = (file.journal_file.url rescue "")
-        title = (file.title.blank? ? File.basename(file.journal_file.path) : file.title)
+        title = ((file.title.blank? ? File.basename(file.journal_file.path) : file.title) rescue "")
         files << (url=="" ? "" : "<li><a href='#{url}'' target='_blank'>#{title}</li>")
       end
       value = files.join("")

From a8153e68705d39802291cf8383fbe372a7aeac89 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 15:57:15 +0800
Subject: [PATCH 023/119] Update journal_paper.rb fix error

---
 app/models/journal_paper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index a19aeb1..8ff8da1 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -210,9 +210,9 @@ class JournalPaper
     when "file"
       files = []
       self.journal_paper_files.each do |file|  
-        url = (file.journal_file.url rescue "")
+        url = file.journal_file.url
         title = ((file.title.blank? ? File.basename(file.journal_file.path) : file.title) rescue "")
-        files << (url=="" ? "" : "<li><a href='#{url}'' target='_blank'>#{title}</li>")
+        files << (url.nil? ? "" : "<li><a href='#{url}'' target='_blank'>#{title}</li>")
       end
       value = files.join("")
     else

From 9e7b9140b12e975072669264cadd29b1ec0bcdb5 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 19 Aug 2019 17:08:01 +0800
Subject: [PATCH 024/119] Update _writing_journal.html.erb fix the problem that
 don't render to page but render to home?

---
 app/views/admin/journal_papers/_writing_journal.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/journal_papers/_writing_journal.html.erb b/app/views/admin/journal_papers/_writing_journal.html.erb
index b348310..0670767 100644
--- a/app/views/admin/journal_papers/_writing_journal.html.erb
+++ b/app/views/admin/journal_papers/_writing_journal.html.erb
@@ -2,7 +2,7 @@
 	<tr id="<%= dom_id writing_journal %>" class="with_action">
 		<td class="span1"><%= writing_journal.year %></td>
 		<td class="span1">
-		<%= link_to writing_journal.create_link, page_for_journal_paper(writing_journal), target: "blank"%>
+		<%= link_to writing_journal.create_link, OrbitHelper.url_to_plugin_show(writing_journal.to_param,'personal_journal').to_s, target: "blank"%>
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<li><%= link_to t('edit'), edit_admin_journal_paper_path(writing_journal) %></li>

From 4f2080a290b11d00b8423474f320de76f0f1960a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:25:37 +0800
Subject: [PATCH 025/119] Update .gitignore try

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index de5d954..367362b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/.sass-cache
+modules

From 550978bd84a0169638f912913a51a1aa93ece36f Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:25:59 +0800
Subject: [PATCH 026/119] Add new directory try

---
 modules/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modules/.gitkeep

diff --git a/modules/.gitkeep b/modules/.gitkeep
new file mode 100644
index 0000000..e69de29

From 8ce20be63bb3f066bc95b96b9ce3124fce48c27b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:27:21 +0800
Subject: [PATCH 027/119] Add new directory try

---
 modules/personal_journal/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modules/personal_journal/.gitkeep

diff --git a/modules/personal_journal/.gitkeep b/modules/personal_journal/.gitkeep
new file mode 100644
index 0000000..e69de29

From 958290810b658c6ddad3b6fff95256332f91ec4b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:27:46 +0800
Subject: [PATCH 028/119] Upload new file try

---
 modules/personal_journal/index.html.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 modules/personal_journal/index.html.erb

diff --git a/modules/personal_journal/index.html.erb b/modules/personal_journal/index.html.erb
new file mode 100644
index 0000000..310fed8
--- /dev/null
+++ b/modules/personal_journal/index.html.erb
@@ -0,0 +1,14 @@
+<table class="table table-hover table-striped projects-index">
+  <caption><h3>{{widget-title}}</h3></caption>
+  <thead>
+    <tr data-level="0" data-list="headers">
+      <th class="col-md-{{col}}">{{head-title}}</th>
+    </tr>
+  </thead>
+  <tbody data-level="0" data-list="journal_papers">
+    <tr data-level="1" data-list="jps">
+      <td>{{value}}</td>
+    </tr>
+  </tbody>
+</table>
+{{pagination_goes_here}}
\ No newline at end of file

From a975eba4b2a02cd2e0d913a915cdf4bcc22823d7 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:28:06 +0800
Subject: [PATCH 029/119] Upload new file try

---
 .../personal_journal/index_search1.html.erb   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 modules/personal_journal/index_search1.html.erb

diff --git a/modules/personal_journal/index_search1.html.erb b/modules/personal_journal/index_search1.html.erb
new file mode 100644
index 0000000..fc23982
--- /dev/null
+++ b/modules/personal_journal/index_search1.html.erb
@@ -0,0 +1,37 @@
+<script type="text/javascript">
+$( ".selectbox" ).ready(function() {
+  var option_len = $(".search-widget option").length
+  for (var i=0;i<option_len;i++){
+		if($(".search-widget option").eq(i).data('selected')=="selected"){
+		  $(".search-widget option").eq(i).attr('selected','selected')
+		}
+  }
+});
+</script>
+<h3>{{widget-title}}</h3>
+<div class="search-widget">
+  <form action="{{url}}"  method="get">
+  {{select_text}}
+   <select class="selectbox" name="selectbox" data-level="0" data-list="choice">
+    <option value={{choice_value}} data-selected='{{choice_select}}' >
+    {{choice_show}}</option>
+	</select>
+  {{search_text}}
+  <input name="keywords" placeholder="Keywords" type="text" value="{{search_value}}">
+  <button>Go</button>
+  <a id="filter" style="" href="{{url}}">Clear</a>
+  </form>
+ </div>
+<table class="table table-hover table-striped projects-index">
+  <thead>
+    <tr data-level="0" data-list="headers">
+      <th class="col-md-{{col}}">{{head-title}}</th>
+    </tr>
+  </thead>
+  <tbody data-level="0" data-list="journal_papers">
+    <tr data-level="1" data-list="jps">
+      <td>{{value}}</td>
+    </tr>
+  </tbody>
+</table>
+{{pagination_goes_here}}
\ No newline at end of file

From 4335fccb0fb4dfb7ca2723781f2d57c4bab2d6a2 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:28:26 +0800
Subject: [PATCH 030/119] Upload new file try

---
 modules/personal_journal/info.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 modules/personal_journal/info.json

diff --git a/modules/personal_journal/info.json b/modules/personal_journal/info.json
new file mode 100644
index 0000000..bdb0c2c
--- /dev/null
+++ b/modules/personal_journal/info.json
@@ -0,0 +1,20 @@
+{
+    "frontend": [
+        {
+            "filename" : "index",
+            "name" : {
+                "zh_tw" : "1. 列表",
+                "en" : "1. List"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "index_search1",
+            "name" : {
+                "zh_tw" : "2. 列表(含搜尋)",
+                "en" : "2. List which includes search"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ]
+}
\ No newline at end of file

From 6294265b638f5f40a2751949af6c84d5a4087430 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:28:39 +0800
Subject: [PATCH 031/119] Upload new file try

---
 modules/personal_journal/show.html.erb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 modules/personal_journal/show.html.erb

diff --git a/modules/personal_journal/show.html.erb b/modules/personal_journal/show.html.erb
new file mode 100644
index 0000000..b183818
--- /dev/null
+++ b/modules/personal_journal/show.html.erb
@@ -0,0 +1,8 @@
+<table class="table table-striped plugin-show-table">
+    <tbody data-list="plugin_datas" data-level="0">
+        <tr>
+            <th class="{{title_class}}">{{title}}</th>
+            <td class="{{value_class}}">{{value}}</td>
+        </tr>
+    </tbody>
+</table>

From 15ebdb357384b4fbee4e4561486a94eaaa041875 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:28:58 +0800
Subject: [PATCH 032/119] Add new directory try

---
 modules/personal_journal/thumbs/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modules/personal_journal/thumbs/.gitkeep

diff --git a/modules/personal_journal/thumbs/.gitkeep b/modules/personal_journal/thumbs/.gitkeep
new file mode 100644
index 0000000..e69de29

From 897c77d51e6ca7c34238130bd0a8df8276e957e1 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 08:29:17 +0800
Subject: [PATCH 033/119] Upload new file try

---
 modules/personal_journal/thumbs/thumb.png | Bin 0 -> 4075 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modules/personal_journal/thumbs/thumb.png

diff --git a/modules/personal_journal/thumbs/thumb.png b/modules/personal_journal/thumbs/thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..266af5606742714c262a949cd58aedc2b84b1959
GIT binary patch
literal 4075
zcmcgvYdBPE`=8Q@or=MZk}-~jIXD}qFebzhVvsZ#jA2HMW=0OFFbKQkR5@2;7{)1-
z&=wM+oMYofvU8{uIS&7&UHkuj*w_2v{qU~qTI;!=weH`2-_Lz|o)v3@JtZh0Apin_
z1kKIRw!l~h+!g!w0MC|jUMDb!Q%!MHJBk;Th7Tlwj65ms1c<pm-kV@cz<V+-z9i^@
zKzv?AdmI&KWr^~j_`~qqJTSU{0DuO8^bF|%cn=bR3UMcR6Uq9}PqhtD2+>m?>ZoCb
zunI6C_z=xP0tt2@SbL8Ul825b)X)H;M@Iny{0US%gzoQ04nooOq2J}A0DAj1918i)
zLM7=#|1t_^Wdkvx1QH+`FocQ+LK6wmREHte5jyHR$`Dlq5&=i5!Vy|3NCZkl3xz;J
zeq2yMTcD>G$`+0Jp$nMlLw%^!02CZfqtReAH5et(8;;b`(SajW;i{@C0EbEtgG|NK
zRmedyKP8|EK^}p`04k9}hHOj3yHkRx`cS~qzn0)1U}g2UU~<q8M*%K_)A0dtBn$!f
z_upREckUpnE#d#o_($#_dqw~OZc7NF1P6Km@$i!Q2?l)kpA~I00@k3c1BpOT@P25D
zN3cJEOf^UALxC?aPogJERU3iO!XQ=E)Kn3g+DN31rjZ&NsfNI)svBdpOjLi$_$RE6
zsg{nWu@=%)9SI;!)r|p&5dv+jh6V@|Et8*Eb8-+BPxc`E)Jp{P{=g#sBNk;6NWfDm
zf%X)N-_H!N@u5&DK|YiKh>4vB3<+^0l07N3pzZMdwOTYGka&sUi3z0mL%#bLMf?Z-
z>ZS-JMhk;Ms+p<-HXx1FOpGw9+S;btnx?86+S<?`SkM2)XK=t6_;zyqTeAFo1!Ukh
z`FH9AlfR3HKn5x%5GajX@qcWBK>LrFqmAt8Lvxw>O#9Ok(U(6adi=}!UB|h@GFIv~
z3by;zyIaw_j2w*cMtljDe@vCYYBBN{3B_}Vjo?=y5{HRi5Qzi{pS+umos~BYBNJa&
zkB#!~P<#uqTbUmXSksK04_O}zQA=O@9o_oaC^d(oz7rtA`(Fz|ZJl&3e@9oBUHof}
zii!$-7E<g9IQR^<cMR6&#+u=Z7m5oszE~rbY_3_mt{6HyO+;8@v72GOzJ=vpuOtc&
z2>jmN-Q6)UF+u6`U4kzeZoO$!*c@J5RNonGEUj;m*6pneu6?<%aM4#VPAhUf8>TQU
zggnVU*>r`u;}8-A-Gko$zozhV-1BvXNA*K07ec<gGlvlkE`Q@>JnTNzBq!E9)t<I4
zrT`yph!{&lJrhn#Z*FcTB)r95GYDNNU1i|$k>fjr4yJM48svB1DR(~qCqDFK6W{c3
zH6;U@u$qM5KnN;IP3F7D9z3f3I$hbkK$rIMoRCAwHLHipoCjs(ktYRPYby(rqTtfW
z7fFr>j_DmvnAA<i>>kT~$YLGg+S9*wr7Xw)3Wu%pe!sRi1%Rt_BUV0-C(c?B3zSEr
zhH7b)e3<)El-#ka)_#IVH0^z&`U1{dmX%seHb(vOMs!!~hq<>EFU{{XL5-qiu9m3X
zFi*!wq?oQAXfH&aIseu9xKWe7vpau}vc;d8={1&3PO#V}#$-#v`?2zx+$FnvMUGs|
zh<HVMszP(0QhVSsIHj4Uono@OAi4T&e)z$qB21$~)gENzoeOn@vp9Zpd_UJMTcj+h
z2#eIx8t_{o4U}kb<%;BKG8$#}=b{|X)!oJpMy@3^ktCf7j^P}WnXjoTE_Z?trS29w
z$PA$0HtWUtick{fD?*(}uhTUSPG%Z}g*dGVmsYnLa3(@%;~T4AmA;Vj#6=7u6tMSj
z<H_sgw;7MidcnGe?}lry`+@bsQZ-aBX2@9z&eu!J)eNF7!O}rm8wlRVky^sVm??w%
zZTWhawT_d*Bjt`6^D&m6T|XhDbi+x8U&)I<3^jVf+v!#BiRY!tWF;D@S6u4R&X>QY
zv|2uUKg)>djjunlqw<NlEqcLc*UOpE`CfkL$9%a1F=YOJZgEJ2_Wn;XXU1CDQwY}q
z^h^&?fy`2Z)v0P|q%2OKioH45EC#;l*Ek>$VPb5YP@ElI^eek&T)<q+rJC$omG|3#
zY&(rp&fT4KpIH$-_j*h4li6ynn#hf4S3_}C<V?ugaQyEvf?NHHIiKfi#AYrSG&o=T
z==H)y(LTca%+!8LBhEX%xM&h9a-lmfw`Z4x^LynY4&B!te6#7#5n(CV+|jj<OS1!3
zxn}nB&L{ahxgmeTTv+}6-^9jhX<R3)O0m-ucAZ>dwh<Ta5j%`ivB@7yh*o~n68idd
z8jPS>I1&|~8+I@^icFhGv8YH{sS`ceUPyi9m3ekAZ*W@Ati|`yP&xel^fU=*AW>a4
zZd+$%E<K5DUgxm+lic!1qE&qwp)n-F(vw*4({WCWMf}s*vkwJN28TJ!tQ|eVFZ6sy
zR^GjHa7Pgs#H_J;*OiG1E?i`VwA&tdr89TZzsA<K65Ma%>fR$e`To`2gg9oV&u7IB
z#kt*zr*$^sOlv~URCa1ng@WEaP4^*orb@Z^)1CXE(e8Gsbz+utIg27K!o$f7J@3wY
zv7@|OQj)MC7FL>e`PN|K+=^ZIcmS!ofLH8wBz(!GNSAiWMlF@>x3BuHDEoOS8&z6<
zpPc=oig<z-G~FpTD|q_eHMnHno^E9n*F1T{=t0KNdd{c5Rspc?TMkbE`Q|$Des{tv
z(K(2(Z<>pP<oz#sSdR8l>$V+ES6>G{z?!vor#COgNcSD`y-ofGsk~b~sChbDiXtak
z(l;uY@`kK%IhUv~48$w>qUehm1rA^4`F_RsUs-8Yp&tj!JWP)&B_~~D){0ovg8BV@
z7M9oRPUqk&q@dpz$#hv&FcYhKM542fki29$&)6rmJ0~Cz?l)Q2cB>GaGDZt=+bis?
zXqNo~cTbhFQzAAtbD3}Ng3pPDmj+L>BpqG_hS|y_=(8HvpJnz&E=LZt`J`AK&|?`r
zox)c%&@*rB8F{&HH~K$^)NzW|gdTzo`(~a^TxZ<6o4=77#<$TLhr7L+<6&`wk)Svp
zD}vr1rqJ~~ue|>JvtoHRlP(&Y@75|OAl21J3K`wo5IEHq_tN$4Dxr6GKR3CF*BIZH
z`ut1YTvC9_eWpp|>Ym<dJ<YvS!MEs##BlAT@QIY=aVwR#Q~G5}SGoH3G~=Dg!HBYG
zh4?-u1D8a$7GA!~i3rVqQ1!G8cI`qtxvGBT7bgXd;{)AX1?z{Q4NtwMN3vv(i9I=U
zbKrogc$@<(v-ZPbfMc%}{y>~BPC)9;e2iU$tybvJ<->-vV?vcch8R{jw$sK{7C5ty
zf`oNblLmwJ>JQxZqE|Gr#EY&C5~uB*i`%3gY8Ck3y>}_P`#I73Lhw$I5Ff-Hgx=3Q
z3{dYn3;&2)UHv-U*2A(^k}?eU+o-!VKh*XzS>ZBvxxd&YWxItZ9@V*8erUm>vXwW{
z98VbYAF5<uWU+hhs#%=cnU#^jw!~r`<mKg~9bh9PJtKxG`FCT2O!!sG_`9z2KJ>7n
z524D!g-bbHbpCSq#jQ;qX47-ZZs1M9zsB&QOx(`Vy34f5icu@Y@{(_1x@Pt~k$_si
zvHH3%z#i06u(POF0od>&Oj;?UPl<83yztEpM$dH0(r7isjR5Qn?aDb>va)`P)d%p3
z`ax%V%{^B|J2l%YXZe)wH6%{Ar@^bFau(K?KaD9R9n*JCJviki+4;?AwxZ2rwe+d@
zcyQxdsXEV0<O!*Mj#<;ydX+8RyAr}5dor6aCF`J(wSk3e@(-aQ(s#5u<Gsgw3(7Zq
zKc6pEpGP^F^$KS`w(9eJbll)Ue&BJ+opk5TrA*h!=P?Hb%UoWRVsmLxj*mq##2M!k
z6~R0Erhpc4m#`dsow<G^cCg7i!8i4-GG~{6KQ8(4Yo0dsPn)k5;f^L2=(;%iK#8kl
zE$qD}TbcH0)W4~E!}*1MhOC|wffB`Ix-X3vS4><!%|%$aO%2p`+p`8V4lP`<k;zC>
z+UkxzW!Q8l<txlIJ(}b4CJ~mgQk*=bIN^G2uq^?<bW=EA>i3R$euYdX9dw%Fdp*GY
zog?xFXZ#%Ww<{`H5~T&!%?l3tnu{@+T64SD>Qmv2=*NqL{156qSS@P5RC;%1JxuaT
zsPZ4KYB>a;##o$Eil@f?iR-EDs4LZ1oKm~uUrm?=@D4|HbUQnFtoA?hXlJ}PP?QWR
zTeQ`azZ6#abhJC2>l0qYbMtmOvwCaPvE$39-rp`wN=HxBhpv`O?}1||BTG*852Fdi
zf=bq!Y)hxw^KZ}{@?OYaIJ4|?Z86-WfT&Z+h7^$wIQ)6H8xhTE`Qp%t27{yI5x&}n
zjGJe_fr|$Pt|~uDnhZ1N{|vMz!Q7S573!lkX`w*`M_tsqp5B&;jQ4iu-%6ZvY&d?S
z(Yb!KKCBjcBfE4hloZ^UW{2<l@bt>r=yHy0PzyN)UnCjQ^&}bh?xwb$$BT+V%+b{b
zq?WOa<=b6)<wfAvA#yTDou*FQ==O<cIz}>e-`d$?21O2jFEohz$tKYMmU<v|acR0M
zyLZ1x;?`{WP$DzJ4TmdGR#7=avN?SJ)Q9rUb1TDi*^P$6z8N%cX<%*IjcuT~Z>zXr
zv!G#9d=mkj!$T|>;o(^`Q6(9fne#dcS*H7Knqnn^b1|?Q$<HhhABdd;MNICKdbR!g
NZElK1ml$8T`hP=tBcK2P

literal 0
HcmV?d00001


From c681a8a51b6b5a658bd96dbc6a7a36b2a0413708 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 09:41:35 +0800
Subject: [PATCH 034/119] Update Gemfile try

---
 Gemfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f20f90b..94f7f82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,8 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-
+gem install git
+require 'git'
+Git.clone('http://gitlab.tp.rulingcom.com/chiu/personal-journal.git', '123')
 # To use debugger
 # gem 'debugger'

From 987816240c78621b8a8e70ce49b5bfc2f5294acc Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 09:47:14 +0800
Subject: [PATCH 035/119] Update Gemfile

---
 Gemfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 94f7f82..f20f90b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,6 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-gem install git
-require 'git'
-Git.clone('http://gitlab.tp.rulingcom.com/chiu/personal-journal.git', '123')
+
 # To use debugger
 # gem 'debugger'

From fa15cefadf1a859db5c62d46b4f68faf0282af2a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 09:47:43 +0800
Subject: [PATCH 036/119] Update .gitignore

---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 367362b..954abfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@ test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
-test/dummy/.sass-cache
-modules
+test/dummy/.sass-cache
\ No newline at end of file

From 3763eb25e7b67a4b91533b55044795af3c486f8d Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:09:18 +0800
Subject: [PATCH 037/119] Update Rakefile try

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 7ae136a..faf9c05 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-
+render text: 'Hello'
 
 Bundler::GemHelper.install_tasks
 

From 74f9e7a9256604976802c6db87a686e4deb30124 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:11:29 +0800
Subject: [PATCH 038/119] Update Rakefile

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index faf9c05..f1d470e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-render text: 'Hello'
+render js: "123"
 
 Bundler::GemHelper.install_tasks
 

From a760bc6aceb4b1eb9795601d7df776744aeae6df Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:12:15 +0800
Subject: [PATCH 039/119] Update Rakefile

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index f1d470e..242ff98 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-render js: "123"
+render js: "console.log(123)"
 
 Bundler::GemHelper.install_tasks
 

From 909d88d5e622542190950f34c01aef32ee54d2aa Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:19:00 +0800
Subject: [PATCH 040/119] Update Rakefile

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 242ff98..cea8d4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-render js: "console.log(123)"
+puts '123'
 
 Bundler::GemHelper.install_tasks
 

From 1008ab2d8a319cc41ff0e334a70abd78500bc1b5 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:36:15 +0800
Subject: [PATCH 041/119] Update Rakefile

---
 Rakefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index cea8d4a..8b38d02 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-puts '123'
 
 Bundler::GemHelper.install_tasks
 

From 71f37eeba33af8cc670426c4b4727460abb98eae Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 10:39:43 +0800
Subject: [PATCH 042/119] Update personal_journals_controller.rb coding style
 fix

---
 .../personal_journals_controller.rb           | 322 ++++++++++--------
 1 file changed, 185 insertions(+), 137 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 5bcff11..682acb4 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -2,54 +2,76 @@ class PersonalJournalsController < ApplicationController
   def index
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
-    journal_papers = JournalPaper.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
-    page = Page.where(:page_id => params[:page_id]).first rescue nil
-    if page.custom_string_field == "table"
-      fields_to_show = page.custom_array_field rescue []
-      fields_to_show = [
-        "paper_title",
-        "journal_title",
-        "authors",
-        "year",
-        "issue_no",
-        "vol_no",
-        "level_type"
-      ] if fields_to_show.blank?
+    journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
+    page = begin
+             Page.where(page_id: params[:page_id]).first
+           rescue StandardError
+             nil
+           end
+    if page.custom_string_field == 'table'
+      fields_to_show = begin
+                         page.custom_array_field
+                       rescue StandardError
+                         []
+                       end
+      if fields_to_show.blank?
+        fields_to_show = %w[
+          paper_title
+          journal_title
+          authors
+          year
+          issue_no
+          vol_no
+          level_type
+        ]
+      end
     else
-      fields_to_show = [
-        "year",
-        "paper_title"
+      fields_to_show = %w[
+        year
+        paper_title
       ]
     end
-    if params[:selectbox] !=nil
-      journal_papers_temp = JournalPaper.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+    if !params[:selectbox].nil?
+      journal_papers_temp = JournalPaper.where(is_hidden: false).sort_by { |tp| [-tp[:year].to_i, -tp[:publication_date].to_i] }
       case params[:selectbox]
-      when "paper_title","default"
-        if  page.custom_string_field == "table"
-         journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.paper_title, params[:keywords])}
+      when 'paper_title', 'default'
+        if  page.custom_string_field == 'table'
+          journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.paper_title, params[:keywords]) }
         else
-         journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.create_link, params[:keywords])}
+          journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.create_link, params[:keywords]) }
         end
-      when "level_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_levels.collect{|x| x.title}.join(', ').to_s, params[:keywords])}
-      when "publication_date"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])}
-      when "author_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])}
-      when "paper_type"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.journal_paper_type.title rescue ""), params[:keywords])}
-      when "language"
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
+      when 'level_type'
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_levels.collect(&:title).join(', ').to_s, params[:keywords]) }
+      when 'publication_date'
+        journal_papers_show = journal_papers_temp.select do |value|
+          search_all_words((begin
+                                                                  value.send('publication_date').strftime('%Y/%m/%d')
+                                                                rescue StandardError
+                                                                  ''
+                                                                end), params[:keywords])
+        end
+      when 'author_type'
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_paper_author_types.collect(&:title).join(', '), params[:keywords]) }
+      when 'paper_type'
+        journal_papers_show = journal_papers_temp.select do |value|
+          search_all_words((begin
+                                                                  value.journal_paper_type.title
+                                                                rescue StandardError
+                                                                  ''
+                                                                end), params[:keywords])
+        end
+      when 'language'
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
       else
-          journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])}
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) }
       end
-      if params[:page_no].nil?
-          page_to_show = 1
-      else
-          page_to_show = params[:page_no].to_i
-      end
-      journal_papers = journal_papers_show[(page_to_show-1)*page_data_count...page_to_show*page_data_count]
-      journal_papers_total_pages = (journal_papers_show.length/page_data_count.to_f).ceil
+      page_to_show = if params[:page_no].nil?
+                       1
+                     else
+                       params[:page_no].to_i
+                     end
+      journal_papers = journal_papers_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
+      journal_papers_total_pages = (journal_papers_show.length / page_data_count.to_f).ceil
     else
       journal_papers_total_pages = journal_papers.total_pages
     end
@@ -58,135 +80,161 @@ class PersonalJournalsController < ApplicationController
       t = []
       fields_to_show.each do |fs|
         case fs
-        when "paper_title"
-          if  page.custom_string_field == "table"
-           t << {"value" => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.paper_title}</a>"}
+        when 'paper_title'
+          if  page.custom_string_field == 'table'
+            t << { 'value' => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.paper_title}</a>" }
           else
-           t << {"value" => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.create_link}</a>"}
+            t << { 'value' => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.create_link}</a>" }
           end
-        when "level_type"
-          t << {"value" => ( !journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect{|x| x.title}.join(', ')})" : nil)} 
-        when "publication_date"
-          t << {"value" => (journal_paper.send(fs).strftime("%Y/%m") rescue "")}
-        when "author_type"
-          t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")}
-        when "paper_type"
-          t << {"value" => (journal_paper.journal_paper_type.title rescue "")} 
-        when "language"
-          t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")}
+        when 'level_type'
+          t << { 'value' => (!journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect(&:title).join(', ')})" : nil) }
+        when 'publication_date'
+          t << { 'value' => (begin
+                              journal_paper.send(fs).strftime('%Y/%m')
+                            rescue StandardError
+                              ''
+                            end) }
+        when 'author_type'
+          t << { 'value' => (begin
+                               journal_paper.journal_paper_author_types.collect(&:title).join(', ')
+                             rescue StandardError
+                               ''
+                             end) }
+        when 'paper_type'
+          t << { 'value' => (begin
+                              journal_paper.journal_paper_type.title
+                            rescue StandardError
+                              ''
+                            end) }
+        when 'language'
+          t << { 'value' => (!journal_paper.language.nil? ? t(journal_paper.language.to_s) : '') }
         else
-          t << {"value" => (journal_paper.send(fs) rescue "")}
+          t << { 'value' => (begin
+                              journal_paper.send(fs)
+                            rescue StandardError
+                              ''
+                            end) }
         end
       end
-      journal_paper_list << {"jps" => t}
+      journal_paper_list << { 'jps' => t }
     end
     headers = []
     choice_show = []
     fields_to_show.each do |fs|
       col = 2
-      col = 3 if fs == "paper_title"
+      col = 3 if fs == 'paper_title'
       headers << {
-        "head-title" => t("personal_journal.#{fs}"),
-        "col" => col
+        'head-title' => t("personal_journal.#{fs}"),
+        'col' => col
       }
       choice_show << t("personal_journal.#{fs}")
     end
     choice_value = fields_to_show
-    choice_value.unshift("default")
-    choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""}
-    choice_select=choice_select.map{|value| {"choice_select" => value}}
-    choice_value=choice_value.map{|value| {"choice_value" => value}}
-    choice_default = t("personal_journal.select_class")
+    choice_value.unshift('default')
+    choice_select = choice_value.map { |iter| iter == params[:selectbox] ? 'selected' : '' }
+    choice_select = choice_select.map { |value| { 'choice_select' => value } }
+    choice_value = choice_value.map { |value| { 'choice_value' => value } }
+    choice_default = t('personal_journal.select_class')
     choice_show.unshift(choice_default)
-    choice_show=choice_show.map{|value| {"choice_show" => value}}
-    choice=choice_value.zip(choice_show,choice_select)
-    choice=choice.map{|value| value.inject:merge}
-    select_text = t("personal_journal.search_class")
-    search_text = t("personal_journal.word_to_search")
+    choice_show = choice_show.map { |value| { 'choice_show' => value } }
+    choice = choice_value.zip(choice_show, choice_select)
+    choice = choice.map { |value| value.inject :merge }
+    select_text = t('personal_journal.search_class')
+    search_text = t('personal_journal.word_to_search')
     {
-      "journal_papers" => journal_paper_list,
-      "headers" => headers,
-      "extras" => {"widget-title" => t("module_name.journal_paper"), 
-                    "url" => "/"+params[:locale]+params[:url], 
-                    "select_text" => select_text, 
-                    "search_text" => search_text,
-                    "search_value" => params[:keywords]},
-      "total_pages" => journal_papers_total_pages,
-      "choice" => choice
+      'journal_papers' => journal_paper_list,
+      'headers' => headers,
+      'extras' => { 'widget-title' => t('module_name.journal_paper'),
+                    'url' => '/' + params[:locale] + params[:url],
+                    'select_text' => select_text,
+                    'search_text' => search_text,
+                    'search_value' => params[:keywords] },
+      'total_pages' => journal_papers_total_pages,
+      'choice' => choice
     }
   end
 
   def show
     params = OrbitHelper.params
-    plugin = JournalPaper.where(:is_hidden=>false).find_by(uid: params[:uid])
-    fields_to_show = [
-      "year",
-      "authors",
-      "author_type",
-      "paper_title",
-      "journal_title",
-      "vol_no",
-      "issue_no",
-      "form_to_start",
-      "form_to_end",
-      "level_type",
-      "paper_type",
-      "total_pages",
-      "publication_date",
-      "isbn",
-      "abstract",
-      "language",
-      "url",
-      "associated_project",
-      "file"
+    plugin = JournalPaper.where(is_hidden: false).find_by(uid: params[:uid])
+    fields_to_show = %w[
+      year
+      authors
+      author_type
+      paper_title
+      journal_title
+      vol_no
+      issue_no
+      form_to_start
+      form_to_end
+      level_type
+      paper_type
+      total_pages
+      publication_date
+      isbn
+      abstract
+      language
+      url
+      associated_project
+      file
     ]
-
-    {"plugin_datas"=>plugin.get_plugin_data(fields_to_show)}
+    { 'plugin_datas' => plugin.get_plugin_data(fields_to_show) }
   end
+
   def get_fields_for_index
-    @page = Page.find(params[:page_id]) rescue nil
-    @fields_to_show = [
-      "year",
-      "authors",
-      "author_type",
-      "paper_title",
-      "journal_title",
-      "vol_no",
-      "issue_no",
-      "form_to_start",
-      "form_to_end",
-      "level_type",
-      "paper_type",
-      "total_pages",
-      "publication_date",
-      "isbn",
-      "abstract",
-      "language",
-      "url"
+    @page = begin
+              Page.find(params[:page_id])
+            rescue StandardError
+              nil
+            end
+    @fields_to_show = %w[
+      year
+      authors
+      author_type
+      paper_title
+      journal_title
+      vol_no
+      issue_no
+      form_to_start
+      form_to_end
+      level_type
+      paper_type
+      total_pages
+      publication_date
+      isbn
+      abstract
+      language
+      url
     ]
-    @fields_to_show = @fields_to_show.map{|fs| [t("personal_journal.#{fs}"), fs]}
-    @default_fields_to_show = [
-      "paper_title",
-      "journal_title",
-      "authors",
-      "year",
-      "issue_no",
-      "vol_no",
-      "level_type"
+    @fields_to_show = @fields_to_show.map { |fs| [t("personal_journal.#{fs}"), fs] }
+    @default_fields_to_show = %w[
+      paper_title
+      journal_title
+      authors
+      year
+      issue_no
+      vol_no
+      level_type
     ]
-    render :layout => false
+    render layout: false
   end
 
   def save_index_fields
-    page = Page.find(params[:page_id]) rescue nil
+    page = begin
+             Page.find(params[:page_id])
+           rescue StandardError
+             nil
+           end
     page.custom_array_field = params[:keys]
     page.save
-    render :json => {"success" => true}.to_json
+    render json: { 'success' => true }.to_json
   end
-private
-  def search_all_words(target,word)
-    target=target.upcase
-    words=word.upcase.split(' ')
-    return words.select{|value| target.include? value}==words
+
+  private
+
+  def search_all_words(target, word)
+    target = target.upcase
+    words = word.upcase.split(' ')
+    words.select { |value| target.include? value } == words
   end
 end

From a3bcb1e06ac0d73999a5b74d70a234004e9f48b2 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Tue, 20 Aug 2019 12:05:04 +0800
Subject: [PATCH 043/119] Update personal_journals_controller.rb fix coding
 style

---
 .../personal_journals_controller.rb           | 70 +++----------------
 1 file changed, 11 insertions(+), 59 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 682acb4..8b3c826 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -3,17 +3,9 @@ class PersonalJournalsController < ApplicationController
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
     journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
-    page = begin
-             Page.where(page_id: params[:page_id]).first
-           rescue StandardError
-             nil
-           end
+    page = Page.where(page_id: params[:page_id]).first rescue nil
     if page.custom_string_field == 'table'
-      fields_to_show = begin
-                         page.custom_array_field
-                       rescue StandardError
-                         []
-                       end
+      fields_to_show = page.custom_array_field rescue []
       if fields_to_show.blank?
         fields_to_show = %w[
           paper_title
@@ -43,33 +35,17 @@ class PersonalJournalsController < ApplicationController
       when 'level_type'
         journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_levels.collect(&:title).join(', ').to_s, params[:keywords]) }
       when 'publication_date'
-        journal_papers_show = journal_papers_temp.select do |value|
-          search_all_words((begin
-                                                                  value.send('publication_date').strftime('%Y/%m/%d')
-                                                                rescue StandardError
-                                                                  ''
-                                                                end), params[:keywords])
-        end
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words((value.send('publication_date').strftime('%Y/%m/%d') rescue ''), params[:keywords]) }
       when 'author_type'
         journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_paper_author_types.collect(&:title).join(', '), params[:keywords]) }
       when 'paper_type'
-        journal_papers_show = journal_papers_temp.select do |value|
-          search_all_words((begin
-                                                                  value.journal_paper_type.title
-                                                                rescue StandardError
-                                                                  ''
-                                                                end), params[:keywords])
-        end
+        journal_papers_show = journal_papers_temp.select { |value| search_all_words((value.journal_paper_type.title rescue ''), params[:keywords]) }
       when 'language'
         journal_papers_show = journal_papers_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
       else
         journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) }
       end
-      page_to_show = if params[:page_no].nil?
-                       1
-                     else
-                       params[:page_no].to_i
-                     end
+      page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i
       journal_papers = journal_papers_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
       journal_papers_total_pages = (journal_papers_show.length / page_data_count.to_f).ceil
     else
@@ -89,31 +65,15 @@ class PersonalJournalsController < ApplicationController
         when 'level_type'
           t << { 'value' => (!journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect(&:title).join(', ')})" : nil) }
         when 'publication_date'
-          t << { 'value' => (begin
-                              journal_paper.send(fs).strftime('%Y/%m')
-                            rescue StandardError
-                              ''
-                            end) }
+          t << { 'value' => (journal_paper.send(fs).strftime('%Y/%m') rescue '') }
         when 'author_type'
-          t << { 'value' => (begin
-                               journal_paper.journal_paper_author_types.collect(&:title).join(', ')
-                             rescue StandardError
-                               ''
-                             end) }
+          t << { 'value' => (journal_paper.journal_paper_author_types.collect(&:title).join(', ') rescue '') }
         when 'paper_type'
-          t << { 'value' => (begin
-                              journal_paper.journal_paper_type.title
-                            rescue StandardError
-                              ''
-                            end) }
+          t << { 'value' => (journal_paper.journal_paper_type.title rescue '') }
         when 'language'
           t << { 'value' => (!journal_paper.language.nil? ? t(journal_paper.language.to_s) : '') }
         else
-          t << { 'value' => (begin
-                              journal_paper.send(fs)
-                            rescue StandardError
-                              ''
-                            end) }
+          t << { 'value' => (journal_paper.send(fs) rescue '') }
         end
       end
       journal_paper_list << { 'jps' => t }
@@ -182,11 +142,7 @@ class PersonalJournalsController < ApplicationController
   end
 
   def get_fields_for_index
-    @page = begin
-              Page.find(params[:page_id])
-            rescue StandardError
-              nil
-            end
+    @page = Page.find(params[:page_id]) rescue nil
     @fields_to_show = %w[
       year
       authors
@@ -220,11 +176,7 @@ class PersonalJournalsController < ApplicationController
   end
 
   def save_index_fields
-    page = begin
-             Page.find(params[:page_id])
-           rescue StandardError
-             nil
-           end
+    page = Page.find(params[:page_id]) rescue nil
     page.custom_array_field = params[:keys]
     page.save
     render json: { 'success' => true }.to_json

From 53019cfa1060884ba7905811675456066c8be43b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 09:52:48 +0800
Subject: [PATCH 044/119] Update Gemfile try

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f20f90b..9216cbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,6 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-
+puts 'test123'
 # To use debugger
 # gem 'debugger'

From ddc2e87f5bf4132b8c44c5d8292fab035afba89b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:12:10 +0800
Subject: [PATCH 045/119] Update Gemfile

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 9216cbc..41f6ecc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,6 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-puts 'test123'
+'test123'
 # To use debugger
 # gem 'debugger'

From c7b6b6c164f9bbd597e8fbf2bfaea07b6ab8cd00 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:14:18 +0800
Subject: [PATCH 046/119] Update Gemfile

---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 41f6ecc..402bb5d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,5 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-'test123'
 # To use debugger
 # gem 'debugger'

From a96ebac9922c57a3fb5a5837e6f6d6ef64c78518 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:14:51 +0800
Subject: [PATCH 047/119] Update Rakefile try

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 8b38d02..484ba54 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 require 'rdoc/task'
-
+puts 'test123'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'PersonalJournal'

From 2d20d31470809a42236115c18fdcc17e0f3f5de8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:18:21 +0800
Subject: [PATCH 048/119] Update Rakefile

---
 Rakefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 484ba54..a52bbe3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,7 +5,6 @@ rescue LoadError
 end
 
 require 'rdoc/task'
-puts 'test123'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'PersonalJournal'

From 1aef3123f32b75adcacd87450a223d38727515d4 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:18:50 +0800
Subject: [PATCH 049/119] Update personal_journal.gemspec try

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index f2718ff..2a43a3e 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-
+puts '123'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 878931aa189aee64527050a3180b2413d718fa53 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:23:34 +0800
Subject: [PATCH 050/119] Update personal_journal.gemspec try

---
 personal_journal.gemspec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 2a43a3e..e66b86e 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-puts '123'
+Dir["#{Rails.root}/test/*.rb"].each do |file|
+  puts file
+end
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From c1bd5dc51069a6e597d99109f7f210ae6507bdf9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:27:09 +0800
Subject: [PATCH 051/119] Update personal_journal.gemspec try

---
 personal_journal.gemspec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index e66b86e..acd3fd4 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,9 +2,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-Dir["#{Rails.root}/test/*.rb"].each do |file|
-  puts file
-end
+d = Dir.glob("#{Rails.root}/app/templates/*").collect{|temp| temp.split('/').last}-['mobile']
+puts d
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 13d4af26712228e3c8ee9a2e6f396e6d1f9a7084 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:28:31 +0800
Subject: [PATCH 052/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index acd3fd4..be865ea 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,6 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+require File.expand_path('../application', __FILE__)
 d = Dir.glob("#{Rails.root}/app/templates/*").collect{|temp| temp.split('/').last}-['mobile']
 puts d
 # Describe your gem and declare its dependencies:

From 1f6f65f6514e681e1d048f54a55cdb53b2815a5d Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:30:07 +0800
Subject: [PATCH 053/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index be865ea..5a67155 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,8 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require File.expand_path('../application', __FILE__)
-d = Dir.glob("#{Rails.root}/app/templates/*").collect{|temp| temp.split('/').last}-['mobile']
+d = Dir.entries('/app/templates/').select {|entry| File.directory? File.join('/your_dir',entry) and !(entry =='.' || entry == '..') }
 puts d
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 6593d5be85dca268a983ff21bb390bad18ae1b33 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:31:03 +0800
Subject: [PATCH 054/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 5a67155..5f3b311 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-d = Dir.entries('/app/templates/').select {|entry| File.directory? File.join('/your_dir',entry) and !(entry =='.' || entry == '..') }
+d = Dir.entries('/app/templates/').select {|entry| File.directory? File.join('/app/templates/',entry) and !(entry =='.' || entry == '..') }
 puts d
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 74f043c746f951a71489d882c984edcfd87f75a9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:32:09 +0800
Subject: [PATCH 055/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 5f3b311..98feb0a 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-d = Dir.entries('/app/templates/').select {|entry| File.directory? File.join('/app/templates/',entry) and !(entry =='.' || entry == '..') }
+d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
 puts d
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 48db31e20f4146346487905d016f8318868a75bd Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:33:29 +0800
Subject: [PATCH 056/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 98feb0a..966d26a 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,6 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+puts Rails.root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
 puts d
 # Describe your gem and declare its dependencies:

From c147c531d76754cf30e05bc93e1f7c44bd874c42 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:36:42 +0800
Subject: [PATCH 057/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 966d26a..48d3e7e 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 puts Rails.root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
-puts d
+puts RAILS_ROOT
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From aa9c68692b0fbbca88801c5ef070a8600421356f Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:37:23 +0800
Subject: [PATCH 058/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 48d3e7e..26a1d68 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,6 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-puts Rails.root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
 puts RAILS_ROOT
 # Describe your gem and declare its dependencies:

From f90384d0d950d201ef2caccfcb973cd41ce3e733 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:39:39 +0800
Subject: [PATCH 059/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 26a1d68..481fce1 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,8 +2,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+require 'Rails'
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
-puts RAILS_ROOT
+puts Rails.root
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From b5fe97346a46494524542fc80ce4183c2f0182c3 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 10:48:09 +0800
Subject: [PATCH 060/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 481fce1..e379ac5 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,9 +2,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require 'Rails'
+app_path = File.expand_path(File.dirname(__FILE__) + '/..')
+puts app_path
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
-puts Rails.root
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From c815143805c6ada5653c003c96459103d694c543 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:07:07 +0800
Subject: [PATCH 061/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index e379ac5..c881ac0 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,8 +2,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+rails_root  = `pwd`.gsub("\n", "")
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
-puts app_path
+puts rails_root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 22d4e32ca4d7f6ffecd171f7396eeeecb044740a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:09:29 +0800
Subject: [PATCH 062/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index c881ac0..0658db3 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-rails_root  = `pwd`.gsub("\n", "")
+rails_root  = ENV['RAILS_ENV'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
 puts rails_root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }

From 481122ecf9d0b02a4d527ba51d49d8565188c424 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:10:49 +0800
Subject: [PATCH 063/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 0658db3..53c95b6 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-rails_root  = ENV['RAILS_ENV'] || 'production'
+rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
 puts rails_root
 d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }

From b271738afb04399dd26041a0a557db1bdf7b509b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:15:52 +0800
Subject: [PATCH 064/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 53c95b6..2be84e0 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,7 +5,7 @@ require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
 puts rails_root
-d = Dir.entries('/').select {|entry| File.directory? File.join('/',entry) and !(entry =='.' || entry == '..') }
+d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 5a79c9f3b97ed152b59303ae18183cf7aa127013 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:16:13 +0800
Subject: [PATCH 065/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 2be84e0..0b40884 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,8 +4,8 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
-puts rails_root
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
+puts d
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 5eaf0d4b5a51e2e2fd362acdbf1da7c374324da3 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:19:33 +0800
Subject: [PATCH 066/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 0b40884..c3f1c43 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -6,6 +6,7 @@ rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 puts d
+exec 'ls'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 9cf3e7b2eeb1ab8186d6de56e16abf6076b35e63 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:22:04 +0800
Subject: [PATCH 067/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index c3f1c43..003501c 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -6,7 +6,7 @@ rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(File.dirname(__FILE__) + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 puts d
-exec 'ls'
+system 'ls'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 318692cccc9deb092c9373088dae6ea086a45cdd Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:26:30 +0800
Subject: [PATCH 068/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 003501c..67c2aa4 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
-app_path = File.expand_path(File.dirname(__FILE__) + '/..')
+app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
-puts d
-system 'ls'
+puts app_path
+#system 'ls'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From 3df11e7bf80332c727da4c9ab673808ceb02ca41 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:35:05 +0800
Subject: [PATCH 069/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 67c2aa4..2e14542 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,7 +5,7 @@ require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
-puts app_path
+puts Rails.root.parent.to_s
 #system 'ls'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 39d32a5ee4a2f7b48004caa08bb9a060fd9f8601 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:37:37 +0800
Subject: [PATCH 070/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 2e14542..e455c9f 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,7 +5,7 @@ require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
-puts Rails.root.parent.to_s
+puts RAILS_ROOT
 #system 'ls'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

From 1b5383f4944c7df51ea48b41d26e07fc7c5c93d7 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:43:24 +0800
Subject: [PATCH 071/119] Add new file try

---
 get_rail_path.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 get_rail_path.rb

diff --git a/get_rail_path.rb b/get_rail_path.rb
new file mode 100644
index 0000000..916cfe1
--- /dev/null
+++ b/get_rail_path.rb
@@ -0,0 +1 @@
+puts Rails.root
\ No newline at end of file

From 832226a24a36e25a957bb1353cd45c6b5c40cf00 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:45:40 +0800
Subject: [PATCH 072/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index e455c9f..8c00418 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,8 +5,8 @@ require "personal_journal/version"
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
-puts RAILS_ROOT
-#system 'ls'
+#puts RAILS_ROOT
+system 'rails r get_rail_path.rb'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From c755c20180ea6bc903ebcfeeda04c68d510026a0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:47:07 +0800
Subject: [PATCH 073/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 8c00418..4587149 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -6,7 +6,7 @@ rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
-system 'rails r get_rail_path.rb'
+system 'ruby get_rail_path.rb'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From f508c08a66acb32b53c2652b0b4e2db3327e2797 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:51:01 +0800
Subject: [PATCH 074/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 4587149..8c66afc 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,6 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+require 'rails/engine'
 rails_root  = ENV['RAILS_ROOT'] || 'production'
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }

From d6aa0012206af040ddc75997e3c186fa2b84572a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:52:32 +0800
Subject: [PATCH 075/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 8c66afc..2a8eec2 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails/engine'
-rails_root  = ENV['RAILS_ROOT'] || 'production'
+puts Rails.root
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 21d0238e92b1bd875217366b67083c054a2797c9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:53:38 +0800
Subject: [PATCH 076/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 2a8eec2..20dd261 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require 'rails/engine'
+require 'rails'
 puts Rails.root
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }

From 01232ca5ff669704db125f04daba8fa1fc518849 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:54:52 +0800
Subject: [PATCH 077/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 20dd261..6c33d95 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts Rails.root
+puts Rails.root.to_s
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
-system 'ruby get_rail_path.rb'
+#system 'ruby get_rail_path.rb'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"

From cdcaabd14f4d890f39b65ecc6f5eab2d75a8ab7a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 11:56:05 +0800
Subject: [PATCH 078/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 6c33d95..cd63cdf 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts Rails.root.to_s
+puts (Rails.root.to_s || 'none')
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 7476abd5b46537760e66c0217063f775b34073f1 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:00:20 +0800
Subject: [PATCH 079/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index cd63cdf..97f9f1f 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts (Rails.root.to_s || 'none')
+puts (Rails.root || 'none')
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From ca29d6a58131bd85e819b08ee069c128d20bab0b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:17:14 +0800
Subject: [PATCH 080/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 97f9f1f..dcaa10c 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,6 +5,7 @@ require "personal_journal/version"
 require 'rails'
 puts (Rails.root || 'none')
 app_path = File.expand_path(__dir__ + '/..')
+StoreApiController.download_template.constants(false)
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 15d6d9a4b92c36af9853b6a3af722e839235de78 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:18:18 +0800
Subject: [PATCH 081/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index dcaa10c..83ff32f 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,6 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
+require StoreApiController
 require 'rails'
 puts (Rails.root || 'none')
 app_path = File.expand_path(__dir__ + '/..')

From 4b2884e2f2aa98b0e7cdd332e36cbf846ab0becf Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:18:55 +0800
Subject: [PATCH 082/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 83ff32f..114e525 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require StoreApiController
+require 'StoreApiController'
 require 'rails'
 puts (Rails.root || 'none')
 app_path = File.expand_path(__dir__ + '/..')

From 34cceb83ef5d114d11aa399f133793907bf9eef9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:19:59 +0800
Subject: [PATCH 083/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 114e525..f6b9718 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,9 +4,8 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'StoreApiController'
 require 'rails'
-puts (Rails.root || 'none')
+puts [Rails.root.inspect , 'none']
 app_path = File.expand_path(__dir__ + '/..')
-StoreApiController.download_template.constants(false)
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 94dece3e4f66aef8e8cb746fa14ceafb3a3b5eb2 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:20:30 +0800
Subject: [PATCH 084/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index f6b9718..30ca709 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,7 +2,6 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require 'StoreApiController'
 require 'rails'
 puts [Rails.root.inspect , 'none']
 app_path = File.expand_path(__dir__ + '/..')

From 49479d4587c35097942190d4d07f71a4a6e8cfc8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:24:38 +0800
Subject: [PATCH 085/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 8b3c826..2ea8766 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -1,5 +1,6 @@
 class PersonalJournalsController < ApplicationController
   def index
+    ENV['all_root'] = Rails.root
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
     journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)

From d24928dd255e4720d86f750aa87b5ff3a79476ba Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:24:52 +0800
Subject: [PATCH 086/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 2ea8766..60de3b2 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -1,6 +1,7 @@
 class PersonalJournalsController < ApplicationController
   def index
     ENV['all_root'] = Rails.root
+    puts ENV['all_root']
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
     journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)

From 7aa7239c0aeefde87cdde2b1110b768070f7d6db Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 12:27:12 +0800
Subject: [PATCH 087/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 60de3b2..0961b5f 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -1,7 +1,7 @@
 class PersonalJournalsController < ApplicationController
   def index
     ENV['all_root'] = Rails.root
-    puts ENV['all_root']
+    puts Rails.root
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
     journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)

From 55fadfc788e7c3635778b58ee6a53d5976ecae2d Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:06:31 +0800
Subject: [PATCH 088/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 30ca709..ac81c2d 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts [Rails.root.inspect , 'none']
+puts [env['all_path'] , 'none']
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 95046381a58d4e8aa98f12ffffb5110923501337 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:07:34 +0800
Subject: [PATCH 089/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index ac81c2d..8bc080b 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts [env['all_path'] , 'none']
+puts [Env['all_path'] , 'none']
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 99b6a4cb22443a4b3176592976c33a9591c71a88 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:08:52 +0800
Subject: [PATCH 090/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 8bc080b..92e8c84 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts [Env['all_path'] , 'none']
+puts [ENV['all_path'] , 'none']
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From f280b5e6b63f7325944e9d0db7739a358692ef63 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:12:14 +0800
Subject: [PATCH 091/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 92e8c84..fad91a4 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts [ENV['all_path'] , 'none']
+puts [ENV['all_root'] , 'none']
 app_path = File.expand_path(__dir__ + '/..')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 4c8d54f86c29584c09fb68f1af13ef9d315b9f6c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:19:11 +0800
Subject: [PATCH 092/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index fad91a4..b393bba 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,8 +3,9 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-puts [ENV['all_root'] , 'none']
 app_path = File.expand_path(__dir__ + '/..')
+puts [ENV , 'none',app_path,RAILS_ROOT]
+
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 5cd0622d880bdd8e20c26ad9e15ef8d2b28adc0c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:20:02 +0800
Subject: [PATCH 093/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index b393bba..a1583bf 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
-puts [ENV , 'none',app_path,RAILS_ROOT]
+puts [ENV , 'none',app_path,Rails.root]
 
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From c1afc28c61afd6e37840edc6cf71a2381a33d37b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:21:43 +0800
Subject: [PATCH 094/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index a1583bf..8ca38a7 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
-puts [ENV , 'none',app_path,Rails.root]
+puts [ENV.to_h , 'none',app_path,Rails.root]
 
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From 38030d09ab0305d44bdd7675aea7ee94630f0e14 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:25:27 +0800
Subject: [PATCH 095/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 8ca38a7..fd36ec7 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
-puts [ENV.to_h , 'none',app_path,Rails.root]
+puts ENV['PWD']
 
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT

From d5a6fb612a30c020222acf5a18e86576b8e33ed6 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:49:08 +0800
Subject: [PATCH 096/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index fd36ec7..7f7f7ee 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,8 +4,8 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
-puts ENV['PWD']
-
+template_path = ENV['PWD'] + '/app\templates'
+puts Dir.glob('*/')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 1ed81c2fb78cb88df2c5fca63a9964cdedddd7b9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 13:51:18 +0800
Subject: [PATCH 097/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 7f7f7ee..70abf34 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -4,8 +4,8 @@ $:.push File.expand_path("../lib", __FILE__)
 require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
-template_path = ENV['PWD'] + '/app\templates'
-puts Dir.glob('*/')
+template_path = ENV['PWD'] + '/app/templates'
+puts Dir.glob(template_path+'/*/')
 d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 862012a8c4aca189f7877d0e7c16dac2461d8e9d Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:01:12 +0800
Subject: [PATCH 098/119] Update personal_journal.gemspec add copy feature

---
 personal_journal.gemspec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 70abf34..9017a9b 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -5,8 +5,11 @@ require "personal_journal/version"
 require 'rails'
 app_path = File.expand_path(__dir__ + '/..')
 template_path = ENV['PWD'] + '/app/templates'
-puts Dir.glob(template_path+'/*/')
-d = Dir.entries(app_path).select {|entry| File.directory? File.join(app_path,entry) and !(entry =='.' || entry == '..') }
+all_template = Dir.glob(template_path+'/*/')
+all_template.each do |folder|
+    begin system ('cp -f '+ app_path + 'personal-journal/modules' + folder + '/modules')
+    rescue puts 'error copy'
+end
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'
 # Describe your gem and declare its dependencies:

From 0213304a02beac498fd17f820b589c396c2c03af Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:06:28 +0800
Subject: [PATCH 099/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 9017a9b..76821bd 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -7,7 +7,7 @@ app_path = File.expand_path(__dir__ + '/..')
 template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
-    begin system ('cp -f '+ app_path + 'personal-journal/modules' + folder + '/modules')
+    begin system ('cp -f '+ app_path + '/personal-journal/modules' + folder + '/modules')
     rescue puts 'error copy'
 end
 #puts RAILS_ROOT

From 9be58cc7f3ea1032c25e09ced371054706be3f47 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:19:11 +0800
Subject: [PATCH 100/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 76821bd..dd1f5cd 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -7,8 +7,11 @@ app_path = File.expand_path(__dir__ + '/..')
 template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
-    begin system ('cp -f '+ app_path + '/personal-journal/modules' + folder + '/modules')
-    rescue puts 'error copy'
+    begin 
+        system ('cp -f '+ app_path + '/personal-journal/modules' + folder + '/modules')
+    rescue 
+        puts 'error copy'
+    end
 end
 #puts RAILS_ROOT
 #system 'ruby get_rail_path.rb'

From 22f3e2d4b2d780bc551c424e02c4df6d735ac363 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:20:31 +0800
Subject: [PATCH 101/119] Update personal_journal.gemspec fix

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index dd1f5cd..5edbadd 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        system ('cp -f '+ app_path + '/personal-journal/modules' + folder + '/modules')
+        system ('cp -f '+ app_path + ' /personal-journal/modules' + folder + '/modules')
     rescue 
         puts 'error copy'
     end

From 5d733ba16163045cee7f13fe8e8ff27f1854e192 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:21:35 +0800
Subject: [PATCH 102/119] Update personal_journal.gemspec fix

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 5edbadd..72b9d7f 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        system ('cp -f '+ app_path + ' /personal-journal/modules' + folder + '/modules')
+        system ('cp -f '+ app_path + '/personal-journal/modules ' + folder + '/modules')
     rescue 
         puts 'error copy'
     end

From daeaa7342b379affbc71455bc8bb9bde69c7ac00 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:23:53 +0800
Subject: [PATCH 103/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 72b9d7f..d7d6df6 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 require 'rails'
-app_path = File.expand_path(__dir__ + '/..')
+app_path = File.expand_path(__dir__)
 template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|

From 1466469da88cedb4aff5bdee59893f2bdedb8735 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:24:49 +0800
Subject: [PATCH 104/119] Update personal_journal.gemspec fix

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index d7d6df6..62740d2 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        system ('cp -f '+ app_path + '/personal-journal/modules ' + folder + '/modules')
+        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
     rescue 
         puts 'error copy'
     end

From e9e7616a04b8eda943d66eac69a3d2979826a77e Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:28:13 +0800
Subject: [PATCH 105/119] Update personal_journal.gemspec fix?

---
 personal_journal.gemspec | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 62740d2..963f08e 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -2,19 +2,6 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "personal_journal/version"
-require 'rails'
-app_path = File.expand_path(__dir__)
-template_path = ENV['PWD'] + '/app/templates'
-all_template = Dir.glob(template_path+'/*/')
-all_template.each do |folder|
-    begin 
-        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
-    rescue 
-        puts 'error copy'
-    end
-end
-#puts RAILS_ROOT
-#system 'ruby get_rail_path.rb'
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "personal_journal"
@@ -29,3 +16,14 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 end
+
+app_path = File.expand_path(__dir__)
+template_path = ENV['PWD'] + '/app/templates'
+all_template = Dir.glob(template_path+'/*/')
+all_template.each do |folder|
+    begin 
+        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
+    rescue 
+        puts 'error copy'
+    end
+end
\ No newline at end of file

From 0114c0c7c8425d6ad585262718ce03c8a0b05fa0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:30:40 +0800
Subject: [PATCH 106/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 963f08e..f4d45ad 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -3,6 +3,17 @@ $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
 require "personal_journal/version"
 # Describe your gem and declare its dependencies:
+app_path = File.expand_path(__dir__)
+template_path = ENV['PWD'] + '/app/templates'
+all_template = Dir.glob(template_path+'/*/')
+all_template.each do |folder|
+    begin 
+        #system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
+        system ('ls '+ app_path)
+    rescue 
+        puts 'error copy'
+    end
+end
 Gem::Specification.new do |s|
   s.name        = "personal_journal"
   s.version     = PersonalJournal::VERSION
@@ -16,14 +27,3 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 end
-
-app_path = File.expand_path(__dir__)
-template_path = ENV['PWD'] + '/app/templates'
-all_template = Dir.glob(template_path+'/*/')
-all_template.each do |folder|
-    begin 
-        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
-    rescue 
-        puts 'error copy'
-    end
-end
\ No newline at end of file

From 29cce678950738c0a6ecce56d8e23e83c0737988 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:31:48 +0800
Subject: [PATCH 107/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index f4d45ad..3d94833 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        #system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
+        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
         system ('ls '+ app_path)
     rescue 
         puts 'error copy'

From c32df918755860e06c7957e31904668330741b2a Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:33:37 +0800
Subject: [PATCH 108/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 3d94833..6c3bc28 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,6 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
+        puts 'cp -f '+ app_path + '/modules ' + folder + '/modules'
         system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
         system ('ls '+ app_path)
     rescue 

From 1117750c7fed3503819de92b3ffbd18c03d902d0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:35:20 +0800
Subject: [PATCH 109/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 6c3bc28..f8dfcfd 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,8 +8,8 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        puts 'cp -f '+ app_path + '/modules ' + folder + '/modules'
-        system ('cp -f '+ app_path + '/modules ' + folder + '/modules')
+        puts 'cp -f '+ app_path + '/modules/ ' + folder + '/modules/'
+        system ('cp -f '+ app_path + '/modules/ ' + folder + '/modules/')
         system ('ls '+ app_path)
     rescue 
         puts 'error copy'

From 5c94d45efc9f3a99a94ccb02a974ab9c592728e8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:36:05 +0800
Subject: [PATCH 110/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index f8dfcfd..fe403a5 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,8 +8,8 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        puts 'cp -f '+ app_path + '/modules/ ' + folder + '/modules/'
-        system ('cp -f '+ app_path + '/modules/ ' + folder + '/modules/')
+        puts 'cp -r '+ app_path + '/modules/ ' + folder + '/modules/'
+        system ('cp -r '+ app_path + '/modules/ ' + folder + '/modules/')
         system ('ls '+ app_path)
     rescue 
         puts 'error copy'

From 8388c34df4ca2b1c7bc067f813cab6d1590b1cbc Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:37:26 +0800
Subject: [PATCH 111/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index fe403a5..528fd08 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
-        puts 'cp -r '+ app_path + '/modules/ ' + folder + '/modules/'
+        puts 'copying module'
         system ('cp -r '+ app_path + '/modules/ ' + folder + '/modules/')
         system ('ls '+ app_path)
     rescue 

From 7a74e7f213ae2cb70ddda602838a762878a9fd91 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:39:32 +0800
Subject: [PATCH 112/119] Update personal_journal.gemspec fix

---
 personal_journal.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 528fd08..ee53ae8 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -10,7 +10,6 @@ all_template.each do |folder|
     begin 
         puts 'copying module'
         system ('cp -r '+ app_path + '/modules/ ' + folder + '/modules/')
-        system ('ls '+ app_path)
     rescue 
         puts 'error copy'
     end

From 87280ee3923d6551c266440c0c5d6caa9f0ae9e6 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:41:43 +0800
Subject: [PATCH 113/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index ee53ae8..bbddd96 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -9,7 +9,7 @@ all_template = Dir.glob(template_path+'/*/')
 all_template.each do |folder|
     begin 
         puts 'copying module'
-        system ('cp -r '+ app_path + '/modules/ ' + folder + '/modules/')
+        system ('cp -r '+ app_path + '/modules/ ' + folder)
     rescue 
         puts 'error copy'
     end

From 36bed2c915bf56937e99c192f60d7322a7e3a71d Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:45:14 +0800
Subject: [PATCH 114/119] Update personal_journal.gemspec finish

---
 personal_journal.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index bbddd96..1ede41f 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -14,6 +14,7 @@ all_template.each do |folder|
         puts 'error copy'
     end
 end
+system  ('rm -r '+app_path + '/modules/')
 Gem::Specification.new do |s|
   s.name        = "personal_journal"
   s.version     = PersonalJournal::VERSION

From 201ad7fc0e5498920d882ab6ee0d67b5e8b74e25 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 14:55:40 +0800
Subject: [PATCH 115/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 1ede41f..851db35 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -6,9 +6,9 @@ require "personal_journal/version"
 app_path = File.expand_path(__dir__)
 template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
+puts 'copying module'
 all_template.each do |folder|
     begin 
-        puts 'copying module'
         system ('cp -r '+ app_path + '/modules/ ' + folder)
     rescue 
         puts 'error copy'

From fbee8509c1abb8a8e906da9ba5e6fe41d4ddd7ee Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 17:08:03 +0800
Subject: [PATCH 116/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 851db35..5258da6 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,10 +8,12 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 puts 'copying module'
 all_template.each do |folder|
-    begin 
-        system ('cp -r '+ app_path + '/modules/ ' + folder)
-    rescue 
-        puts 'error copy'
+    if folder[0...-1] != 'mobile'
+        begin 
+            system ('cp -r '+ app_path + '/modules/ ' + folder)
+        rescue 
+            puts 'error copy'
+        end
     end
 end
 system  ('rm -r '+app_path + '/modules/')

From ee2311c1abe63ff822c68daafc537b7090dfb34b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 17:08:29 +0800
Subject: [PATCH 117/119] Update personal_journals_controller.rb

---
 app/controllers/personal_journals_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb
index 0961b5f..8b3c826 100644
--- a/app/controllers/personal_journals_controller.rb
+++ b/app/controllers/personal_journals_controller.rb
@@ -1,7 +1,5 @@
 class PersonalJournalsController < ApplicationController
   def index
-    ENV['all_root'] = Rails.root
-    puts Rails.root
     params = OrbitHelper.params
     page_data_count = OrbitHelper.page_data_count
     journal_papers = JournalPaper.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)

From e1293a4e7e8f062f0356f6e287130fce517dd9ef Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 21 Aug 2019 17:22:22 +0800
Subject: [PATCH 119/119] Update personal_journal.gemspec

---
 personal_journal.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/personal_journal.gemspec b/personal_journal.gemspec
index 5258da6..92177d9 100644
--- a/personal_journal.gemspec
+++ b/personal_journal.gemspec
@@ -8,7 +8,7 @@ template_path = ENV['PWD'] + '/app/templates'
 all_template = Dir.glob(template_path+'/*/')
 puts 'copying module'
 all_template.each do |folder|
-    if folder[0...-1] != 'mobile'
+    if folder.split('/')[-1] != 'mobile'
         begin 
             system ('cp -r '+ app_path + '/modules/ ' + folder)
         rescue