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 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Nguyen Ngoc Nghia
  • VeNJOB
  • Merge Requests
  • !15

Merged
Opened Dec 18, 2019 by Nguyen Ngoc Nghia@nghiann 
  • Report abuse
Report abuse

Feature/job list page

  • Display all jobs in database, which paginated by 20 per page.
  • Display location based on each job.
  • Display 5 latest jobs order by updated_at.
  • City/industry page has linked to Job list page (also on top page). top_page_link_to_job_list_page Screenshot_from_2019-12-19_08-42-01
Edited Dec 19, 2019 by Nguyen Ngoc Nghia
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/job_list_page origin/feature/job_list_page

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 feature/job_list_page

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 9
  • Commits 13
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • e653bf98 - delete unused files

    Compare with previous version

    Dec 18, 2019

    added 1 commit

    • e653bf98 - delete unused files

    Compare with previous version

    added 1 commit * e653bf98 - delete unused files [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4503&start_sha=0003b4626d31c150e18fafd38cbb2d9d650e8411)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 18, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 18, 2019
    app/views/industries/_industry.html.erb
    1 1 <div class="col-md-3">
    2 2 <div class="col-show">
    3 <%= industry.name %> (<%= (industry.job_count) %>)
    3 <%= link_to industry.name, jobs_path %> (<%= (industry.job_count) %>)
    • Van Hau Le @haulv commented Dec 18, 2019
      Master

      @nghiann đưa cái job count vào với industry name luôn đi em!

      @nghiann đưa cái `job count` vào với `industry name` luôn đi em!
    • Van Hau Le @haulv commented Dec 18, 2019
      Master

      @nghiann tương tự cho phần city

      @nghiann tương tự cho phần city
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 18, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4509&start_sha=e653bf98bf5c232e1c8f7a8578d3c2aa85c101d6#759f2125c06eb65fc6da7108a5ebda0a4631cbcc_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 18, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 18, 2019
    app/views/jobs/_job.html.erb
    2 <div class="job_data">
    3 <dl class="job_data_row">
    4 <dt>Title</dt>
    5 <dd><%= job.title %></dd>
    6 </dl>
    7 <dl class="job_data_row">
    8 <dt>Short description</dt>
    9 <dd><%= truncate(job.short_des, length: 250) %></dd>
    10 </dl>
    11 <dl class="job_data_row">
    12 <dt>Salary</dt>
    13 <dd><%= job.salary %></dd>
    14 </dl>
    15 <dl class="job_data_row">
    16 <dt>Location</dt>
    17 <dd><%= job.cities.first.name %></dd>
    • Van Hau Le @haulv commented Dec 18, 2019
      Master

      @nghiann những chỗ call nhiều lớp method / attributes như vầy nên sử dụng try / & để tránh data nil gây ra lỗi!

      @nghiann những chỗ call nhiều lớp method / attributes như vầy nên sử dụng try / & để tránh data nil gây ra lỗi!
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 18, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4509&start_sha=e653bf98bf5c232e1c8f7a8578d3c2aa85c101d6#3a65b6282b2c0dfc59d28a9582bd4fead753acc8_17_17)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 18, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 18, 2019
    app/views/shared/_latest_jobs.html.erb 0 → 100644
    1 <div class="box">
    2 <div class="job_data">
    3 <dl class="job_data_row">
    4 <dt>Title</dt>
    5 <dd><%= latest_jobs.title %></dd>
    • Van Hau Le @haulv commented Dec 18, 2019
      Master

      @nghiann latest_jobs là số ít hay nhiều em? Nếu ít thì bỏ s đi nhé!

      @nghiann `latest_jobs` là số ít hay nhiều em? Nếu ít thì bỏ s đi nhé!
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 18, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4509&start_sha=e653bf98bf5c232e1c8f7a8578d3c2aa85c101d6#3d5d7ab2af1ed756120678469ae19764bb33312a_5_0)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 18, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 18, 2019
    app/views/tops/index.html.erb
    13 13 <h3>Latest jobs</h3>
    14 14
    15 15 <div>
    16 <%= render partial: "jobs/job", collection: @jobs %>
    16 <%= render partial: "shared/latest_jobs", collection: @jobs %>
    • Van Hau Le @haulv commented Dec 18, 2019
      Master

      @nghiann partial với collections thì template name là số ít nhé em!

      @nghiann partial với collections thì template name là số ít nhé em!
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 18, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4509&start_sha=e653bf98bf5c232e1c8f7a8578d3c2aa85c101d6#5119c960c4f642915a44495a130c317da9860885_16_16)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 18, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • c0d6c155 - solved comments

    Compare with previous version

    Dec 18, 2019

    added 1 commit

    • c0d6c155 - solved comments

    Compare with previous version

    added 1 commit * c0d6c155 - solved comments [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4509&start_sha=e653bf98bf5c232e1c8f7a8578d3c2aa85c101d6)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 19, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 19, 2019
    app/views/jobs/index.html.erb
    1 <div>
    1 <h3>Total: <%= Job.count %></h3>
    • Son Do Hong @sondh commented Dec 19, 2019
      Master

      indent

      indent
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 4 of the diff

      Dec 19, 2019

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4513&start_sha=c0d6c1550f21296817214138740365ad349b6ebf#fd4909543e4d41ae0af907baf233a50d8e08d125_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 19, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 4ed4dbdc - fix indent

    Compare with previous version

    Dec 19, 2019

    added 1 commit

    • 4ed4dbdc - fix indent

    Compare with previous version

    added 1 commit * 4ed4dbdc - fix indent [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4513&start_sha=c0d6c1550f21296817214138740365ad349b6ebf)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 19, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 19, 2019
    app/views/shared/_latest_job.html.erb 0 → 100644
    2 <div class="job_data">
    3 <dl class="job_data_row">
    4 <dt>Title</dt>
    5 <dd><%= latest_job.title %></dd>
    6 </dl>
    7 <dl class="job_data_row">
    8 <dt>Short description</dt>
    9 <dd><%= truncate(latest_job.short_des, length: 250) %></dd>
    10 </dl>
    11 <dl class="job_data_row">
    12 <dt>Salary</dt>
    13 <dd><%= latest_job.salary %></dd>
    14 </dl>
    15 <dl class="job_data_row">
    16 <dt>Location</dt>
    17 <dd><%= latest_job.cities.first.try(:name) %></dd>
    • Van Hau Le @haulv commented Dec 19, 2019
      Master

      @nghiann này nếu city bị blank cũng error nha em!

      @nghiann này nếu city bị blank cũng error nha em!
    • Van Hau Le @haulv commented Dec 19, 2019
      Master

      @nghiann try:

       latest_job&.cities&.first&.name
      Edited Dec 19, 2019 by Van Hau Le
      @nghiann try: ``` latest_job&.cities&.first&.name ```
    • Nguyen Ngoc Nghia @nghiann commented Dec 19, 2019
      Master

      @haulv dạ oke a

      @haulv dạ oke a
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 5 of the diff

      Dec 19, 2019

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4516&start_sha=4ed4dbdcbb8a58b0cff7a5959bace2d720dbe54a#9e42435a41f06063e0819ba1afb46b123eeced68_17_17)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 19, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 75b7f917 - using (&.)

    Compare with previous version

    Dec 19, 2019

    added 1 commit

    • 75b7f917 - using (&.)

    Compare with previous version

    added 1 commit * 75b7f917 - using (&amp;.) [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4516&start_sha=4ed4dbdcbb8a58b0cff7a5959bace2d720dbe54a)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 19, 2019

    changed the description

    changed the description
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • b95b0124 - edit Job order

    Compare with previous version

    Dec 19, 2019

    added 1 commit

    • b95b0124 - edit Job order

    Compare with previous version

    added 1 commit * b95b0124 - edit Job order [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/15/diffs?diff_id=4519&start_sha=75b7f9179764d5a6f0f4b16d8e93d188cc6379ca)
    Toggle commit list
  • Van Hau Le @haulv

    mentioned in commit 23c11742

    Dec 19, 2019

    mentioned in commit 23c11742

    mentioned in commit 23c1174292480d343afdf7a4956d86f258589742
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Dec 19, 2019

    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
Nguyen Ngoc Nghia
Assignee
Nguyen Ngoc Nghia @nghiann
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: nghiann/VeNJOB!15
×

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.