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

Merged
Opened Aug 16, 2023 by Yvon Kerdoncuff@Yvon 
  • Report abuse
Report abuse

extract method, create method to simulate bdm lowering all makeups_to_do and…

extract method, create method to simulate bdm lowering all makeups_to_do and update display with updated nbr of makeups

  • Discussion 3
  • Commits 4
  • Pipelines 4
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 9446558f - also consider a makeup reset when it's a new subscription

    Compare with previous version

    Aug 17, 2023

    added 1 commit

    • 9446558f - also consider a makeup reset when it's a new subscription

    Compare with previous version

    added 1 commit <ul><li>9446558f - also consider a makeup reset when it&#39;s a new subscription</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/237/diffs?diff_id=2356&start_sha=8a2e7479b00daca69d70663460a4ddccca5f232c)
    Toggle commit list
  • Damien Moulard @DamienM commented Aug 22, 2023
    Developer

    Bug détecté : quand on passe quelqu'un en exempté, son compteur est remis à zéro et il passe en "à jour", ce qui contredit le message d'Antonin ici : https://redmine.coopdev.fr/issues/5021#note-4

    Testé sur dev_cooperatic, ce comportement n'apparait pas, donc c'est bien une régression.

    Edited Aug 22, 2023 by Damien Moulard
    Bug détecté : quand on passe quelqu'un en exempté, son compteur est remis à zéro et il passe en "à jour", ce qui contredit le message d'Antonin ici : https://redmine.coopdev.fr/issues/5021#note-4 Testé sur dev_cooperatic, ce comportement n'apparait pas, donc c'est bien une régression.
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • caebaffb - lower makeups to zero only if new shift type is ftop

    Compare with previous version

    Aug 23, 2023

    added 1 commit

    • caebaffb - lower makeups to zero only if new shift type is ftop

    Compare with previous version

    added 1 commit <ul><li>caebaffb - lower makeups to zero only if new shift type is ftop</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/237/diffs?diff_id=2364&start_sha=9446558fb090256e48ae8ce1f08246582578b65f)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Sep 22, 2023
    Last updated by Yvon Kerdoncuff Sep 22, 2023
    members/admin.py
    640 648
    641 649 return response
    642 650
    651
    652 def lower_makeup_count_to_zero_if_moving_from_std_to_non_std(api, partner_id, shift_type, res):
    • Damien Moulard @DamienM commented Sep 22, 2023
      Developer

      du coup cette fonction devrait s'appeler : [...]_from_std_to_ftop

      du coup cette fonction devrait s'appeler : `[...]_from_std_to_ftop`
    • Yvon Kerdoncuff @Yvon commented Sep 22, 2023
      Master

      pourquoi pas, j'avais laissé parce qu'en fait il n'y a que deux possibilités : soit une personne est std, soit elle est ftop ; la notion d'exempté est gérée autrement

      pourquoi pas, j'avais laissé parce qu'en fait il n'y a que deux possibilités : soit une personne est std, soit elle est ftop ; la notion d'exempté est gérée autrement
    • Yvon Kerdoncuff @Yvon

      changed this line in version 4 of the diff

      Sep 22, 2023

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/237/diffs?diff_id=2436&start_sha=caebaffbcc0bc92ea128796380b99a3be8ba73ca#5b90c8970b97ef1e3043ecaaaf5dfd4cf2f2db68_652_652)
      Toggle commit list
    Please register or sign in to reply
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 84ada4ce - minor function name change

    Compare with previous version

    Sep 22, 2023

    added 1 commit

    • 84ada4ce - minor function name change

    Compare with previous version

    added 1 commit <ul><li>84ada4ce - minor function name change</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/237/diffs?diff_id=2436&start_sha=caebaffbcc0bc92ea128796380b99a3be8ba73ca)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Sep 22, 2023

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 0f62095c

    Sep 22, 2023

    mentioned in commit 0f62095c

    mentioned in commit 0f62095ceacbed28d2ffde05ae894f5856214058
    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!237
×

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.