change logic city

parent dee59177
class CitiesController < ApplicationController
def index
@cities_vietnam = City.vietnam
@cities_international = City.international
@cities_vietnam = City.location(1)
@cities_international = City.location(0)
end
end
......@@ -4,8 +4,7 @@ class City < ApplicationRecord
has_many :jobs, through: :city_jobs
scope :top_city, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').limit(9) }
scope :vietnam, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').where('location = 1') }
scope :international, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').where('location = 0') }
scope :location, ->(number) { joins(:jobs).group(:city_id).order('count(job_id) DESC').where(location: number) }
def convert_city
converted_name = Convert.to_convert("#{name}")
......
......@@ -14,13 +14,13 @@
<div class="city-banner rounded vietnam-area">Việt Nam</div>
<div class="city-vietnam">
<div class="row">
<%= render partial: "city_vietnam", collection: @cities_vietnam, as: :city %>
<%= render partial: "vietnam", collection: @cities_vietnam, as: :city %>
</div>
</div>
<div class="city-banner rounded international-area">International</div>
<div class="city-international">
<div class="row">
<%= render partial: "city_international", collection: @cities_international, as: :city %>
<%= render partial: "international", collection: @cities_international, as: :city %>
</div>
</div>
</div>
......@@ -3,7 +3,7 @@
<div class="all-industries">
<div class="industry-banner rounded">Industry List</div>
<div class="row">
<%= render partial: "all_industry", collection: @industries, as: :industry %>
<%= render partial: "industry", collection: @industries, as: :industry %>
</div>
</div>
</div>
......@@ -8,7 +8,7 @@
</div>
<%= render "jobs/pagination" %>
<div class="job-list">
<%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
<%= render partial: "job", collection: @jobs_list, as: :job %>
</div>
<%= render "jobs/pagination" %>
</div>
......@@ -8,7 +8,7 @@
</div>
<%= render "jobs/pagination" %>
<div class="job-list">
<%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
<%= render partial: "job", collection: @jobs_list, as: :job %>
</div>
<%= render "jobs/pagination" %>
</div>
......@@ -8,7 +8,7 @@
</div>
<%= render "jobs/pagination" %>
<div class="job-list">
<%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
<%= render partial: "job", collection: @jobs_list, as: :job %>
</div>
<%= render "jobs/pagination" %>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment