diff --git a/app/controllers/admin/honors_controller.rb b/app/controllers/admin/honors_controller.rb
index d6da61c..30b2431 100644
--- a/app/controllers/admin/honors_controller.rb
+++ b/app/controllers/admin/honors_controller.rb
@@ -22,6 +22,28 @@ class Admin::HonorsController < OrbitMemberController
end
end
+ def analysis_report
+ role = params[:role_id]
+ year_start = params[:year_start].to_i
+ year_end = params[:year_end].to_i
+ graph_by = params[:graph_by]
+
+ @data = get_chart_data(year_start,year_end,role,params[:graph_by])
+
+ render :layout => false
+ end
+
+ def download_excel
+ year_start = params[:year_start].to_i
+ year_end = params[:year_end].to_i
+ @data = get_data_for_excel(year_start,year_end)
+ respond_to do |format|
+ format.xlsx {
+ response.headers['Content-Disposition'] = 'attachment; filename="projects.xlsx"'
+ }
+ end
+ end
+
def create
if !honor_params['member_profile_id'].blank?
diff --git a/app/helpers/admin/personal_honors_helper.rb b/app/helpers/admin/personal_honors_helper.rb
index 025622a..c5ef370 100644
--- a/app/helpers/admin/personal_honors_helper.rb
+++ b/app/helpers/admin/personal_honors_helper.rb
@@ -62,4 +62,58 @@ module Admin::PersonalHonorsHelper
honor.member_profile = mp
honor.save
end
+
+ def get_data_for_excel(year_start,year_end)
+ data = []
+ roles = Role.where(:disabled => false, :title.ne => "", :title.ne => nil).asc(:key)
+ roles.each do |role|
+ d = {}
+ d["name"] = role.title
+ mps = role.member_profile_ids
+ # d1 = DateTime.new(year_start,1,1,0,0)
+ # d2 = DateTime.new(year_end,12,31,23,59)
+ d["data"] = Honor.where(:year.gte => year_start, :year.lte => year_end, :member_profile_id.in => mps) rescue []
+ data << d
+ end
+ return data
+ end
+
+ def get_chart_data(year_start,year_end,role,type)
+ case type
+ when "category"
+ jls = HonorType.all
+ end
+
+ finaldata = []
+ role = Role.find(role) rescue nil
+ mps = []
+ if !role.nil?
+ mps = role.member_profile_ids
+ end
+ jls.each do |jl|
+ data = {}
+ data["name"] = jl.title
+ data["data"] = {}
+ (year_start..year_end).each do |year|
+ # d1 = DateTime.new(year,1,1,0,0)
+ # d2 = DateTime.new(year,12,31,23,59)
+ t = jl.honors.where(:year => year.to_s, :member_profile_id.in => mps).count rescue 0
+ data["data"][year.to_s] = t
+ end
+ finaldata << data
+ end
+ data = {"name" => "N/A", "data" => {}}
+ (year_start..year_end).each do |year|
+ # d1 = DateTime.new(year,1,1,0,0)
+ # d2 = DateTime.new(year,12,31,23,59)
+ case type
+ when "category"
+ t = Honor.where(:year => year, :member_profile_id.in => mps, :honor_type_id => nil).count rescue 0
+ end
+
+ data["data"][year.to_s] = t
+ end
+ finaldata << data
+ finaldata
+ end
end
\ No newline at end of file
diff --git a/app/views/admin/honors/analysis.html.erb b/app/views/admin/honors/analysis.html.erb
new file mode 100644
index 0000000..b7c7d38
--- /dev/null
+++ b/app/views/admin/honors/analysis.html.erb
@@ -0,0 +1,114 @@
+<% # encoding: utf-8 %>
+<% content_for :page_specific_css do %>
+ <%= stylesheet_link_tag "lib/main-forms" %>
+ <%= stylesheet_link_tag "lib/fileupload" %>
+ <%= stylesheet_link_tag "lib/main-list" %>
+ <%= stylesheet_link_tag "lib/main-form-col2" %>
+
+<% end %>
+<% content_for :page_specific_javascript do %>
+ <%= javascript_include_tag "//www.google.com/jsapi", "chartkick"%>
+ <%= javascript_include_tag "justgage.1.0.1.min" %>
+ <%= javascript_include_tag "raphael.2.1.0.min" %>
+ <%= javascript_include_tag "validator" %>
+<% end %>
+
+
+
+ <% Role.where(:disabled => false, :title.ne => "", :title.ne => nil).asc(:key).each do |role| %>
+
+
<%= role.title %>
+
+
+
+
+ <% end %>
+
+
+
+
+
+
+
diff --git a/app/views/admin/honors/analysis_report.html.erb b/app/views/admin/honors/analysis_report.html.erb
new file mode 100644
index 0000000..b4e8aa4
--- /dev/null
+++ b/app/views/admin/honors/analysis_report.html.erb
@@ -0,0 +1 @@
+<%= column_chart @data, :id => params[:role_id], :height => "350px", :xtitle => "Year", :ytitle => "Total number" %>
\ No newline at end of file
diff --git a/app/views/admin/honors/download_excel.xlsx.axlsx b/app/views/admin/honors/download_excel.xlsx.axlsx
new file mode 100644
index 0000000..e4b707e
--- /dev/null
+++ b/app/views/admin/honors/download_excel.xlsx.axlsx
@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+wb = xlsx_package.workbook
+@data.each_with_index do |role,idx|
+ data = role["data"]
+ wb.add_worksheet(name: role["name"] + "-" + idx.to_s) do |sheet|
+
+ heading = sheet.styles.add_style(:b => true, :locked => true)
+
+ row = ["Name"]
+ @site_in_use_locales.each do |locale|
+ row << t("personal_honor.award_name") + " - " + t(locale.to_s)
+ end
+ @site_in_use_locales.each do |locale|
+ row << t("personal_honor.awarding_unit") + " - " + t(locale.to_s)
+ end
+
+ row << t("personal_honor.year")
+
+ row << t("personal_honor.language")
+
+ row << t("personal_honor.honor_category")
+
+ row << t("personal_honor.url")
+
+ row << t("personal_honor.keywords")
+
+ row << t("personal_honor.note")
+
+ sheet.add_row row, :style => heading
+
+ data.each do |hon|
+ row = [hon.member_profile.name]
+ @site_in_use_locales.each do |locale|
+ row << hon.award_name_translations[locale.to_s]
+ end
+ @site_in_use_locales.each do |locale|
+ row << hon.awarding_unit_translations[locale.to_s]
+ end
+ row << hon.year
+ row << hon.language
+ row << hon.honor_type.title rescue ""
+ row << hon.url
+ row << hon.keywords
+ row << hon.note
+ sheet.add_row row
+ end
+ end
+end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7fa499c..6005be9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,6 +38,7 @@ en:
description : "File Description"
pages : "Pages"
book_paper_type : "Book Paper Type"
+ graph_by : "Graph By"
frontend:
honors: "Honor Front-end"
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 3906576..81c0ee1 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -34,6 +34,7 @@ zh_tw:
file : "檔案"
file_name : "檔案名稱"
description : "描述"
+ graph_by : "Graph By"
frontend:
honors: "榮譽前台"
diff --git a/config/routes.rb b/config/routes.rb
index 792eeaf..1bb3ac9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,9 @@ Rails.application.routes.draw do
resources :honors do
collection do
get 'toggle_hide' => 'honors#toggle_hide'
+ get 'analysis'
+ get 'analysis_report'
+ get "download_excel"
end
end
diff --git a/lib/personal_honor/engine.rb b/lib/personal_honor/engine.rb
index ea8ed0b..784deed 100644
--- a/lib/personal_honor/engine.rb
+++ b/lib/personal_honor/engine.rb
@@ -4,8 +4,7 @@ module PersonalHonor
OrbitApp.registration "PersonalHonor",:type=> 'ModuleApp' do
module_label 'module_name.personal_honor'
base_url File.expand_path File.dirname(__FILE__)
- personal_plugin :enable => true, :sort_number => '50', :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"/plugin/personal_honor/profile",:front_path=>"/profile",:admin_path=>"/admin/honors",:i18n=>'module_name.personal_honor', :module_app_name=>'PersonalHonor', :field_modifiable => true
-
+ personal_plugin :enable => true, :sort_number => '50', :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"/plugin/personal_honor/profile",:front_path=>"/profile",:admin_path=>"/admin/honors",:i18n=>'module_name.personal_honor', :module_app_name=>'PersonalHonor', :field_modifiable => true, :analysis => true, :analysis_path => "/admin/honors/analysis"
version "0.1"
desktop_enabled true