diff --git a/app/controllers/personal_honors_controller.rb b/app/controllers/personal_honors_controller.rb
index 853e580..da7e199 100644
--- a/app/controllers/personal_honors_controller.rb
+++ b/app/controllers/personal_honors_controller.rb
@@ -1,7 +1,16 @@
class PersonalHonorsController < ApplicationController
def index
params = OrbitHelper.params
- honors = Honor.where(:award_name.ne => nil).or(:award_name.ne => "").sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
+ filter_value = params[:honors_filter_value]
+ honors = nil
+
+ if filter_value.nil? || filter_value == t("personal_honor.honor_types_all") || filter_value.empty?
+ honors = Honor.where(:award_name.ne => nil).or(:award_name.ne => "").sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
+ else
+ honor_type_id = HonorType.or({ 'title.en' => filter_value }, { 'title.zh_tw' => filter_value }).first.id
+ honors = Honor.where(honor_type_id: honor_type_id).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
+ end
+
fields_to_show = Page.where(:page_id => params[:page_id]).first.custom_array_field rescue []
if fields_to_show.blank?
@@ -18,22 +27,22 @@ class PersonalHonorsController < ApplicationController
honors.each do |honor|
t = []
fields_to_show.each do |fs|
- case fs
- when "award_name"
- t << {"value" => "" + (honor.send(fs) rescue "") + ""}
- when "honor_type"
- t << {"value" => (honor.send("honor_type").title rescue "")}
- when "authors"
- t << {"value" => (honor.send(:member_profile).name rescue "")}
- when "award_date"
- t << {"value" => (honor.send(fs).strftime("%Y/%m") rescue "")}
- else
- t << {"value" => (honor.send(fs) rescue "")}
- end
- end
- honor_list << {"personal_honors" => t}
+ case fs
+ when "award_name"
+ t << {"value" => "" + (honor.send(fs) rescue "") + ""}
+ when "honor_type"
+ t << {"value" => (honor.send("honor_type").title rescue "")}
+ when "authors"
+ t << {"value" => (honor.send(:member_profile).name rescue "")}
+ when "award_date"
+ t << {"value" => (honor.send(fs).strftime("%Y/%m") rescue "")}
+ else
+ t << {"value" => (honor.send(fs) rescue "")}
+ end
+ end
+ honor_list << {"personal_honors" => t}
end
-
+
headers = []
fields_to_show.each do |fs|
col = 2
@@ -45,9 +54,15 @@ class PersonalHonorsController < ApplicationController
}
end
+ current_locale = I18n.locale
+ honor_types = HonorType.all.pluck(:title).map { |title| { 'honor_type' => title[current_locale] } }
+ honor_types.unshift({ 'honor_type' => t("personal_honor.honor_types_all") })
+
{
"honors" => honor_list,
- "extras" => {"widget-title" => t("module_name.personal_honor")},
+ "honor_types" => honor_types,
+ "extras" => { "widget-title" => t("module_name.personal_honor"),
+ "url" => '/' + current_locale.to_s + params[:url] },
"headers" => headers,
"total_pages" => honors.total_pages
}
@@ -73,35 +88,35 @@ class PersonalHonorsController < ApplicationController
end
def get_fields_for_index
- @page = Page.find(params[:page_id]) rescue nil
- @fields_to_show = [
- "year",
- "award_name",
- "awarding_unit",
- "honor_type",
- "award_date",
- "country",
- "keywords",
- "url",
- "note",
- "authors",
- "award_winner"
- ]
- @fields_to_show = @fields_to_show.map{|fs| [(fs == "authors" ? t("users.name") : t("personal_honor.#{fs}")), fs]}
- @default_fields_to_show = [
- "honor_type",
- "year",
- "award_name",
- "authors",
- "awarding_unit"
- ]
- render :layout => false
+ @page = Page.find(params[:page_id]) rescue nil
+ @fields_to_show = [
+ "year",
+ "award_name",
+ "awarding_unit",
+ "honor_type",
+ "award_date",
+ "country",
+ "keywords",
+ "url",
+ "note",
+ "authors",
+ "award_winner"
+ ]
+ @fields_to_show = @fields_to_show.map{|fs| [(fs == "authors" ? t("users.name") : t("personal_honor.#{fs}")), fs]}
+ @default_fields_to_show = [
+ "honor_type",
+ "year",
+ "award_name",
+ "authors",
+ "awarding_unit"
+ ]
+ render :layout => false
end
def save_index_fields
- page = Page.find(params[:page_id]) rescue nil
- page.custom_array_field = params[:keys]
- page.save
- render :json => {"success" => true}.to_json
+ page = Page.find(params[:page_id]) rescue nil
+ page.custom_array_field = params[:keys]
+ page.save
+ render :json => {"success" => true}.to_json
end
-end
\ No newline at end of file
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6005be9..220653b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -9,6 +9,7 @@ en:
awarding_unit : "Awarding Unit"
honor_category : "Honor Category"
honor_type: "Honor Category"
+ honor_types_all: "All Honor Types"
extracted_chapters : "Extracted Chapters"
publishers : "Publishers"
honoree: "Honoree"
@@ -59,4 +60,4 @@ en:
save: "save"
hintText: "Type in a search term"
noResultsText: "No results"
- searchingText: "Searching…"
\ No newline at end of file
+ searchingText: "Searching…"
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 81c0ee1..d44f0c7 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -9,6 +9,7 @@ zh_tw:
awarding_unit : "頒獎單位"
honor_category : "類別"
honor_type: "類別"
+ honor_types_all: "所有榮譽項目"
honoree: "受獎人"
authors : "作者"
tags : "領域"
@@ -55,4 +56,4 @@ zh_tw:
save: "儲存"
hintText: "請輸入搜尋關鍵字"
noResultsText: "沒有相關的比對結果"
- searchingText: "搜尋中…"
\ No newline at end of file
+ searchingText: "搜尋中…"