diff --git a/app/helpers/admin/journal_papers_helper.rb b/app/helpers/admin/journal_papers_helper.rb index 269add5..f4d1969 100644 --- a/app/helpers/admin/journal_papers_helper.rb +++ b/app/helpers/admin/journal_papers_helper.rb @@ -82,17 +82,17 @@ module Admin::JournalPapersHelper when 13 jls = JournalLevel.asc(:created_at).all.to_a ts = val.to_s.split(",") - ts.each do |t| - jp.journal_level_ids << jls[t.to_i].id + ts.each do |t| + jp.journal_level_ids << jls[t.to_i].id if t.is_i? && t.to_i < jls.count end when 14 jpts = JournalPaperType.asc(:created_at).all.to_a - jp.journal_paper_type = jpts[val.to_i] + jp.journal_paper_type = jpts[val.to_i] if val.is_i? && val.to_i < jpts.count when 15 jpas = JournalPaperAuthorType.asc(:created_at).all.to_a ts = val.to_s.split(",") ts.each do |t| - jp.journal_paper_author_type_ids << jpas[t.to_i].id + jp.journal_paper_author_type_ids << jpas[t.to_i].id if t.is_i? && t.to_i < jpas.count end when 16 jp.number_of_authors = val diff --git a/app/views/admin/journal_papers/excel_format.xlsx.axlsx b/app/views/admin/journal_papers/excel_format.xlsx.axlsx index c6c671a..e2efe18 100644 --- a/app/views/admin/journal_papers/excel_format.xlsx.axlsx +++ b/app/views/admin/journal_papers/excel_format.xlsx.axlsx @@ -59,7 +59,6 @@ wb.add_worksheet(name: "Journal Paper") do |sheet| row << t("personal_journal.level_type") row1 << "checkbox" t = "" - keys = [] JournalLevel.asc(:created_at).each_with_index do |jl,i| t = t + "#{i}" + " -> " + jl.title + ", " end @@ -73,7 +72,6 @@ wb.add_worksheet(name: "Journal Paper") do |sheet| row << t("personal_journal.paper_type") row1 << "select" t = "" - keys = [] JournalPaperType.asc(:created_at).each_with_index do |jl,i| t = t + "#{i}" + " -> " + jl.title + ", " end @@ -87,7 +85,6 @@ wb.add_worksheet(name: "Journal Paper") do |sheet| row << t("personal_journal.author_type") row1 << "checkbox" t = "" - keys = [] JournalPaperAuthorType.asc(:created_at).each_with_index do |jl,i| t = t + "#{i}" + " -> " + jl.title + ", " end