From 614103f6d21c1703f7e7f6c01de2ee62e913b268 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Sat, 23 Jun 2018 23:24:02 +0800 Subject: [PATCH] added date expiry --- app/controllers/recruitments_controller.rb | 1 + app/models/recruitment_job.rb | 2 ++ app/views/recruitments/_job_form.html.erb | 9 +++++++++ config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + 5 files changed, 14 insertions(+) diff --git a/app/controllers/recruitments_controller.rb b/app/controllers/recruitments_controller.rb index c7a20ea..efce19c 100644 --- a/app/controllers/recruitments_controller.rb +++ b/app/controllers/recruitments_controller.rb @@ -89,6 +89,7 @@ class RecruitmentsController < PseudoSessionController rjobs = [] total_pages = 0 end + rjobs = rjobs.excluded_expired rjobs.each do |rj| if rj.work_experience_years == 0 && rj.work_experience_months == 0 wey = t("recruitment.fresher") diff --git a/app/models/recruitment_job.rb b/app/models/recruitment_job.rb index 4d83ec0..f680c72 100644 --- a/app/models/recruitment_job.rb +++ b/app/models/recruitment_job.rb @@ -9,6 +9,7 @@ class RecruitmentJob field :job_description, localize: true field :responsibility, localize: true field :other_conditions, localize: true + field :expiry_date, type: DateTime field :salary #type1 => negotiable type2 => according to company rules field :travel_assignment #type1 => Need to travel, type2 => occasionally, type3 => travelling not required field :working_time #type1 => Day Shift, type2 => Night Shift @@ -49,6 +50,7 @@ class RecruitmentJob scope :jobs, ->{where(:post_type => "type1")} scope :internships, ->{where(:post_type => "type2")} scope :exchanges, ->{where(:post_type => "type3")} + scope :excluded_expired, ->{where(:expiry_date.gte => Time.now)} def get_category RecruitmentCategory.find(self.category).job_category rescue "" diff --git a/app/views/recruitments/_job_form.html.erb b/app/views/recruitments/_job_form.html.erb index c7a5de5..f9fae44 100644 --- a/app/views/recruitments/_job_form.html.erb +++ b/app/views/recruitments/_job_form.html.erb @@ -6,6 +6,8 @@ <%# content_for :page_specific_javascript do %> <%= javascript_include_tag "lib/bootstrap-fileupload" %> <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/bootstrap-datetimepicker" %> + <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %> <%# end %>