From 04b2af9e20380b834d1ad98f386cde6cf90bd09a Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 18 Jan 2018 02:32:24 +0800 Subject: [PATCH] small fix for charts --- .../admin/recruitments_controller.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/recruitments_controller.rb b/app/controllers/admin/recruitments_controller.rb index 5d1851a..ea62dfe 100644 --- a/app/controllers/admin/recruitments_controller.rb +++ b/app/controllers/admin/recruitments_controller.rb @@ -15,20 +15,32 @@ class Admin::RecruitmentsController < OrbitAdminController case params[:type] when "posting" @startdt = DateTime.parse("#{year}/#{month}") - enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + if month.to_i < 12 + enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + else + enddt = DateTime.parse("#{year.to_i + 1}/1") + end @data = {} @data[t("recruitment.post_t.type1")] = RecruitmentJob.jobs.where(:created_at.gte => @startdt, :created_at.lt => enddt).count @data[t("recruitment.post_t.type2")] = RecruitmentJob.internships.where(:created_at.gte => @startdt, :created_at.lt => enddt).count @data[t("recruitment.post_t.type3")] = RecruitmentJob.exchanges.where(:created_at.gte => @startdt, :created_at.lt => enddt).count when "registration" @startdt = DateTime.parse("#{year}/#{month}") - enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + if month.to_i < 12 + enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + else + enddt = DateTime.parse("#{year.to_i + 1}/1") + end @data = {} @data[t("recruitment.user_type.type1")] = RecruitProfile.employees.where(:created_at.gte => @startdt, :created_at.lt => enddt).count @data[t("recruitment.user_type.type2")] = RecruitProfile.employers.where(:created_at.gte => @startdt, :created_at.lt => enddt).count when "filled" @startdt = DateTime.parse("#{year}/#{month}") - enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + if month.to_i < 12 + enddt = DateTime.parse("#{year}/#{month.to_i + 1}") + else + enddt = DateTime.parse("#{year.to_i + 1}/1") + end @data = {} @data[t("recruitment.post_t.type1")] = RecruitmentJob.jobs.filled.where(:created_at.gte => @startdt, :created_at.lt => enddt).count @data[t("recruitment.post_t.type2")] = RecruitmentJob.internships.filled.where(:created_at.gte => @startdt, :created_at.lt => enddt).count