Skip to content

V
VenJob
Commit 4864e811 by Đường Sỹ Hoàng
Options

Fixed scss & cityjob model

parent cfd5dba8
Showing with 2 additions and 10 deletions
app/assets/javascripts/bootstrap.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/stylesheets/bootstrap.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/stylesheets/custom.scss
...@@ -46,11 +46,6 @@ h1, h2, h3, h4, h5, h6 { ...@@ -46,11 +46,6 @@ h1, h2, h3, h4, h5, h6 {
background: #01548c; background: #01548c;
} }
.count-total {
margin-right: 500px;
margin-left: 500px;
}
.col { .col {
padding: 5px; padding: 5px;
margin: 5px; margin: 5px;
...@@ -70,6 +65,5 @@ h1, h2, h3, h4, h5, h6 { ...@@ -70,6 +65,5 @@ h1, h2, h3, h4, h5, h6 {
} }
.form-inline-city { .form-inline-city {
margin-left: 1000px;
padding: 5px; padding: 5px;
} }
app/views/top/index.html.erb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<head> <head>
<title><%= yield(:title) %> Venjob</title> <title><%= yield(:title) %> Venjob</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<div class="count-total"> <div class="text-center">
<h4>Total Jobs:<%= Job.count %></h4> <h4>Total Jobs:<%= Job.count %></h4>
</div> </div>
</head> </head>
......
lib/tasks/import_job_csv.rake
...@@ -25,9 +25,7 @@ require "csv" ...@@ -25,9 +25,7 @@ require "csv"
city_params = { region: row["work place"] } city_params = { region: row["work place"] }
city = City.find_or_initialize_by(name: row["company province"]) city = City.find_or_initialize_by(name: row["company province"])
city.update(city_params) city.update(city_params)
city_job_params = { city_id: city.id } CityJob.find_or_create_by(job_id: job.id, city_id: city.id)
city_job = CityJob.find_or_initialize_by(job_id: job.id)
city_job.update(city_job_params)
rescue rescue
import_logger = ActiveSupport::Logger.new("log/import.log") import_logger = ActiveSupport::Logger.new("log/import.log")
import_logger.error "Skip #{row}" import_logger.error "Skip #{row}"
......
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