harrybomrah
/
personal-research
forked from saurabh/personal-research
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix export excel bug caused by related to more than one members and year in mongo's data-type is string not Fixnum.

This commit is contained in:
BOHUNG 2020-02-24 14:31:53 +08:00
parent c2bba77a78
commit 6def60f8dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/admin/personal_researches_helper.rb
View File

@ -88,7 +88,7 @@ module Admin::PersonalResearchesHelper
mps = role.member_profile_ids mps = role.member_profile_ids
# d1 = DateTime.new(year_start,1,1,0,0) # d1 = DateTime.new(year_start,1,1,0,0)
# d2 = DateTime.new(year_end,12,31,23,59) # d2 = DateTime.new(year_end,12,31,23,59)
d["data"] = Research.where(:year.gte => year_start, :year.lte => year_end, :member_profile_id.in => mps) rescue [] d["data"] = Research.where(:year.gte => year_start.to_s, :year.lte => year_end.to_s, :member_profile_id.in => mps) rescue []
data << d data << d
end end
return data return data
@ -124,7 +124,7 @@ module Admin::PersonalResearchesHelper
# d2 = DateTime.new(year,12,31,23,59) # d2 = DateTime.new(year,12,31,23,59)
case type case type
when "category" when "category"
t = Research.where(:year => year, :member_profile_id.in => mps, :project_type_id => nil).count rescue 0 t = Research.where(:year => year.to_s, :member_profile_id.in => mps, :project_type_id => nil).count rescue 0
end end
data["data"][year.to_s] = t data["data"][year.to_s] = t

2
app/views/admin/researchs/download_excel.xlsx.axlsx
View File

@ -39,7 +39,7 @@ wb = xlsx_package.workbook
sheet.add_row row, :style => heading sheet.add_row row, :style => heading
data.each do |proj| data.each do |proj|
row = [proj.member_profile.name] row = [(proj.member_profile_id.class == Array ? proj.member_profile_id.map{|member_id| MemberProfile.find(member_id).name rescue ""} : [proj.member_profile.name])]
@site_in_use_locales.each do |locale| @site_in_use_locales.each do |locale|
row << proj.research_title_translations[locale.to_s] row << proj.research_title_translations[locale.to_s]
end end