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

Merged
Opened Mar 10, 2022 by Etienne Freiss@e.freiss 
  • Report abuse
Report abuse

2251 shift screen associate

  • Discussion 2
  • Commits 9
  • Pipelines 7
  • Changes 9
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • 1611fdbc - fix style in calendar shift list

    Compare with previous version

    Mar 10, 2022

    added 1 commit

    • 1611fdbc - fix style in calendar shift list

    Compare with previous version

    added 1 commit <ul><li>1611fdbc - fix style in calendar shift list</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/140/diffs?diff_id=1409&start_sha=b5ae60ba88f339350616c6efea652a3d4e4c6ac0)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Mar 10, 2022
    Resolved by Damien Moulard Mar 10, 2022
    members/models.py
    1298 1303 return api.update('shift.registration', [int(registration_id)], f)
    1299 1304
    1300 1305 @staticmethod
    1301 def record_rattrapage(mid, sid, stid):
    1306 def registration_cancel(registration_id, overrided_date=""):
    • Damien Moulard @DamienM commented Mar 10, 2022
      Developer

      c'est peut-être moi mais j'ai mis beaucoup de temps à comprendre qu tu voulais annuler la présence et pas le service ! je renommerais en reopen_registration pour que ce soit plus clair (et utilisable dans d'autres contextes)

      Edited Mar 10, 2022 by Damien Moulard
      c'est peut-être moi mais j'ai mis beaucoup de temps à comprendre qu tu voulais annuler la présence et pas le service ! je renommerais en `reopen_registration` pour que ce soit plus clair (et utilisable dans d'autres contextes)
    • Etienne Freiss @e.freiss commented Mar 10, 2022
      Developer

      Bonne idée je change ça

      Bonne idée je change ça
    • Etienne Freiss @e.freiss

      changed this line in version 3 of the diff

      Mar 10, 2022

      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/140/diffs?diff_id=1411&start_sha=1611fdbcc6b6474929ada949e4da701d61c4f70e#6be34c5b7587798cd95e26b50ffbd7bf1cc7a73f_1306_1306)
      Toggle commit list
    Please register or sign in to reply
  • Etienne Freiss @e.freiss

    added 2 commits

    • a94dfe0c - change name reopen_registration
    • fe9266d5 - Merge branch '2251-shift-screen-associate' of…

    Compare with previous version

    Mar 10, 2022

    added 2 commits

    • a94dfe0c - change name reopen_registration
    • fe9266d5 - Merge branch '2251-shift-screen-associate' of…

    Compare with previous version

    added 2 commits <ul><li>a94dfe0c - change name reopen_registration</li><li>fe9266d5 - Merge branch &#39;2251-shift-screen-associate&#39; of…</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/140/diffs?diff_id=1411&start_sha=1611fdbcc6b6474929ada949e4da701d61c4f70e)
    Toggle commit list
  • Etienne Freiss @e.freiss

    added 16 commits

    • fe9266d5...6aa05fdd - 15 commits from branch dev_cooperatic
    • d4e58ed9 - Merge branch 'dev_cooperatic' into 2251-shift-screen-associate

    Compare with previous version

    Mar 10, 2022

    added 16 commits

    • fe9266d5...6aa05fdd - 15 commits from branch dev_cooperatic
    • d4e58ed9 - Merge branch 'dev_cooperatic' into 2251-shift-screen-associate

    Compare with previous version

    added 16 commits <ul><li>fe9266d5...6aa05fdd - 15 commits from branch <code>dev_cooperatic</code></li><li>d4e58ed9 - Merge branch &#39;dev_cooperatic&#39; into 2251-shift-screen-associate</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/140/diffs?diff_id=1412&start_sha=fe9266d5f55ffe1172e0d0c70b1d4b4f7489b924)
    Toggle commit list
  • Damien Moulard @DamienM

    resolved all discussions

    Mar 10, 2022

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    added 2 commits

    • 0b9eec41 - fix record presence screen style
    • 2c422b94 - Merge branch '2251-shift-screen-associate' of…

    Compare with previous version

    Mar 10, 2022

    added 2 commits

    • 0b9eec41 - fix record presence screen style
    • 2c422b94 - Merge branch '2251-shift-screen-associate' of…

    Compare with previous version

    added 2 commits <ul><li>0b9eec41 - fix record presence screen style</li><li>2c422b94 - Merge branch &#39;2251-shift-screen-associate&#39; of…</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/140/diffs?diff_id=1414&start_sha=d4e58ed95ae1e49cacd4459f02b7912d891736cf)
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Mar 10, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 76c6252c

    Mar 10, 2022

    mentioned in commit 76c6252c

    mentioned in commit 76c6252c57ede616043673cff23a15d902209a4c
    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!140
×

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.