@@ -96,18 +96,19 @@ def set_job_application
9696 end
9797
9898 def job_application_params
99- 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 )
99+ 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 , :location )
100100 end
101101
102102 def filter_and_sort_job_applications
103103 job_applications = JobApplication . all
104104
105105 job_applications = job_applications . search ( params [ :search ] ) if params [ :search ] . present?
106+ job_applications = job_applications . by_location ( params [ :location ] ) if params [ :location ] . present?
106107 job_applications = job_applications . by_method_of_contact ( params [ :method_of_contact ] ) if params [ :method_of_contact ] . present?
107108 job_applications = job_applications . by_position_type ( params [ :position_type ] ) if params [ :position_type ] . present?
109+ job_applications = job_applications . by_status ( params [ :status ] ) if params [ :status ] . present?
108110 job_applications = job_applications . claimed_for_unemployment if params [ :claimed_for_unemployment ] == "true"
109111 job_applications = job_applications . not_claimed_for_unemployment if params [ :claimed_for_unemployment ] == "false"
110- job_applications = job_applications . by_status ( params [ :status ] ) if params [ :status ] . present?
111112
112113 sort_column = sort_column ( params [ :sort ] )
113114 sort_direction = sort_direction ( params [ :direction ] )
@@ -122,7 +123,7 @@ def filter_and_sort_job_applications
122123 end
123124
124125 def sort_column ( column )
125- %w[ date_applied company_name position_title created_at claimed_for_unemployment status ] . include? ( column ) ? column : "created_at"
126+ %w[ date_applied company_name position_title created_at claimed_for_unemployment location status ] . include? ( column ) ? column : "created_at"
126127 end
127128
128129 def sort_direction ( direction )
0 commit comments