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
  • !17

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

Feature/job detail

  • Display each job's details in database.
  • Has a breadcrumb (directed to City page/ Industry page/ Top page when click on).
  • Click on job title when on Top page or Job list page to direct to Job detail page.
  • User cannot apply or favorite jobs yet. job-detail
×

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_detail origin/feature/job_detail

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_detail

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 7
  • Commits 11
  • Changes 22
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 24, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 24, 2019
    app/assets/stylesheets/custom.scss
    59 51 line-height: 1.7em;
    60 52 }
    61 53
    54 .container.text-center {
    55 margin-bottom: 30px;
    • Son Do Hong @sondh commented Dec 24, 2019
      Master

      không nên custom mấy cái có sẵn của bootstrap. 1 là viết thêm class mới 2 là dùng class có sẵn: https://getbootstrap.com/docs/4.0/utilities/spacing/

      không nên custom mấy cái có sẵn của bootstrap. 1 là viết thêm class mới 2 là dùng class có sẵn: https://getbootstrap.com/docs/4.0/utilities/spacing/
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 24, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/17/diffs?diff_id=4545&start_sha=946fe9d805b6ac56007acd0d689877965e66402f#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_55_54)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on the diff Dec 24, 2019
    Resolved by Nguyen Ngoc Nghia Dec 24, 2019
    app/controllers/jobs_controller.rb
    1 1 class JobsController < ApplicationController
    2 2 def index
    3 @jobs = Job.page(params[:page]).per(Settings.job.per_page)
    3 if params[:city_id]
    • Van Hau Le @haulv commented Dec 24, 2019
      Master

      @nghiann sao chỗ này kì kì vậy e?

      Edited Dec 24, 2019
      @nghiann sao chỗ này kì kì vậy e?
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 24, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 24, 2019
    app/assets/stylesheets/custom.scss
    157 154 list-style-type: none;
    158 155 line-height: normal;
    159 156 }
    157
    158 .breadcrump {
    • Son Do Hong @sondh commented Dec 24, 2019
      Master

      breadcrumb

      breadcrumb
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 24, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/17/diffs?diff_id=4545&start_sha=946fe9d805b6ac56007acd0d689877965e66402f#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_158_154)
      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 24, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 24, 2019
    app/controllers/jobs_controller.rb
    1 1 class JobsController < ApplicationController
    2 2 def index
    3 @jobs = Job.page(params[:page]).per(Settings.job.per_page)
    3 if params[:city_id]
    4 redirect_to jobs_path if params[:city_id].blank?
    5 @city = City.find(params[:city_id])
    6 @jobs = @city.jobs
    7 elsif params[:industry_id]
    8 redirect_to jobs_path if params[:industry_id].blank?
    • Van Hau Le @haulv commented Dec 24, 2019
      Master

      @nghiann chỗ này nữa

      @nghiann chỗ này nữa
    • Van Hau Le @haulv commented Dec 24, 2019
      Master

      @nghiann ở trên đã check if params city_id / industry id có tồn tại thì mới nhảy vào, mà bên dưới còn check empty là sao em?

      @nghiann ở trên đã check if params city_id / industry id có tồn tại thì mới nhảy vào, mà bên dưới còn check empty là sao em?
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 24, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/17/diffs?diff_id=4545&start_sha=946fe9d805b6ac56007acd0d689877965e66402f#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_8_7)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 24, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 24, 2019
    app/views/shared/_latest_job.html.erb
    2 2 <div class="job_data">
    3 3 <dl class="job_data_row">
    4 4 <dt>Title</dt>
    5 <dd><%= latest_job.title %></dd>
    5 <dd><%= link_to latest_job.title, job_path(latest_job.id) %></dd>
    6 6 </dl>
    7 7 <dl class="job_data_row">
    8 8 <dt>Short description</dt>
    9 <dd><%= truncate(latest_job.short_des, length: 250) %></dd>
    9 <dd><%= latest_job.decorate.display_short_des %></dd>
    • Son Do Hong @sondh commented Dec 24, 2019
      Master

      decorate để trong controller đc k

      decorate để trong controller đc k
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 24, 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/17/diffs?diff_id=4547&start_sha=ccc7c5fc15cd687811233d77cacadcab319daf19#9e42435a41f06063e0819ba1afb46b123eeced68_9_9)
      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 24, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 24, 2019
    app/views/jobs/index.html.erb
    1 <h3>Total: <%= Job.count %></h3>
    1 <h3>Total: <%= params[:city_id] ? @city.jobs.count :
    • Van Hau Le @haulv commented Dec 24, 2019
      Master

      implement jobs count trong model hoặc decorate, ko gọi trực tiếp ở đây nha em

      implement jobs count trong model hoặc decorate, ko gọi trực tiếp ở đây nha em
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 24, 2019

      changed this line in version 2 of the diff

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

    added 1 commit

    • ccc7c5fc - fix jobs_controller.rb

    Compare with previous version

    Dec 24, 2019

    added 1 commit

    • ccc7c5fc - fix jobs_controller.rb

    Compare with previous version

    added 1 commit * ccc7c5fc - fix jobs_controller.rb [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/17/diffs?diff_id=4545&start_sha=946fe9d805b6ac56007acd0d689877965e66402f)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 24, 2019

    resolved all discussions

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

    added 1 commit

    • 25a24032 - move decorate to controller

    Compare with previous version

    Dec 24, 2019

    added 1 commit

    • 25a24032 - move decorate to controller

    Compare with previous version

    added 1 commit * 25a24032 - move decorate to controller [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/17/diffs?diff_id=4547&start_sha=ccc7c5fc15cd687811233d77cacadcab319daf19)
    Toggle commit list
  • Van Hau Le @haulv

    mentioned in commit 039891b2

    Dec 25, 2019

    mentioned in commit 039891b2

    mentioned in commit 039891b229f6095944b6089bfb0962f43420bcd4
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Dec 25, 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!17
×

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.