Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venjob_thanhnd
  • 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 3
    • Merge Requests 3
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • thanhnd
  • venjob_thanhnd
  • Merge Requests
  • !2

Merged
Opened Feb 25, 2020 by thanhnd@thanhnd 
  • Report abuse
Report abuse

Design page

  • Discussion 16
  • Commits 9
  • Pipelines 4
  • Changes 20
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/assets/stylesheets/toppage.scss 0 → 100644
    1 // Place all the styles related to the toppage controller here.
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Remove this file.

      Remove this file.
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#f01b276b3aa8ab4da45f285a43aaa2c2c32c92ad_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Đổi tên controller thành kiểu TopPageController. Chú ý cách đặt tên của nhưng variable khác.

      Đổi tên controller thành kiểu `TopPageController`. Chú ý cách đặt tên của nhưng variable khác.
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    2 def index
    3 @totaljob = Job.all.count
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      @totaljob = Job.all.count => @total_job = Job.count

      `@totaljob = Job.all.count` => `@total_job = Job.count`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_3_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    2 def index
    3 @totaljob = Job.all.count
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      @totaljob = Job.all.count => @total_job = Job.count

      `@totaljob = Job.all.count` => `@total_job = Job.count`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_3_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    2 def index
    3 @totaljob = Job.all.count
    4 @latestjobs = Job.order(:last_updated).first(5)
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Di chuyên logic trên vào trong scope. EX: https://www.rubyguides.com/2019/10/scopes-in-ruby-on-rails/

      Di chuyên logic trên vào trong scope. EX: `https://www.rubyguides.com/2019/10/scopes-in-ruby-on-rails/`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_4_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    2 def index
    3 @totaljob = Job.all.count
    4 @latestjobs = Job.order(:last_updated).first(5)
    5 @topindustry = Industry.joins(:jobs).select('industries.*, COUNT(jobs.id) as jobcount').group('jobs.industry_id').order(:jobcount).last(9)
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      @topindustry => @top_industries

      `@topindustry` => `@top_industries`
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      jobcount => job_count

      `jobcount` => `job_count`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_5_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/controllers/toppage_controller.rb 0 → 100644
    1 class ToppageController < ApplicationController
    2 def index
    3 @totaljob = Job.all.count
    4 @latestjobs = Job.order(:last_updated).first(5)
    5 @topindustry = Industry.joins(:jobs).select('industries.*, COUNT(jobs.id) as jobcount').group('jobs.industry_id').order(:jobcount).last(9)
    6 @topcity = City.joins(:jobs).select('cities.*, COUNT(jobs.id) as jobcount').group('jobs.city_id').order(:jobcount).last(9)
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Di chuyên logic trên vào trong scope. EX: https://www.rubyguides.com/2019/10/scopes-in-ruby-on-rails/

      Di chuyên logic trên vào trong scope. EX: `https://www.rubyguides.com/2019/10/scopes-in-ruby-on-rails/`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#237de5288c6642cd8788fc99dbd45f425f6aa8ae_6_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/helpers/toppage_helper.rb 0 → 100644
    1 module ToppageHelper
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Nếu không sử dụng thì xóa đi.

      Nếu không sử dụng thì xóa đi.
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#6f947b958cff6c1ca67134c9e6f92e798df9ca4e_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/views/toppage/index.html.erb 0 → 100644
    1 <div id="banner" class="container p-5 my-2 bg-secondary text-white">
    2 <div class="rowtp")>
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      <div class="rowtp")> => <div class="rowtp">

      `<div class="rowtp")>` => `<div class="rowtp">`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#1d990cab238e8966268f04a0fc85e661fc61489e_2_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    app/views/toppage/index.html.erb 0 → 100644
    1 <div id="banner" class="container p-5 my-2 bg-secondary text-white">
    2 <div class="rowtp")>
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      <div class="rowtp")> => <div class="rowtp">

      `<div class="rowtp")>` => `<div class="rowtp">`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#1d990cab238e8966268f04a0fc85e661fc61489e_2_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    lib/tasks/crawler.rake
    60 60
    61 61 #insert data to Jobs table
    62 62 Job.find_or_create_by(area_id: area.id, city_id: city.id , industry_id: industry.id, company_id: company.id, job_name: title.text, salary: salary.text, deadline: deadline.text, level: level.text, experience: experience.text.strip, last_updated: updated_date.text.strip, description: description.text)
    63
    64 #industryjob = IndustryJob.find_or_create_by(industry_id: industry.industry_id , job_id: job.job_id)
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      @thanhnd fix.

      @thanhnd fix.
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#b321b772986de9dfe9db0ed4138ae166e577f241_64_67)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    test/controllers/toppage_controller_test.rb 0 → 100644
    1 require 'test_helper'
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      Những file test không sử dụng thì xóa đi.

      Những file test không sử dụng thì xóa đi.
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#689d645ab9af5cb5fbcec24565158b786ecb8fbe_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 25, 2020
    Last updated by thanhnd Feb 26, 2020
    package.json
    6 6 "@rails/activestorage": "^6.0.0",
    7 7 "@rails/ujs": "^6.0.0",
    8 8 "@rails/webpacker": "4.2.2",
    9 "bootstrap": "^4.4.1",
    10 "bootstrapp": "^0.0.0",
    • Ba Toi Dang @toidb commented Feb 25, 2020
      Master

      @thanhnd remove bootstrapp

      @thanhnd remove `bootstrapp`
    • thanhnd @thanhnd

      changed this line in version 2 of the diff

      Feb 26, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8#7030d0b2f71b999ff89a343de08c414af32fc93a_10_10)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd @thanhnd

    added 1 commit

    • d23eeafb - fix review toppage 20200226 1

    Compare with previous version

    Feb 26, 2020

    added 1 commit

    • d23eeafb - fix review toppage 20200226 1

    Compare with previous version

    added 1 commit * d23eeafb - fix review toppage 20200226 1 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4715&start_sha=b0c92715c2c4242a671e1e9f7bde172d328317f8)
    Toggle commit list
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 26, 2020
    Last updated by thanhnd Feb 26, 2020
    lib/tasks/crawler.rake
    59 59 company = Company.find_or_create_by(company_name: company_name.text, company_description: company_intro.text, address: address.text)
    60 60
    61 61 #insert data to Jobs table
    62 Job.find_or_create_by(area_id: area.id, city_id: city.id , industry_id: industry.id, company_id: company.id, job_name: title.text, salary: salary.text, deadline: deadline.text, level: level.text, experience: experience.text.strip, last_updated: updated_date.text.strip, description: description.text)
    62 job_table = Job.find_or_create_by(area_id: area.id, city_id: city.id , industry_id: industry.id, company_id: company.id, job_name: title.text, salary: salary.text, deadline: deadline.text, level: level.text, experience: experience.text.strip, last_updated: updated_date.text.strip, description: description.text)
    63
    64 #insert data to Industry_Jobs table
    65 IndustryJob.find_or_create_by(industry_id: industry.id , job_id: job_table.id)
    • Ba Toi Dang @toidb commented Feb 26, 2020
      Master
      
      unless IndustryJob.exists?(industry_id: industry.id , job_id: job_table.id)
        IndustryJob.create(industry_id: industry.id , job_id: job_table.id)
      end
      ``` unless IndustryJob.exists?(industry_id: industry.id , job_id: job_table.id) IndustryJob.create(industry_id: industry.id , job_id: job_table.id) end ```
    • thanhnd @thanhnd

      changed this line in version 3 of the diff

      Feb 26, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4716&start_sha=d23eeafbcb47dedfeed59d76172099c9d93b56ff#b321b772986de9dfe9db0ed4138ae166e577f241_65_69)
      Toggle commit list
    Please register or sign in to reply
  • Ba Toi Dang
    @toidb started a discussion on an old version of the diff Feb 26, 2020
    Last updated by thanhnd Feb 26, 2020
    lib/tasks/crawler.rake
    59 59 company = Company.find_or_create_by(company_name: company_name.text, company_description: company_intro.text, address: address.text)
    • Ba Toi Dang @toidb commented Feb 26, 2020
      Master

      city = City.find_by(area_id: area.id, city_name: city_name) if city city.update_atributes :city_description, 'Tan Binh' else city = City.create(area_id: area.id, city_name: city_name, city_description: "") end

      city = City.find_or_create_by(area_id: area.id, city_name: city_name) do |c| c.city_description = '' end

      if City.exits?(area_id: area.id, city_name: city_name) city = City.create(area_id: area.id, city_name: city_name, city_description: "") end

      city = City.find_by(area_id: area.id, city_name: city_name) if city city.update_atributes :city_description, 'Tan Binh' else city = City.create(area_id: area.id, city_name: city_name, city_description: "") end city = City.find_or_create_by(area_id: area.id, city_name: city_name) do |c| c.city_description = '' end if City.exits?(area_id: area.id, city_name: city_name) city = City.create(area_id: area.id, city_name: city_name, city_description: "") end
    • thanhnd @thanhnd

      changed this line in version 3 of the diff

      Feb 26, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4716&start_sha=d23eeafbcb47dedfeed59d76172099c9d93b56ff#b321b772986de9dfe9db0ed4138ae166e577f241_59_61)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd @thanhnd

    added 1 commit

    • a583fb3e - fix review toppage 20200226 2

    Compare with previous version

    Feb 26, 2020

    added 1 commit

    • a583fb3e - fix review toppage 20200226 2

    Compare with previous version

    added 1 commit * a583fb3e - fix review toppage 20200226 2 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/2/diffs?diff_id=4716&start_sha=d23eeafbcb47dedfeed59d76172099c9d93b56ff)
    Toggle commit list
  • Ba Toi Dang @toidb

    enabled an automatic merge when the pipeline for a583fb3e succeeds

    Feb 26, 2020

    enabled an automatic merge when the pipeline for a583fb3e succeeds

    enabled an automatic merge when the pipeline for a583fb3e4055091123cb2013f8bee7c6f0795999 succeeds
    Toggle commit list
  • Ba Toi Dang @toidb

    canceled the automatic merge

    Feb 26, 2020

    canceled the automatic merge

    canceled the automatic merge
    Toggle commit list
  • Ba Toi Dang @toidb

    mentioned in commit 8ea07e52

    Feb 26, 2020

    mentioned in commit 8ea07e52

    mentioned in commit 8ea07e52df70b55f87bf08ea553b10b848e461f4
    Toggle commit list
  • Ba Toi Dang @toidb

    merged

    Feb 26, 2020

    merged

    merged
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: thanhnd/venjob_thanhnd!2
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.