Add unemployment check, fix styles and seeds.

tgaeta · tgaeta · commit 64915bf909dc · 2024-07-17T13:49:17.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -19,6 +19,7 @@ gem "validate_url", "~> 1.0"
 gem "rexml", ">= 3.3.2"
 
 group :development, :test do
+  gem "byebug", "~> 11.1", ">= 11.1.3"
   gem "debug", "~> 1.9", ">= 1.9.2", platforms: %i[mri windows]
   gem "dotenv", "~> 3.1", ">= 3.1.2"
   gem "factory_bot_rails", "~> 6.4", ">= 6.4.3"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -98,6 +98,7 @@ GEM
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
+    byebug (11.1.3)
     childprocess (5.0.0)
     colorize (1.1.0)
     concurrent-ruby (1.2.3)
@@ -351,6 +352,7 @@ DEPENDENCIES
   bootsnap (~> 1.18, >= 1.18.3)
   brakeman
   bundler-audit (~> 0.9.1)
+  byebug (~> 11.1, >= 11.1.3)
   colorize (~> 1.1)
   debug (~> 1.9, >= 1.9.2)
   devise (~> 4.9)
diff --git a/app/controllers/job_applications_controller.rb b/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)
+    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)
   end
 
   def filter_and_sort_job_applications
@@ -105,6 +105,8 @@ def filter_and_sort_job_applications
     job_applications = job_applications.search(params[:search]) if params[:search].present?
     job_applications = job_applications.by_method_of_contact(params[:method_of_contact]) if params[:method_of_contact].present?
     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"
 
     sort_column = sort_column(params[:sort])
     sort_direction = sort_direction(params[:direction])
@@ -119,7 +121,7 @@ def filter_and_sort_job_applications
   end
 
   def sort_column(column)
-    %w[date_applied company_name position_title created_at].include?(column) ? column : "created_at"
+    %w[date_applied company_name position_title created_at claimed_for_unemployment].include?(column) ? column : "created_at"
   end
 
   def sort_direction(direction)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -32,14 +32,31 @@ def progress_bar_class(type)
   end
 
   def sort_link_to(name, column)
-    direction = (column.to_s == params[:sort] && params[:direction] == "asc") ? "desc" : "asc"
-    link_to name,
-      request.params.merge(sort: column, direction: direction),
-      class: "text-gray-600 hover:text-gray-900",
+    current_column = params[:sort]
+    current_direction = params[:direction]
+
+    is_current_column = column.to_s == current_column
+    next_direction = (is_current_column && current_direction == "asc") ? "desc" : "asc"
+
+    icon = if is_current_column
+      (current_direction == "asc") ? "↑" : "↓"
+    else
+      ""
+    end
+
+    link_to request.params.merge(sort: column, direction: next_direction),
+      class: "text-gray-600 hover:text-gray-900 inline-flex items-center",
       data: {
         turbo_frame: "job_applications_table",
         turbo_action: "replace"
-      }
+      } do
+      content_tag(:span, class: "flex items-center") do
+        safe_join([
+          content_tag(:span, name, class: "mr-1"),
+          content_tag(:span, icon, class: "sort-icon")
+        ])
+      end
+    end
   end
 
   def safe_url(url)
diff --git a/app/helpers/job_applications_helper.rb b/app/helpers/job_applications_helper.rb
@@ -1,2 +1,11 @@
 module JobApplicationsHelper
+  def display_position_type(position_type)
+    case position_type
+    when "full_time" then "Full-time"
+    when "part_time" then "Part-time"
+    when "internship" then "Internship"
+    else
+      position_type
+    end
+  end
 end
diff --git a/app/models/job_application.rb b/app/models/job_application.rb
@@ -9,10 +9,18 @@ class JobApplication < ApplicationRecord
     no_local: true,
     public_suffix: true
   }
+  validates :claimed_for_unemployment, inclusion: {in: [true, false]}
+
   enum method_of_contact: {email: "email", phone: "phone", internet_job_application: "internet job application", recruiter: "recruiter", other: "other"}
-  enum position_type: {full_time: "full-time", part_time: "part-time", internship: "internship"}
+  enum position_type: {
+    full_time: "full_time",
+    part_time: "part_time",
+    internship: "internship"
+  }
 
   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 :claimed_for_unemployment, -> { where(claimed_for_unemployment: true) }
+  scope :not_claimed_for_unemployment, -> { where(claimed_for_unemployment: false) }
 end
diff --git a/app/views/job_applications/_form.html.erb b/app/views/job_applications/_form.html.erb
@@ -44,12 +44,18 @@
             </div>
             <div>
               <%= form.label :position_type, class: 'block text-sm font-medium text-gray-700 mb-2' %>
-              <%= form.select :position_type, JobApplication.position_types.keys.map { |k| [k.humanize, k] }, { include_blank: 'Select a type' }, class: 'shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline' %>
+              <%= form.select :position_type, JobApplication.position_types.keys.map { |k| [display_position_type(k), k] }, { include_blank: 'Select a type' }, 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>
               <%= 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>
           </div>
           <div class="flex items-center justify-end mt-6">
             <%= link_to 'Cancel', root_path, class: 'bg-gray-500 hover:bg-gray-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline mr-2', data: { turbo_frame: "_top" } %>
diff --git a/app/views/job_applications/_job_application.html.erb b/app/views/job_applications/_job_application.html.erb
@@ -1,4 +1,4 @@
-<tr id="<%= dom_id(job_application) %>">
+<tr class="h-20" id="<%= dom_id(job_application) %>">
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
     <%= job_application.date_applied.strftime('%m/%d/%Y') %>
   </td>
@@ -9,17 +9,20 @@
     <%= job_application.position_title %>
   </td>
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-    <%= job_application.position_type.humanize %>
+    <%= display_position_type(job_application.position_type) %>
   </td>
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
     <%= job_application.method_of_contact.humanize %>
   </td>
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-    <%= job_application.point_of_contact || '-' %>
+    <%= job_application.point_of_contact.present? ? job_application.point_of_contact : '-' %>
   </td>
   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
     <%= job_application.email_address.present? ? job_application.email_address : '-' %>
   </td>
+  <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">
     <% if job_application.website_link.present? %>
       <%= link_to 'Visit',
diff --git a/app/views/job_applications/_job_applications_table.html.erb b/app/views/job_applications/_job_applications_table.html.erb
@@ -1,52 +1,54 @@
 <%= turbo_frame_tag "job_applications_table" do %>
   <div class="overflow-x-auto bg-white shadow-md rounded-lg">
     <% if @job_applications.any? %>
-      <table class="min-w-full leading-normal">
-        <thead class="text-xs">
+      <table class="w-full">
+        <thead class="text-xs bg-gray-100 text-left font-semibold text-gray-600 w-8 border-b-2">
           <tr>
-            <tr>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                <%= sort_link_to 'Date Applied', 'date_applied' %>
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                <%= sort_link_to 'Company Name', 'company_name' %>
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                <%= sort_link_to 'Position', 'position_title' %>
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                Type
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                Contact Method
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                P.o.C.
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                Email
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                Website
-              </th>
-              <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left font-semibold text-gray-600 tracking-wider">
-                Actions
-              </th>
-            </tr>
-          </thead>
-          <tbody id="job_applications">
-            <%= render partial: 'job_application', collection: job_applications %>
-          </tbody>
-        </table>
-      <% else %>
-        <div class="text-center py-10">
-          <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
-            <path vector-effect="non-scaling-stroke" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 13h6m-3-3v6m-9 1V7a2 2 0 012-2h6l2 2h6a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2z" />
-          </svg>
-          <p class="mt-1 text-sm text-gray-500">
-            <%= "No results match your search criteria." if params[:search].present? || params[:method_of_contact].present? || params[:position_type].present? %>
-          </p>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
+            <th class="px-5 py-3 w-8">
+              <%= sort_link_to 'Applied', 'date_applied' %>
+            </th>
+            <th class="px-5 py-3 w-48">
+              <%= sort_link_to 'Company', 'company_name' %>
+            </th>
+            <th class="px-5 py-3 w-48">
+              <%= sort_link_to 'Position', 'position_title' %>
+            </th>
+            <th class="px-5 py-3">
+              Type
+            </th>
+            <th class="px-5 py-3 w-48">
+              Contact Method
+            </th>
+            <th class="px-5 py-3 w-48">
+              P.o.C.
+            </th>
+            <th class="px-5 py-3 w-96">
+              Email
+            </th>
+            <th class="px-5 py-3">
+              <%= sort_link_to 'Claimed', 'claimed_for_unemployment' %>
+            </th>
+            <th class="px-5 py-3">
+              Website
+            </th>
+            <th class="px-5 py-3">
+              Actions
+            </th>
+          </tr>
+        </thead>
+        <tbody id="job_applications">
+          <%= render partial: 'job_application', collection: job_applications %>
+        </tbody>
+      </table>
+    <% else %>
+      <div class="text-center py-10">
+        <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
+          <path vector-effect="non-scaling-stroke" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 13h6m-3-3v6m-9 1V7a2 2 0 012-2h6l2 2h6a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2z" />
+        </svg>
+        <p class="mt-1 text-sm text-gray-500">
+          <%= "No results match your search criteria." if params[:search].present? || params[:method_of_contact].present? || params[:position_type].present? %>
+        </p>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/job_applications/_pagination.html.erb b/app/views/job_applications/_pagination.html.erb
@@ -1,19 +1,17 @@
-<div class="fixed bottom-0 left-0 w-full z-50">
-  <% if @pagination_info[:total_pages] > 1 %>
-    <div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6 shadow appearance-none rounded w-full text-gray-700 leading-tight focus:outline-none focus:shadow-outline">
-      <div class="text-sm text-gray-700">
-      </div>
-      <div>
-        <%= will_paginate @job_applications,
-                                renderer: CustomPaginationRenderer,
-                                previous_label: 'Previous',
-                                next_label: 'Next',
-                                inner_window: 0,
-                                outer_window: 0,
-                                class: 'pagination',
-                                previous_page_class: 'px-3 py-1 rounded-md text-sm font-medium text-gray-700 bg-white border border-gray-300 hover:bg-gray-50',
-                                next_page_class: 'px-3 py-1 rounded-md text-sm font-medium text-gray-700 bg-white border border-gray-300 hover:bg-gray-50' %>
-      </div>
+<% if @pagination_info[:total_pages] > 1 %>
+  <div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6 shadow appearance-none border rounded w-full text-gray-700 leading-tight focus:outline-none focus:shadow-outline">
+    <div class="text-sm text-gray-700">
     </div>
-  <% end %>
-</div>
+    <div>
+      <%= will_paginate @job_applications,
+                              renderer: CustomPaginationRenderer,
+                              previous_label: 'Previous',
+                              next_label: 'Next',
+                              inner_window: 0,
+                              outer_window: 0,
+                              class: 'pagination',
+                              previous_page_class: 'px-3 py-1 rounded-md text-sm font-medium text-gray-700 bg-white border border-gray-300 hover:bg-gray-50',
+                              next_page_class: 'px-3 py-1 rounded-md text-sm font-medium text-gray-700 bg-white border border-gray-300 hover:bg-gray-50' %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/job_applications/index.html.erb b/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/4 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/5 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" } %>
         </div>
-        <div class="w-full md:w-1/4 px-2 mb-4 md:mb-0">
+        <div class="w-full md:w-1/5 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,7 +32,7 @@
     data: { action: "change->job-filter#submit" }
   %>
         </div>
-        <div class="w-full md:w-1/4 px-2">
+        <div class="w-full md:w-1/5 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]),
@@ -41,7 +41,16 @@
     data: { action: "change->job-filter#submit" }
   %>
         </div>
-        <div class="w-full md:w-1/4 px-2 mt-4 md:mt-0">
+        <div class="w-full md:w-1/5 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]),
+    {},
+    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 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>
diff --git a/db/migrate/20240717162540_add_unemployment_claim_and_cover_letter_to_job_applications.rb b/db/migrate/20240717162540_add_unemployment_claim_and_cover_letter_to_job_applications.rb
@@ -0,0 +1,5 @@
+class AddUnemploymentClaimAndCoverLetterToJobApplications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :job_applications, :claimed_for_unemployment, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -14,6 +14,7 @@
     point_of_contact: Faker::Name.name,
     position_type: %w[full_time part_time internship].sample,
     position_title: Faker::Job.title,
-    website_link: website_link
+    website_link: website_link,
+    claimed_for_unemployment: [true, false].sample
   )
 end
