From 3c047cd90ccef1913452440d5394b75853aba89d Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 11 Jan 2017 14:30:27 +0800 Subject: [PATCH] analysis updates and remove paginates per --- .../admin/experiences_controller.rb | 23 ++++ .../admin/personal_experiences_helper.rb | 53 ++++++++ app/models/experience.rb | 2 +- app/views/admin/experiences/analysis.html.erb | 114 ++++++++++++++++++ .../experiences/analysis_report.html.erb | 1 + .../experiences/download_excel.xlsx.axlsx | 60 +++++++++ config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + config/routes.rb | 3 + lib/personal_experience/engine.rb | 3 +- 10 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 app/views/admin/experiences/analysis.html.erb create mode 100644 app/views/admin/experiences/analysis_report.html.erb create mode 100644 app/views/admin/experiences/download_excel.xlsx.axlsx diff --git a/app/controllers/admin/experiences_controller.rb b/app/controllers/admin/experiences_controller.rb index 32a05c9..adb4a3e 100644 --- a/app/controllers/admin/experiences_controller.rb +++ b/app/controllers/admin/experiences_controller.rb @@ -22,6 +22,29 @@ class Admin::ExperiencesController < 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="experiences.xlsx"' + } + end + end + + def create if !experience_params['member_profile_id'].blank? diff --git a/app/helpers/admin/personal_experiences_helper.rb b/app/helpers/admin/personal_experiences_helper.rb index f380bd3..09db20a 100644 --- a/app/helpers/admin/personal_experiences_helper.rb +++ b/app/helpers/admin/personal_experiences_helper.rb @@ -74,4 +74,57 @@ module Admin::PersonalExperiencesHelper exp.member_profile = mp exp.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"] = Experience.where(:start_date.gte => d1, :start_date.lte => d2, :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 = ExperienceType.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.experiences.where(:start_date.gte => d1, :start_date.lte => d2, :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 = Experience.where(:start_date.gte => d1, :start_date.lte => d2, :member_profile_id.in => mps, :experience_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/models/experience.rb b/app/models/experience.rb index 2df3598..2579385 100644 --- a/app/models/experience.rb +++ b/app/models/experience.rb @@ -21,7 +21,7 @@ class Experience field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId - paginates_per 10 + # paginates_per 10 before_validation :add_http diff --git a/app/views/admin/experiences/analysis.html.erb b/app/views/admin/experiences/analysis.html.erb new file mode 100644 index 0000000..489dbd3 --- /dev/null +++ b/app/views/admin/experiences/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 %> +
+
+
+
+
+ +
+ <%= select_year(DateTime.now.year - 5, {:start_year => DateTime.now.year, :end_year => 1950}, {:name => 'start_year', :class => "span1"} ) %> + - + <%= select_year(DateTime.now.year, {:start_year => DateTime.now.year, :end_year => 1950}, {:name => 'end_year', :class => "span1"} ) %> +
+
+
+ +
+ <%= t("personal_experience.experience_category") %> +
+
+
+
+ + Export +
+
+
+
+ <% Role.where(:disabled => false, :title.ne => "", :title.ne => nil).asc(:key).each do |role| %> +
+

<%= role.title %>

+
+ loading +
+
+ <% end %> +
+
+ + + + + diff --git a/app/views/admin/experiences/analysis_report.html.erb b/app/views/admin/experiences/analysis_report.html.erb new file mode 100644 index 0000000..b4e8aa4 --- /dev/null +++ b/app/views/admin/experiences/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/experiences/download_excel.xlsx.axlsx b/app/views/admin/experiences/download_excel.xlsx.axlsx new file mode 100644 index 0000000..3b3adf3 --- /dev/null +++ b/app/views/admin/experiences/download_excel.xlsx.axlsx @@ -0,0 +1,60 @@ +# 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_experience.organizationt_title") + " - " + t(locale.to_s) + end + @site_in_use_locales.each do |locale| + row << t("personal_experience.department") + " - " + t(locale.to_s) + end + @site_in_use_locales.each do |locale| + row << t("personal_experience.job_title") + " - " + t(locale.to_s) + end + + row << t("personal_experience.experience_category") + + row << t("personal_experience.language") + + row << t("personal_experience.start_date") + + row << t("personal_experience.end_date") + + row << t("personal_experience.url") + + row << t("personal_experience.keywords") + + row << t("personal_experience.note") + + + sheet.add_row row, :style => heading + + data.each do |exp| + row = [exp.member_profile.name] + @site_in_use_locales.each do |locale| + row << exp.organizationt_title_translations[locale.to_s] + end + @site_in_use_locales.each do |locale| + row << exp.department_translations[locale.to_s] + end + @site_in_use_locales.each do |locale| + row << exp.job_title_translations[locale.to_s] + end + + row << exp.experience_type.title rescue "" + row << exp.language + row << exp.start_date.strftime("%Y-%m-%d") rescue "" + row << exp.end_date.strftime("%Y-%m-%d") rescue "" + row << exp.url + row << exp.keywords + row << exp.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 6764041..6ff1213 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,6 +39,7 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + graph_by : "Graph By" frontend: experiences: "Experience Front－end" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 17b43c3..3b2d463 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -35,6 +35,7 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + graph_by : "Graph By" frontend: experiences: "經歷前台" diff --git a/config/routes.rb b/config/routes.rb index 5955424..94209bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,9 @@ Rails.application.routes.draw do resources :experiences do collection do get 'toggle_hide' => 'experiences#toggle_hide' + get 'analysis' + get 'analysis_report' + get "download_excel" end end diff --git a/lib/personal_experience/engine.rb b/lib/personal_experience/engine.rb index 7b68fc1..1c04f30 100644 --- a/lib/personal_experience/engine.rb +++ b/lib/personal_experience/engine.rb @@ -4,7 +4,8 @@ module PersonalExperience OrbitApp.registration "PersonalExperience",:type=> 'ModuleApp' do module_label 'module_name.personal_experience' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"/plugin/personal_experience/profile",:front_path=>"/profile",:admin_path=>"/admin/experiences",:i18n=>'module_name.personal_experience', :module_app_name=>'PersonalExperience' + personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"/plugin/personal_experience/profile",:front_path=>"/profile",:admin_path=>"/admin/experiences",:i18n=>'module_name.personal_experience', :module_app_name=>'PersonalExperience', :analysis => true, :analysis_path => "/admin/experiences/analysis" + version "0.1" desktop_enabled true organization "Rulingcom"