Implement job filtering

Dave Newman · Dave Newman · commit 5237313a87d6 · 2016-04-26T22:19:04.000-07:00
diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
@@ -6,16 +6,15 @@ def index
     params[:show_contract] ||= true
     # raise params.inspect
 
+    roles = []
+    roles.push(Job::FULLTIME) if params[:show_fulltime] == 'true'
+    roles.push(Job::PARTTIME) if params[:show_parttime] == 'true'
+    roles.push(Job::CONTRACT) if params[:show_contract] == 'true'
     @jobs = Job.active.order(created_at: :desc)
 
-    # if params[:show_fulltime]
-    #
-    #   where("role_type != ?", JOB::FULLTIME)
-    # end
-
-    if !params[:show_contract]
-
-    end
+    @jobs = @jobs.where('jobs.role_type in (?)', roles)
+    @jobs = @jobs.where(location: 'Remote') if params[:show_remote] == 'true'
+    @jobs = @jobs.where('jobs.location ilike :q or jobs.title ilike :q or jobs.company ilike :q', q: "%#{params[:q]}%") unless params[:q].blank?
 
     if params[:posted]
       @jobs = @jobs.where.not(id: params[:posted])
diff --git a/app/views/jobs/index.html.haml b/app/views/jobs/index.html.haml
@@ -8,12 +8,21 @@
       =form_tag jobs_path, method: :get do
         = text_field_tag :q, params[:q], placeholder: 'Search great jobs by Location, Title, or Company', class: 'field col-6'
         .col-1.inline.ml1
-          = check_box_tag :show_fulltime, true, params[:show_fulltime]
+          = hidden_field_tag :show_fulltime, false, id: nil
+          = check_box_tag :show_fulltime, true, params[:show_fulltime] == 'true'
           = label_tag :show_fulltime, 'Full Time'
-          = check_box_tag :show_contract, true, params[:show_contract]
+
+          = hidden_field_tag :show_parttime, false, id: nil
+          = check_box_tag :show_parttime, true, params[:show_parttime] == 'true'
+          = label_tag :show_parttime, 'Part Time'
+
+          = hidden_field_tag :show_contract, false, id: nil
+          = check_box_tag :show_contract, true, params[:show_contract] == 'true'
           = label_tag :show_contract, 'Contracting'
-          = check_box_tag :show_remote, true, params[:show_remote]
-          = label_tag :show_remote, 'Remote'
+
+          = hidden_field_tag :show_remote, false, id: nil
+          = check_box_tag :show_remote, true, params[:show_remote] == 'true'
+          = label_tag :show_remote, 'Remote Only'
         .col-1.inline.ml1
           %button.btn.bg-purple.white.rounded{type: 'submit'}= icon('search')
     .col.sm-col-1
