Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
venjob
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Huỳnh Thiên Phước
venjob
Commits
a08b33ca
Commit
a08b33ca
authored
Aug 04, 2020
by
Huỳnh Thiên Phước
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code in Controller
parent
dc54f45e
Pipeline
#801
failed with stages
in 0 seconds
Changes
7
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
11 deletions
+19
-11
app/controllers/cities_controller.rb
+2
-2
app/controllers/jobs_controller.rb
+2
-0
app/models/city.rb
+2
-3
app/views/cities/_international.html.erb
+0
-0
app/views/cities/_vietnam.html.erb
+0
-0
app/views/cities/index.html.erb
+8
-4
app/views/jobs/index.html.erb
+5
-2
No files found.
app/controllers/cities_controller.rb
View file @
a08b33ca
class
CitiesController
<
ApplicationController
class
CitiesController
<
ApplicationController
def
index
def
index
@cities_vietnam
=
City
.
all_city
.
vietnam
@cities_vietnam
=
City
.
vietnam
@cities_international
=
City
.
all_city
.
international
@cities_international
=
City
.
international
end
end
end
end
app/controllers/jobs_controller.rb
View file @
a08b33ca
...
@@ -2,5 +2,7 @@ class JobsController < ApplicationController
...
@@ -2,5 +2,7 @@ class JobsController < ApplicationController
def
index
def
index
@total_job
=
Job
.
count
@total_job
=
Job
.
count
@jobs_list
=
Job
.
all_job
@jobs_list
=
Job
.
all_job
@cities
=
City
.
all
@industries
=
Industry
.
all
end
end
end
end
app/models/city.rb
View file @
a08b33ca
...
@@ -3,7 +3,6 @@ class City < ApplicationRecord
...
@@ -3,7 +3,6 @@ class City < ApplicationRecord
has_many
:jobs
,
through: :city_jobs
has_many
:jobs
,
through: :city_jobs
scope
:top_city
,
->
{
joins
(
:jobs
).
group
(
:city_id
).
order
(
'count(job_id) DESC'
).
limit
(
9
)
}
scope
:top_city
,
->
{
joins
(
:jobs
).
group
(
:city_id
).
order
(
'count(job_id) DESC'
).
limit
(
9
)
}
scope
:all_city
,
->
{
joins
(
:jobs
).
group
(
:city_id
).
order
(
'count(job_id) DESC'
)
}
scope
:vietnam
,
->
{
joins
(
:jobs
).
group
(
:city_id
).
order
(
'count(job_id) DESC'
).
where
(
'location = 1'
)
}
scope
:vietnam
,
->
{
where
(
'location = 1'
)
}
scope
:international
,
->
{
joins
(
:jobs
).
group
(
:city_id
).
order
(
'count(job_id) DESC'
).
where
(
'location = 0'
)
}
scope
:international
,
->
{
where
(
'location = 0'
)
}
end
end
app/views/cities/_
cities_
international.html.erb
→
app/views/cities/_international.html.erb
View file @
a08b33ca
File moved
app/views/cities/_
cities_
vietnam.html.erb
→
app/views/cities/_vietnam.html.erb
View file @
a08b33ca
File moved
app/views/cities/index.html.erb
View file @
a08b33ca
...
@@ -4,23 +4,27 @@
...
@@ -4,23 +4,27 @@
<div
class=
"city-banner rounded"
>
City List
</div>
<div
class=
"city-banner rounded"
>
City List
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
<div
class=
"row-table border border-dark rounded viet-nam"
>
Việt Nam
</div>
<div
class=
"row-table border border-dark rounded viet-nam"
>
<strong>
Việt Nam
</strong>
</div>
</div>
</div>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
<div
class=
"row-table border border-dark rounded international"
>
International
</div>
<div
class=
"row-table border border-dark rounded international"
>
<strong>
International
</strong>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"city-banner rounded vietnam-area"
>
Việt Nam
</div>
<div
class=
"city-banner rounded vietnam-area"
>
Việt Nam
</div>
<div
class=
"city-vietnam"
>
<div
class=
"city-vietnam"
>
<div
class=
"row"
>
<div
class=
"row"
>
<%=
render
partial:
"
cities_
vietnam"
,
collection:
@cities_vietnam
,
as: :city
%>
<%=
render
partial:
"vietnam"
,
collection:
@cities_vietnam
,
as: :city
%>
</div>
</div>
</div>
</div>
<div
class=
"city-banner rounded international-area"
>
International
</div>
<div
class=
"city-banner rounded international-area"
>
International
</div>
<div
class=
"city-international"
>
<div
class=
"city-international"
>
<div
class=
"row"
>
<div
class=
"row"
>
<%=
render
partial:
"
cities_
international"
,
collection:
@cities_international
,
as: :city
%>
<%=
render
partial:
"international"
,
collection:
@cities_international
,
as: :city
%>
</div>
</div>
</div>
</div>
</div>
</div>
app/views/jobs/index.html.erb
View file @
a08b33ca
<%
provide
(
:title
,
'Jobs'
)
%>
<%
provide
(
:title
,
'Jobs'
)
%>
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"search-bar"
>
<%=
render
'layouts/search_bar'
%>
</div>
<div
class=
"row total-jobs"
>
<div
class=
"row total-jobs"
>
<div
class=
"col-4"
>
Total:
<%=
@total_job
%>
jobs
</div>
<div
class=
"col-4"
>
<strong>
Total:
<%=
@total_job
%>
jobs
</strong>
</div>
<div
class=
"col-4"
>
Result for: ... jobs
</div>
<div
class=
"col-4"
>
<strong>
Result for: ... jobs
</strong>
</div>
</div>
</div>
<div
class=
"job-list"
>
<div
class=
"job-list"
>
<%=
render
partial:
"all_jobs"
,
collection:
@jobs_list
,
as: :job
%>
<%=
render
partial:
"all_jobs"
,
collection:
@jobs_list
,
as: :job
%>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment