refactor scopes on job class

Improve navitation of jobs for users and admins

Author: constantine-nikolaou

app/controllers/jobs_controller.rb

@@ -11,18 +11,24 @@ def index
     @page_description = 'Technical & software development jobs listed on MENAdevs'
     @page_keywords    = AppSettings.meta_tags_keywords
 
-    @jobs = Job.approved.order(:posted_on).reverse_order
+    @jobs = Job.approved_jobs.order(:posted_on).reverse_order
 
     if (user_signed_in? && params.has_key?(:state))
-      filter_by_params
+      filter_by_params(current_user)
     end
 
     @jobs = Kaminari.paginate_array(@jobs).page(params[:page]).per(25)
   end
 
   # GET /list-jobs-admin
   def list_jobs
-    @admin_jobs = Job.all.order(:updated_at).reverse_order.page(params[:page])
+    @jobs = Job.all.order(:created_at).reverse_order
+
+    if params.has_key?(:state)
+      filter_by_params
+    end
+
+    @jobs = Kaminari.paginate_array(@jobs).page(params[:page]).per(25)
 
     render :admin_index
   end
@@ -130,16 +136,22 @@ def set_job
       @job = @job.decorate.first
     end
 
-    def filter_by_params
-      user_jobs = Job.user_jobs(current_user)
+    def filter_by_params(user = nil)
+      if user.nil?
+        user_jobs = Job.all
+      else
+        user_jobs = Job.user_jobs(user)
+      end
       state_params = params[:state]
 
       if state_params == 'user'
         @jobs = user_jobs
       elsif state_params == 'draft'
-        @jobs = user_jobs.user_draft
+        @jobs = user_jobs.draft_jobs
+      elsif state_params == 'pending'
+        @jobs = user_jobs.pending_jobs
       elsif state_params == 'expired'
-        @jobs = user_jobs.user_expired
+        @jobs = user_jobs.expired_jobs
       end
     end
 

app/models/job.rb

@@ -110,10 +110,11 @@ class Job < ApplicationRecord
   friendly_id :title, use: :slugged
 
   scope :user_jobs, -> (user) { where(user_id: user.id) }
-  scope :approved, -> { where(aasm_state: 'approved') }
-  scope :user_draft, -> { where(aasm_state: ['draft', 'under_review', 'edited']) }
-  scope :user_expired, -> { where(aasm_state: 'disabled') }
-  scope :live, -> { where.not(:posted_on => nil) }
+  scope :pending_jobs, -> { where(aasm_state: 'under_review') }
+  scope :approved_jobs, -> { where(aasm_state: 'approved') }
+  scope :draft_jobs, -> { where(aasm_state: ['draft', 'under_review', 'edited']) }
+  scope :expired_jobs, -> { where(aasm_state: 'disabled') }
+  scope :live_jobs, -> { where.not(:posted_on => nil) }
 
   def offline?
     (self.draft? || self.under_review? || self.disabled?) ? true : false

app/views/jobs/_admin_job.html.erb

@@ -28,9 +28,12 @@
   </td>
 
   <td>
+    <%= admin_job.aasm.human_state %>
+  </td>
+
+  <td width="5%">
     <% if (authorised_admin? && admin_job.offline?) %>
-      <%= link_to("Edit", edit_job_path(admin_job), class: "button button-3d button-mini button-rounded button-blue") %>
-      <%= link_to("Delete", job_path(admin_job), class: "button button-3d button-mini button-rounded button-red", method: 'delete') %>
+      <%= link_to("Edit", edit_job_path(admin_job), class: "button button-3d button-mini button-rounded button-blue fright") %>
     <% end %>
   </td>
 </tr>

app/views/jobs/_admin_jobs_table.html.erb

@@ -10,12 +10,13 @@
         <th>Created</th>
         <th>Views</th>
         <th>Hired?</th>
+        <th>State</th>
         <th>&nbsp;</th>
       </tr>
     </thead>
 
     <tbody>
-      <%= render(partial: "admin_job", collection: @admin_jobs) %>
+      <%= render(partial: "admin_job", collection: @jobs) %>
     </tbody>
 
   </table>

app/views/jobs/_job.html.erb

@@ -18,8 +18,8 @@
 
   <td>
     <% if (authorised_job_owner?(job) && job.offline?) %>
-      <%= link_to("Edit", edit_job_path(job), class: "button button-3d button-mini button-rounded button-blue") %>
-      <%= link_to("Delete", job_path(job), class: "button button-3d button-mini button-rounded button-red", method: 'delete') %>
+      <%= link_to("Delete", job_path(job), class: "button button-3d button-mini button-rounded button-red fright", method: 'delete', data: { confirm: "Are you sure that you want to delete this job?" }) %>
+      <%= link_to("Edit", edit_job_path(job), class: "button button-3d button-mini button-rounded button-blue fright") %>
     <% end %>
   </td>
 </tr>

app/views/jobs/admin_index.html.erb

@@ -22,20 +22,50 @@
 
     <div class="container clearfix">
 
-      <% if @admin_jobs.blank? %>
+      <!-- Filter jobs helper: start -->
+      <div>
+        <span>Filter jobs</span> &nbsp;
+        <%= link_to(list_jobs_admin_path) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params)) do %>
+            All jobs
+          <% end %>
+        <% end %>
+
+        <%= link_to(list_jobs_admin_path(state: 'pending')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'pending')) do %>
+            All pending approval jobs
+          <% end %>
+        <% end %>
+
+        <%= link_to(list_jobs_admin_path(state: 'draft')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'draft')) do %>
+            All draft jobs
+          <% end %>
+        <% end %>
+
+        <%= link_to(list_jobs_admin_path(state: 'expired')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'expired')) do %>
+            All expired jobs
+          <% end %>
+        <% end %>
+      </div>
+      <hr/>
+      <!-- Filter jobs helper: end -->
+
+      <% if @jobs.blank? %>
         <div class="style-msg alertmsg">
           <div class="sb-msg"><i class="icon-warning-sign"></i>There are no jobs on MENAdevs at the moment</div>
         </div>
       <% else %>
 
         <div class="row">
           <div class="col-md-12">
-            <%= render("admin_jobs_table", locals: { admin_jobs: @admin_jobs }) %>
+            <%= render("admin_jobs_table", locals: { admin_jobs: @jobs }) %>
           </div>
         </div>
 
         <div class="text-center">
-          <%= paginate(@admin_jobs) %>
+          <%= paginate(@jobs) %>
         </div>
       <% end %>
 

app/views/jobs/index.html.erb

@@ -44,13 +44,13 @@
 
           <%= link_to(jobs_path(state: 'draft')) do %>
             <%= content_tag(:button, class: display_button_filter_class(params, 'draft')) do %>
-              Draft
+              My draft jobs
             <% end %>
           <% end %>
 
           <%= link_to(jobs_path(state: 'expired')) do %>
             <%= content_tag(:button, class: display_button_filter_class(params, 'expired')) do %>
-              Expired
+              My expired jobs
             <% end %>
           <% end %>
         </div>