Add status

Author: tgaeta

app/controllers/job_applications_controller.rb

@@ -96,7 +96,7 @@ def set_job_application
   end
 
   def job_application_params
-    params.require(:job_application).permit(:date_applied, :company_name, :method_of_contact, :email_address, :point_of_contact, :website_link, :position_type, :position_title, :claimed_for_unemployment)
+    params.require(:job_application).permit(:date_applied, :company_name, :method_of_contact, :email_address, :point_of_contact, :website_link, :position_type, :position_title, :claimed_for_unemployment, :status)
   end
 
   def filter_and_sort_job_applications
@@ -107,6 +107,7 @@ def filter_and_sort_job_applications
     job_applications = job_applications.by_position_type(params[:position_type]) if params[:position_type].present?
     job_applications = job_applications.claimed_for_unemployment if params[:claimed_for_unemployment] == "true"
     job_applications = job_applications.not_claimed_for_unemployment if params[:claimed_for_unemployment] == "false"
+    job_applications = job_applications.by_status(params[:status]) if params[:status].present?
 
     sort_column = sort_column(params[:sort])
     sort_direction = sort_direction(params[:direction])
@@ -121,7 +122,7 @@ def filter_and_sort_job_applications
   end
 
   def sort_column(column)
-    %w[date_applied company_name position_title created_at claimed_for_unemployment].include?(column) ? column : "created_at"
+    %w[date_applied company_name position_title created_at claimed_for_unemployment status].include?(column) ? column : "created_at"
   end
 
   def sort_direction(direction)

app/models/job_application.rb

@@ -1,4 +1,6 @@
 class JobApplication < ApplicationRecord
+  attribute :status, :string
+
   validates :date_applied, :company_name, :method_of_contact, :position_type, :position_title, presence: true
   validates :email_address, presence: true, if: -> { method_of_contact == "email" }
   validates :point_of_contact, presence: true, if: -> { ["email", "phone", "recruiter", "other"].include?(method_of_contact) }
@@ -10,17 +12,39 @@ class JobApplication < ApplicationRecord
     public_suffix: true
   }
   validates :claimed_for_unemployment, inclusion: {in: [true, false]}
+  validates :status, inclusion: {in: %w[hired interviewing job_offer no_response not_hired]}
 
-  enum method_of_contact: {email: "email", phone: "phone", internet_job_application: "internet job application", recruiter: "recruiter", other: "other"}
+  enum method_of_contact: {
+    email: "email",
+    internet_job_application: "internet job application",
+    other: "other",
+    phone: "phone",
+    recruiter: "recruiter"
+  }
   enum position_type: {
     full_time: "full_time",
-    part_time: "part_time",
-    internship: "internship"
+    internship: "internship",
+    part_time: "part_time"
+  }
+  enum status: {
+    hired: "hired",
+    interviewing: "interviewing",
+    job_offer: "job offer",
+    no_response: "no response",
+    not_hired: "not hired"
   }
 
-  scope :search, ->(query) { where("company_name ILIKE ? OR position_title ILIKE ?", "%#{query}%", "%#{query}%") }
   scope :by_method_of_contact, ->(method) { where(method_of_contact: method) }
   scope :by_position_type, ->(type) { where(position_type: type) }
+  scope :by_status, ->(status) { where(status: status) }
   scope :claimed_for_unemployment, -> { where(claimed_for_unemployment: true) }
   scope :not_claimed_for_unemployment, -> { where(claimed_for_unemployment: false) }
+  scope :search, ->(query) {
+    where("company_name ILIKE :query OR
+           position_title ILIKE :query OR
+           email_address ILIKE :query OR
+           point_of_contact ILIKE :query OR
+           website_link ILIKE :query OR
+           status ILIKE :query", query: "%#{query}%")
+  }
 end

app/views/job_applications/_form.html.erb

@@ -50,11 +50,15 @@
               <%= form.label :position_title, class: 'block text-sm font-medium text-gray-700 mb-2' %>
               <%= form.text_field :position_title, class: 'shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline' %>
             </div>
-            <div class="mt-2">
-              <%= form.label :claimed_for_unemployment, class: 'flex items-center' do %>
-                <%= form.check_box :claimed_for_unemployment, class: 'h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded mr-2' %>
-                <span class="text-sm font-medium text-gray-700">Claimed for Unemployment</span>
-              <% end %>
+            <div>
+              <%= form.label :status, class: 'block text-sm font-medium text-gray-700 mb-2' %>
+              <%= form.select :status, JobApplication.statuses.keys.map { |k| [k.humanize, k] }, { include_blank: 'Select a status' }, class: 'shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline' %>
+              <div class="mt-8">
+                <%= form.label :claimed_for_unemployment, class: 'flex items-center' do %>
+                  <%= form.check_box :claimed_for_unemployment, class: 'h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded mr-2' %>
+                  <span class="text-sm font-medium text-gray-700">Claimed for Unemployment</span>
+                <% end %>
+              </div>
             </div>
           </div>
           <div class="flex items-center justify-end mt-6">

app/views/job_applications/_job_application.html.erb

@@ -23,6 +23,9 @@
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
     <%= job_application.claimed_for_unemployment ? '✔︎' : '-' %>
   </td>
+  <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    <%= job_application.status.humanize %>
+  </td>
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
     <% if job_application.website_link.present? %>
       <%= link_to 'Visit',

app/views/job_applications/_job_applications_table.html.erb

@@ -28,6 +28,9 @@
             <th class="px-5 py-3">
               <%= sort_link_to 'Claimed', 'claimed_for_unemployment' %>
             </th>
+            <th class="px-5 py-3">
+              <%= sort_link_to 'Status', 'status' %>
+            </th>
             <th class="px-5 py-3">
               Website
             </th>

app/views/job_applications/index.html.erb

@@ -19,11 +19,11 @@
     </div>
     <%= form_with url: job_applications_path, method: :get, data: { controller: "job-filter", turbo_frame: "job_applications_table" } do |form| %>
       <div class="flex flex-wrap -mx-2 mb-4">
-        <div class="w-full md:w-1/5 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/6 px-2 mb-4 md:mb-0">
           <%= form.label :search, "Search", class: "sr-only" %>
-          <%= form.text_field :search, value: params[:search], class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline", placeholder: "Search by company or position", data: { action: "input->job-filter#submit" } %>
+          <%= form.text_field :search, value: params[:search], class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline", placeholder: "Search", data: { action: "input->job-filter#submit" } %>
         </div>
-        <div class="w-full md:w-1/5 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/6 px-2 mb-4 md:mb-0">
           <%= form.label :method_of_contact, "Contact Method", class: "sr-only" %>
           <%= form.select :method_of_contact,
     options_for_select([["All Contact Methods", ""]] + JobApplication.method_of_contacts.map { |k, v| [k.humanize, v] }, params[:method_of_contact]),
@@ -32,16 +32,16 @@
     data: { action: "change->job-filter#submit" }
   %>
         </div>
-        <div class="w-full md:w-1/5 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/6 px-2 mb-4 md:mb-0">
           <%= form.label :position_type, "Position Type", class: "sr-only" %>
           <%= form.select :position_type,
-    options_for_select([["All Position Types", ""]] + JobApplication.position_types.map { |k, v| [k.humanize, v] }, params[:position_type]),
+    options_for_select([["All Position Types", ""]] + JobApplication.position_types.map { |k, v| [display_position_type(k), v] }, params[:position_type]),
     {},
     class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline",
     data: { action: "change->job-filter#submit" }
   %>
         </div>
-        <div class="w-full md:w-1/5 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/6 px-2 mb-4 md:mb-0">
           <%= form.label :claimed_for_unemployment, "Unemployment Claim", class: "sr-only" %>
           <%= form.select :claimed_for_unemployment,
     options_for_select([["All Claims", ""], ["Claimed", "true"], ["Not Claimed", "false"]], params[:claimed_for_unemployment]),
@@ -50,7 +50,16 @@
     data: { action: "change->job-filter#submit" }
   %>
         </div>
-        <div class="w-full md:w-1/5 px-2 mt-4 md:mt-0">
+        <div class="w-full md:w-1/6 px-2 mb-4 md:mb-0">
+          <%= form.label :status, "Application Status", class: "sr-only" %>
+          <%= form.select :status,
+    options_for_select([["All Statuses", ""]] + JobApplication.statuses.map { |k, v| [k.humanize, v] }, params[:status]),
+    {},
+    class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline",
+    data: { action: "change->job-filter#submit" }
+  %>
+        </div>
+        <div class="w-full md:w-1/6 px-2 mt-4 md:mt-0">
           <%= form.button "Reset Filters", type: "button", class: "w-full bg-gray-600 hover:bg-gray-700 text-white font-bold py-2 px-4 rounded cursor-pointer", data: { action: "click->job-filter#reset" } %>
         </div>
       </div>

db/migrate/20240717175130_add_status_to_job_applications.rb

@@ -0,0 +1,6 @@
+class AddStatusToJobApplications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :job_applications, :status, :string, null: false, default: "no response"
+    add_check_constraint :job_applications, "status IN ('interviewing', 'no response', 'hired', 'not hired', 'job offer')", name: "check_valid_status"
+  end
+end

db/schema.rb

@@ -15,6 +15,7 @@
     position_type: %w[full_time part_time internship].sample,
     position_title: Faker::Job.title,
     website_link: website_link,
-    claimed_for_unemployment: [true, false].sample
+    claimed_for_unemployment: [true, false].sample,
+    status: %w[interviewing no_response not_hired job_offer].sample
   )
 end