From d99cc7371d225184a1a3bd9e3f5f7f84a461c756 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 15 Feb 2016 18:37:36 +0800 Subject: [PATCH] removed empty column --- app/models/journal_paper.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb index 7e35172..e6df458 100644 --- a/app/models/journal_paper.rb +++ b/app/models/journal_paper.rb @@ -75,12 +75,23 @@ class JournalPaper "paper_title" ] - pd_title = fields_to_show.collect do |t| - { - "plugin_data_title" => I18n.t("personal_journal.#{t}") - } + fields_to_remove = [] + + pd_title = [] + + fields_to_show.each do |t| + if (self.fields[t].type.to_s == "String" rescue false) + fields_to_remove << t if (datas.where(t.to_sym.ne => nil, t.to_sym.ne => "").count == 0 rescue false) + else + fields_to_remove << t if (datas.where(t.to_sym.ne => nil).count == 0 rescue false) + end + pd_title << { + "plugin_data_title" => I18n.t("personal_journal.#{t}") + } if !fields_to_remove.include?(t) end + fields_to_show = fields_to_show - fields_to_remove + plugin_datas = datas.sort_for_frontend.collect do |p| pd_data = []