Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Tô Ngọc Ánh
  • VeNJob
  • Merge Requests
  • !9

Merged
Opened Aug 04, 2020 by Tô Ngọc Ánh@anhtn 
  • Report abuse
Report abuse

ID4 Create Job List

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b id4-job-list origin/id4-job-list

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff id4-job-list

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 14
  • Commits 9
  • Pipelines 6
  • Changes 31
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 04, 2020
    Resolved by Tô Ngọc Ánh Aug 05, 2020
    config/database.yml
    52 52 database: VeNJob_AnhTN_production
    53 53 username: VeNJob_AnhTN
    54 54 password: <%= ENV['VENJOB_ANHTN_DATABASE_PASSWORD'] %>
    55 url: <%= ENV['JAWSDB_URL'] %>
    • Thanh Hung Pham @hungpt commented Aug 04, 2020
      Master

      @anhtn Có cái này dùng để làm gì vậy em?

      Edited Aug 05, 2020
      @anhtn Có cái này dùng để làm gì vậy em?
    • Tô Ngọc Ánh @anhtn commented Aug 05, 2020
      Master

      DB để xài trên heroku á a

      Edited Aug 05, 2020
      DB để xài trên heroku á a
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 04, 2020
    Resolved by Tô Ngọc Ánh Aug 05, 2020
    app/controllers/jobs_controller.rb 0 → 100644
    4 results(location)
    5 end
    6
    7 def industry_job
    8 industry = Industry.find_by_id(params[:id])
    9 results(industry)
    10 end
    11
    12 def search
    13 end
    14
    15 private
    16
    17 def results(object)
    18 @keyword = object.try(:name) || object.try(:city)
    19 @jobs = object.jobs.all.page(params[:page]).per(20)
    • Thanh Hung Pham @hungpt commented Aug 04, 2020
      Master

      @anhtn 20 nên đặt constant nha em!

      Edited Aug 05, 2020
      @anhtn `20` nên đặt constant nha em!
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Aug 05, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4947&start_sha=afb60e6edac2641aebe8c014bbfde2477606c4fb#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_19_2)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 04, 2020
    Resolved by Tô Ngọc Ánh Aug 06, 2020
    app/views/jobs/_job.html.erb 0 → 100644
    1 <div class='card flex-md-row align-items-center my-2'>
    2 <div class='card-body'>
    3 <%= link_to job.title, '#', class: 'card-title font-weight-bold text-decoration-none' %>
    4 <p class='card-text'><%= job.company.name %></p>
    5 <p class='mb-0'>
    6 <strong>Work place:</strong>
    7 <% job.locations.each do |location| %>
    8 <%= location.city %>
    9 <% end %>
    10 <strong>Salary: </strong><%= job.salary %>
    11 </p>
    12 <p class='card-text'><%= strip_tags(job.description).truncate_words(40) %></p>
    • Thanh Hung Pham @hungpt commented Aug 04, 2020
      Master

      @anhtn 40 nên để constant. Mà requiment là 250 words mà em.

      Edited Aug 05, 2020
      @anhtn `40` nên để constant. Mà requiment là `250 words` mà em.
    • Tô Ngọc Ánh @anhtn commented Aug 05, 2020
      Master

      tại 250 nó dài quá nên e để ngắn lại

      Edited Aug 05, 2020
      tại 250 nó dài quá nên e để ngắn lại
    • Thanh Hung Pham @hungpt commented Aug 05, 2020
      Master

      @anhtn Làm theo yêu cầu nha em.

      Edited Aug 06, 2020
      @anhtn Làm theo yêu cầu nha em.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Aug 05, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4947&start_sha=afb60e6edac2641aebe8c014bbfde2477606c4fb#3a65b6282b2c0dfc59d28a9582bd4fead753acc8_12_11)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 04, 2020
    Resolved by Tô Ngọc Ánh Aug 05, 2020
    app/views/home/index.html.erb
    1 1 <div class='banner_top'>
    2 <%= image_tag 'venjob-banner',class: 'banner_img'%>
    2 <%= image_tag 'venjob-banner.jpg',class: 'banner_img'%>
    • Thanh Hung Pham @hungpt commented Aug 04, 2020
      Master

      @anhtn Chỗ này thêm đuôi .jpg vào chi vậy em?

      Edited Aug 05, 2020
      @anhtn Chỗ này thêm đuôi `.jpg` vào chi vậy em?
    • Tô Ngọc Ánh @anhtn commented Aug 05, 2020
      Master

      k có đuôi khi deploy heroku bị lỗi a

      Edited Aug 05, 2020
      k có đuôi khi deploy heroku bị lỗi a
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 04, 2020
    Resolved by Tô Ngọc Ánh Aug 05, 2020
    app/views/kaminari/_first_page.html.erb 0 → 100644
    1 <li class="page-item">
    • Thanh Hung Pham @hungpt commented Aug 04, 2020
      Master

      @anhtn Cái này em tự custom lại hay dùng default ấy ?

      Edited Aug 05, 2020
      @anhtn Cái này em tự custom lại hay dùng default ấy ?
    • Tô Ngọc Ánh @anhtn commented Aug 05, 2020
      Master

      mấy này e xài của kaminari có sẵn

      Edited Aug 05, 2020
      mấy này e xài của kaminari có sẵn
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Aug 05, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 2 commits

    • f1070925 - refactor code
    • 9ca3a5e6 - create slug for location, industry

    Compare with previous version

    Aug 05, 2020

    added 2 commits

    • f1070925 - refactor code
    • 9ca3a5e6 - create slug for location, industry

    Compare with previous version

    added 2 commits * f1070925 - refactor code * 9ca3a5e6 - create slug for location, industry [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4947&start_sha=afb60e6edac2641aebe8c014bbfde2477606c4fb)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Aug 05, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • d1105e30 - rake create slug

    Compare with previous version

    Aug 05, 2020

    added 1 commit

    • d1105e30 - rake create slug

    Compare with previous version

    added 1 commit * d1105e30 - rake create slug [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4953&start_sha=9ca3a5e65378ef97e2b5595a805b7a37e98a4253)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 84915250 - change name job_list view to index

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • 84915250 - change name job_list view to index

    Compare with previous version

    added 1 commit * 84915250 - change name job_list view to index [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4954&start_sha=d1105e3006f9f18108aab1e8fd9d910d068483a0)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Resolved by Tô Ngọc Ánh Aug 06, 2020
    app/models/industry.rb
    1 require './lib/common/convert_slug'
    2
    1 3 class Industry < ApplicationRecord
    4 include ConvertSlug
    5
    2 6 scope :with_count_job, -> { joins(:jobs).group(:industry_id).select('industries.*, count(jobs.id) as job_count') }
    3 7 scope :top_industries, ->(number) { with_count_job.order(Arel.sql('job_count DESC')).limit(number) }
    8
    4 9 has_and_belongs_to_many :jobs
    10
    11 before_save :add_slug
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Cái này lúc nào save nó cũng chạy hả em? Giả sử slug có rồi, hay dữ liệu không thay đổi gì thì sao em?

      Edited Aug 06, 2020
      @anhtn Cái này lúc nào `save` nó cũng chạy hả em? Giả sử `slug` có rồi, hay dữ liệu không thay đổi gì thì sao em?
    • Tô Ngọc Ánh @anhtn

      changed this line in version 5 of the diff

      Aug 06, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4959&start_sha=8491525026108d02e0c6cc4fa14907b8a1601e7e#6fd7ec4bda80a3376d591b3e766bce8bf035c4c6_11_11)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Resolved by Tô Ngọc Ánh Aug 06, 2020
    lib/tasks/create_slug.rake 0 → 100644
    1 namespace :create_slug do
    2 desc 'Create slug model Location'
    3 task locations: :environment do
    4 Location.all.each do |location|
    5 location.update_attributes(slug: "")
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Ủa sao phải update cho nó rỗng em? Update giá trị mới cho nó luôn đi.

      Edited Aug 06, 2020
      @anhtn Ủa sao phải update cho nó rỗng em? Update giá trị mới cho nó luôn đi.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 5 of the diff

      Aug 06, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4959&start_sha=8491525026108d02e0c6cc4fa14907b8a1601e7e#7ad8f486c8e626a45baed0e7350dbffe71652595_5_5)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Resolved by Tô Ngọc Ánh Aug 06, 2020
    app/views/jobs/_job.html.erb 0 → 100644
    1 <div class='card flex-md-row align-items-center my-2'>
    2 <div class='card-body'>
    3 <%= link_to job.title, '#', class: 'card-title font-weight-bold text-decoration-none' %>
    4 <p class='card-text'><%= job.company.name %></p>
    5 <p class='mb-0'>
    6 <strong>Work place:</strong>
    7 <% job.locations.each do |location| %>
    8 <%= location.city %>
    9 <% end %>
    10 </p>
    11 <p><strong>Salary: </strong><%= job.salary %></p>
    12 <p class='card-text'><%= strip_tags(job.description).truncate(250) %></p>
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Lại quên đặt constant hả em?

      Edited Aug 06, 2020 by Thanh Hung Pham
      @anhtn Lại quên đặt constant hả em?
    • Tô Ngọc Ánh @anhtn commented Aug 06, 2020
      Master

      trong view cũng đặt constant luôn hả a

      Edited Aug 06, 2020
      trong view cũng đặt constant luôn hả a
    • Tô Ngọc Ánh @anhtn

      changed this line in version 5 of the diff

      Aug 06, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4959&start_sha=8491525026108d02e0c6cc4fa14907b8a1601e7e#3a65b6282b2c0dfc59d28a9582bd4fead753acc8_12_12)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 831d463f - Fix slug

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • 831d463f - Fix slug

    Compare with previous version

    added 1 commit * 831d463f - Fix slug [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4959&start_sha=8491525026108d02e0c6cc4fa14907b8a1601e7e)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 4299f1aa - add strip to company in csv

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • 4299f1aa - add strip to company in csv

    Compare with previous version

    added 1 commit * 4299f1aa - add strip to company in csv [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/9/diffs?diff_id=4961&start_sha=831d463fe5e1acef65d6b8e974365f4088d6bfa6)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Aug 06, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    mentioned in commit 9e711633

    Aug 06, 2020

    mentioned in commit 9e711633

    mentioned in commit 9e711633c3554f15be2fdbf139961b261b7daffa
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    merged

    Aug 06, 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: anhtn/VeNJob!9
×

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.