From be3945cd4479efd8a51c82b928e8515c20fc1d53 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 12 Jan 2016 20:32:40 +0800
Subject: [PATCH] removed blank columns

---
 app/models/honor.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/models/honor.rb b/app/models/honor.rb
index a8ff799..c38fc79 100644
--- a/app/models/honor.rb
+++ b/app/models/honor.rb
@@ -47,12 +47,19 @@ class Honor
       "awarding_unit"
     ]
 
-    pd_title = fields_to_show.collect do |t|
-      {
-        "plugin_data_title" => I18n.t("personal_honor.#{t}")
-      }
+    fields_to_remove = []
+
+    pd_title = []
+
+    fields_to_show.each do |t|
+      fields_to_remove << t if (datas.where(t.to_sym.ne => nil, t.to_sym.ne => "").count == 0 rescue false)
+      pd_title <<  {
+          "plugin_data_title" => I18n.t("personal_honor.#{t}")
+        } if !fields_to_remove.include?(t)
     end
 
+    fields_to_show = fields_to_show - fields_to_remove
+
     plugin_datas = datas.sort_for_frontend.collect.with_index do |p,index|
 
       pd_data = []