Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venjob_nth
  • 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
  • Ngô Trung Hưng
  • venjob_nth
  • Merge Requests
  • !16

Merged
Opened Sep 07, 2020 by Ngô Trung Hưng@hungnt 
  • Report abuse
Report abuse

create function admin

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b admin origin/admin

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 admin

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 8
  • Pipelines 8
  • Changes 37
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 404a9c9c - create method search applied

    Compare with previous version

    Sep 09, 2020

    added 1 commit

    • 404a9c9c - create method search applied

    Compare with previous version

    added 1 commit * 404a9c9c - create method search applied [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5192&start_sha=7e991bbd9edd6772f92b944f5cea9c8176cba56c)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 4eff9b54 - created function search applied for admin

    Compare with previous version

    Sep 11, 2020

    added 1 commit

    • 4eff9b54 - created function search applied for admin

    Compare with previous version

    added 1 commit * 4eff9b54 - created function search applied for admin [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5203&start_sha=404a9c9ce4366d538d50ea47c53acba3aecea6a8)
    Toggle commit list
  • Hoang Phuc Do
    @phucdh started a discussion on an old version of the diff Sep 11, 2020
    Last updated by Ngô Trung Hưng Sep 11, 2020
    app/controllers/admin_controller.rb 0 → 100644
    1 # frozen_string_literal: true
    2
    3 # Admin controller
    4 class AdminController < ApplicationController
    • Hoang Phuc Do @phucdh commented Sep 11, 2020
      Master

      Những controller sử dụng trong trang admin nên nằm trong một namespace riêng (Vd: admin)

      Vd:

      Chức năng search trong admin sẽ có cấu trúc thư mục, file như sau:

      app
       - controllers
         - admin
           - search_controller.rb
      Edited Sep 11, 2020 by Hoang Phuc Do
      Những controller sử dụng trong trang admin nên nằm trong một namespace riêng (Vd: admin) Vd: Chức năng search trong admin sẽ có cấu trúc thư mục, file như sau: ``` app - controllers - admin - search_controller.rb ```
    • Ngô Trung Hưng @hungnt commented Sep 11, 2020
      Master

      Dạ anh

      Dạ anh
    • Ngô Trung Hưng @hungnt

      changed this line in version 4 of the diff

      Sep 11, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5206&start_sha=4eff9b54420f9cc4392127505493f03d8538a917#8bb233bdca31b94b80d479014819350b2ea395ff_4_0)
      Toggle commit list
    Please register or sign in to reply
  • Phượng Lồ Nguyệt
    @phuongln started a discussion on an old version of the diff Sep 11, 2020
    Last updated by Ngô Trung Hưng Sep 11, 2020
    app/assets/stylesheets/admin.scss 0 → 100644
    1 // Place all the styles related to the admin controller here.
    2 // They will automatically be included in application.css.
    3 // You can use Sass (SCSS) here: http://sass-lang.com/
    4 .new_admin {
    5 width: 100%;
    6 }
    7
    8 @mixin admin_select {
    9 margin-top: 10px;
    10 border: 1px solid #ced4da;
    11 border-radius: 0.25rem;
    12 height: 40px;
    13 padding-top: 0.375rem;
    14 padding-right: 0.75rem;
    15 padding-bottom: 0.375rem;
    16 padding-left: 0.6rem;
    • Phượng Lồ Nguyệt @phuongln commented Sep 11, 2020

      Em có thể gom lại nè

      padding-top: 0.375rem;
      padding-right: 0.75rem;
      padding-bottom: 0.375rem;
      padding-left: 0.6rem;

      => padding: 0.375rem 0.75rem 0.375rem 0.6rem;

      Edited Sep 11, 2020
      Em có thể gom lại nè ```scss padding-top: 0.375rem; padding-right: 0.75rem; padding-bottom: 0.375rem; padding-left: 0.6rem; ``` => padding: 0.375rem 0.75rem 0.375rem 0.6rem;
    • Ngô Trung Hưng @hungnt commented Sep 11, 2020
      Master

      Thanks chị

      Thanks chị
    • Ngô Trung Hưng @hungnt

      changed this line in version 5 of the diff

      Sep 11, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5208&start_sha=44da0847edde366791445e83d84ba215fab0f39e#aa6a47406a022774625e0d354c0606c400ee01c1_16_13)
      Toggle commit list
    Please register or sign in to reply
  • Phượng Lồ Nguyệt
    @phuongln started a discussion on the diff Sep 11, 2020
    Resolved by Ngô Trung Hưng Sep 11, 2020
    app/assets/stylesheets/admin.scss 0 → 100644
    21 height: 100%;
    22 background-color: transparent;
    23 font-weight: 400;
    24 font-size: 1rem;
    25 color: #495057;
    26 cursor: pointer;
    27 &:focus {
    28 outline: none;
    29 }
    30 }
    31 .admin_box_search__filter_city_id {
    32 @include admin_select()
    33 }
    34 .admin_box_search__filter_industry_id {
    35 @include admin_select()
    36 }
    • Phượng Lồ Nguyệt @phuongln commented Sep 11, 2020

      Những class có thuộc tính giống nhau có thể gom lại thành 1 hàng, cách nhau bằng dấu phẩy

      .admin_box_search__filter_city_id {
        @include admin_select()
      }
      .admin_box_search__filter_industry_id {
        @include admin_select()
      }

      =>

      .admin_box_search__filter_city_id, .admin_box_search__filter_industry_id {
        @include admin_select()
      }
      Edited Sep 11, 2020
      Những class có thuộc tính giống nhau có thể gom lại thành 1 hàng, cách nhau bằng dấu phẩy ```scss .admin_box_search__filter_city_id { @include admin_select() } .admin_box_search__filter_industry_id { @include admin_select() } ``` => ```scss .admin_box_search__filter_city_id, .admin_box_search__filter_industry_id { @include admin_select() } ```
    Please register or sign in to reply
  • Phượng Lồ Nguyệt
    @phuongln started a discussion on the diff Sep 11, 2020
    Resolved by Ngô Trung Hưng Sep 11, 2020
    app/assets/stylesheets/admin.scss 0 → 100644
    43 select {
    44 @include admin_select();
    45 margin-top: 0px;
    46 &:focus {
    47 outline: none;
    48 }
    49 }
    50 }
    51 .admin_box_search__filter_date__past_time {
    52 width: 100%;
    53 text-align: center;
    54 }
    55 .admin_box_search__filter_date__current_time {
    56 width: 100%;
    57 text-align: center;
    58 }
    • Phượng Lồ Nguyệt @phuongln commented Sep 11, 2020

      Tương tự trên

      .admin_box_search__filter_date__past_time, .admin_box_search__filter_date__current_time {
      ...
      }
      Edited Sep 11, 2020
      Tương tự trên ``` scss .admin_box_search__filter_date__past_time, .admin_box_search__filter_date__current_time { ... } ```
    Please register or sign in to reply
  • Phượng Lồ Nguyệt
    @phuongln started a discussion on the diff Sep 11, 2020
    Resolved by Ngô Trung Hưng Sep 11, 2020
    app/assets/stylesheets/admin.scss 0 → 100644
    65 margin-top: 10px;
    66 }
    67 .symbol_to {
    68 font-size: 26px;
    69 font-weight: 600;
    70 }
    71 .btn-admin-search {
    72 width: 100%;
    73 }
    74 #apply_city_id {
    75 @include admin_select__child()
    76 }
    77
    78 #apply_industry_id {
    79 @include admin_select__child()
    80 }
    • Phượng Lồ Nguyệt @phuongln commented Sep 11, 2020

      Same ở trên luôn nè.

      Edited Sep 11, 2020
      Same ở trên luôn nè.
    Please register or sign in to reply
  • Phượng Lồ Nguyệt
    @phuongln started a discussion on the diff Sep 11, 2020
    Last updated by Ngô Trung Hưng Sep 11, 2020
    app/forms/apply.rb 0 → 100644
    7
    8 def self.selected(params)
    9 params.blank? ? '*' : params
    10 end
    11
    12 def self.selected_date(params)
    13 dt = {}
    14 dt[:selected_past_year] = params.present? ? params['past_time(1i)'].to_i : Date.current.year
    15 dt[:selected_past_month] = params.present? ? params['past_time(2i)'].to_i : Date.current.month
    16 dt[:selected_past_day] = params.present? ? params['past_time(3i)'].to_i : Date.current.day
    17
    18 dt[:selected_current_year] = params.present? ? params['current_time(1i)'].to_i : Date.current.year
    19 dt[:selected_current_month] = params.present? ? params['current_time(2i)'].to_i : Date.current.month
    20 dt[:selected_current_day] = params.present? ? params['current_time(3i)'].to_i : Date.current.day
    21 dt
    22 end
    • Phượng Lồ Nguyệt @phuongln commented Sep 11, 2020

      Sao phải check nhiều lần thằng params.present?zạ em?

      Edited Sep 11, 2020
      Sao phải check nhiều lần thằng `params.present?`zạ em?
    • Ngô Trung Hưng @hungnt commented Sep 11, 2020
      Master

      để e viết suy nghĩ r viết gọn lại. Thanks chị

      để e viết suy nghĩ r viết gọn lại. Thanks chị
    Please register or sign in to reply
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 44da0847 - fix method search in admin_controller

    Compare with previous version

    Sep 11, 2020

    added 1 commit

    • 44da0847 - fix method search in admin_controller

    Compare with previous version

    added 1 commit * 44da0847 - fix method search in admin_controller [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5206&start_sha=4eff9b54420f9cc4392127505493f03d8538a917)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 5177fccb - refactor method selected_date

    Compare with previous version

    Sep 11, 2020

    added 1 commit

    • 5177fccb - refactor method selected_date

    Compare with previous version

    added 1 commit * 5177fccb - refactor method selected_date [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5208&start_sha=44da0847edde366791445e83d84ba215fab0f39e)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • f4191bbf - delete debugger

    Compare with previous version

    Sep 14, 2020

    added 1 commit

    • f4191bbf - delete debugger

    Compare with previous version

    added 1 commit * f4191bbf - delete debugger [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5210&start_sha=5177fccb3dad4443b86945bb7d32818b1cd6efce)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 9f4a0e4d - refactor code

    Compare with previous version

    Sep 22, 2020

    added 1 commit

    • 9f4a0e4d - refactor code

    Compare with previous version

    added 1 commit * 9f4a0e4d - refactor code [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5213&start_sha=f4191bbf0d283f75eaf9c875dbe31b2d56b64495)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 19 commits

    • 9f4a0e4d...897ec388 - 18 commits from branch master
    • f18b0d89 - Merge branch 'master' into 'admin'

    Compare with previous version

    Oct 28, 2020

    added 19 commits

    • 9f4a0e4d...897ec388 - 18 commits from branch master
    • f18b0d89 - Merge branch 'master' into 'admin'

    Compare with previous version

    added 19 commits * 9f4a0e4d...897ec388 - 18 commits from branch `master` * f18b0d89 - Merge branch &#x27;master&#x27; into &#x27;admin&#x27; [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/16/diffs?diff_id=5216&start_sha=9f4a0e4d3f9f56170839eb1c98e9fb084b821bfc)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    mentioned in commit 96eb85ed

    Oct 28, 2020

    mentioned in commit 96eb85ed

    mentioned in commit 96eb85ed142522571ebc3ed8dc7247ac2773de51
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    merged

    Oct 28, 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
3
3 participants
Reference: hungnt/venjob_nth!16
×

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.