Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • 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
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !254

Merged
Opened Dec 08, 2023 by Yvon Kerdoncuff@Yvon 
  • Report abuse
Report abuse

efficiently fetch makeups to come data in order to (1) display members with only…

efficiently fetch makeups to come data in order to (1) display members with only makeups to come and no makeups to do and (2) speed up display of makeups 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 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages origin/5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages

Step 2. Review the changes locally

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

git checkout dev_cooperatic
git merge --no-ff 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages

Step 4. Push the result of the merge to GitLab

git push origin dev_cooperatic

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

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

  • Discussion 1
  • Commits 3
  • Pipelines 3
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Dec 13, 2023
    Last updated by Yvon Kerdoncuff Dec 15, 2023
    shifts/models.py
    185 185 shiftData = self.o_api.search_read('shift.registration', cond, fields, order ="date_begin ASC")
    186 186 return shiftData
    187 187
    188 def get_count_of_makeups_to_come_per_partner(self):
    • Damien Moulard @DamienM commented Dec 13, 2023
      Developer

      je renommerais cette fonction en get_partners_with_makeups_to_come() ET/OU ajouterais un commentaire à la fonction pour plus de clareté

      je renommerais cette fonction en get_partners_with_makeups_to_come() ET/OU ajouterais un commentaire à la fonction pour plus de clareté
    • Yvon Kerdoncuff @Yvon

      changed this line in version 3 of the diff

      Dec 15, 2023

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/254/diffs?diff_id=2662&start_sha=02b48dfc9f493a747968b11c3ca08add60e43d2c#bf69b147b1e36093dfebe4b7ad687852eb7b2dac_188_188)
      Toggle commit list
    Please register or sign in to reply
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 02b48dfc - comment code

    Compare with previous version

    Dec 15, 2023

    added 1 commit

    • 02b48dfc - comment code

    Compare with previous version

    added 1 commit <ul><li>02b48dfc - comment code</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/254/diffs?diff_id=2661&start_sha=b564b158b204835e28da43e512a6db5380b5378f)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 659ede3e - rename method

    Compare with previous version

    Dec 15, 2023

    added 1 commit

    • 659ede3e - rename method

    Compare with previous version

    added 1 commit <ul><li>659ede3e - rename method</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/254/diffs?diff_id=2662&start_sha=02b48dfc9f493a747968b11c3ca08add60e43d2c)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Dec 15, 2023

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 20aba01a

    Dec 15, 2023

    mentioned in commit 20aba01a

    mentioned in commit 20aba01ad26106d93948c60fc5e576f43089d54b
    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
Reference: cooperatic-foodcoops/third-party!254
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.