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

Merged
Opened Apr 12, 2022 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

2844 bdm admin shifts template

  • Discussion 8
  • Commits 4
  • Pipelines 3
  • Changes 11
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 3 commits

    • 6fc24383...67c384d5 - 2 commits from branch dev_cooperatic
    • 2c65a595 - fix merge conflict

    Compare with previous version

    Apr 12, 2022

    added 3 commits

    • 6fc24383...67c384d5 - 2 commits from branch dev_cooperatic
    • 2c65a595 - fix merge conflict

    Compare with previous version

    added 3 commits <ul><li>6fc24383...67c384d5 - 2 commits from branch <code>dev_cooperatic</code></li><li>2c65a595 - fix merge conflict</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/154/diffs?diff_id=1570&start_sha=6fc24383d6a08d9def071cba23d12e55fb818de7)
    Toggle commit list
  • François C.
    @fracolo started a discussion on an old version of the diff Apr 13, 2022
    Last updated by Damien Moulard Apr 13, 2022
    coops_configurations/config_lacagette.py
    115 115 valider votre présence en cherchant<br/>
    116 116 votre nom ou numéro ci-dessous
    117 117 """
    118
    119 HAS_COMMITTEE_SHIFT = True
    • François C. @fracolo commented Apr 13, 2022
      Master

      Il existe une méthode (CagetteServices.get_committees_shift_id()) pour récupérer l'identifiant du créneau des comités (qui nécessite un appel API odoo : jusqu'à maintenant ce n'était sollicité que lorsque il y avait une demande de validation de présence depuis la borne d'accueil)

      Edited Apr 13, 2022 by François C.
      Il existe une méthode (CagetteServices.get_committees_shift_id()) pour récupérer l'identifiant du créneau des comités (qui nécessite un appel API odoo : jusqu'à maintenant ce n'était sollicité que lorsque il y avait une demande de validation de présence depuis la borne d'accueil)
    • Damien Moulard @DamienM commented Apr 13, 2022
      Developer

      Effectivement je peux me servir de ça, je supprime ce paramètre

      Effectivement je peux me servir de ça, je supprime ce paramètre
    • Damien Moulard @DamienM

      changed this line in version 3 of the diff

      Apr 13, 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/154/diffs?diff_id=1571&start_sha=2c65a5957dc8da591d5cbad98b905f9447452c83#144d8d053cf89043629c42a5689a39ec196349e7_119_119)
      Toggle commit list
    Please register or sign in to reply
  • François C.
    @fracolo started a discussion on the diff Apr 13, 2022
    Last updated by Damien Moulard Apr 13, 2022
    members/admin.py
    471 485
    472 # Gestion des binômes
    486 def shift_subscription(request):
    487 """ Inscrit un membre désinscrit à un shift template """
    488 res = {}
    489 if CagetteUser.are_credentials_ok(request):
    490 data = json.loads(request.body.decode())
    491
    492 partner_id = int(data["partner_id"])
    493 shift_type = data["shift_type"]
    494 if shift_type == 1:
    495 # 1 = standard
    496 shift_template_id = data["shift_template_id"]
    497 else:
    498 # 2 = ftop
    499 shift_template_id = CagetteServices.get_committees_shift_id()
    • François C. @fracolo commented Apr 13, 2022
      Master

      Attention : Cela suppose que dans toutes les configurations, il existe un créneau "comité". TODO : Gérer le cas où il n'existe pas (récupérer le premier créneau de type volant)

      Attention : Cela suppose que dans toutes les configurations, il existe un créneau "comité". TODO : Gérer le cas où il n'existe pas (récupérer le premier créneau de type volant)
    • Damien Moulard @DamienM commented Apr 13, 2022
      Developer

      Fait, voir get_first_ftop_shift_id

      Fait, voir `get_first_ftop_shift_id`
    Please register or sign in to reply
  • François C.
    @fracolo started a discussion on an old version of the diff Apr 13, 2022
    Last updated by Damien Moulard Apr 13, 2022
    members/static/js/admin/manage_attached.js
    26 26 traditional: true,
    27 27 contentType: "application/json; charset=utf-8",
    28 28 success: function(data) {
    29 console.log(data.member)
    29 console.log(data.member);
    • François C. @fracolo commented Apr 13, 2022
      Master

      A supprimer

      A supprimer
    • Damien Moulard @DamienM commented Apr 13, 2022
      Developer

      Fait

      Fait
    • Damien Moulard @DamienM

      changed this line in version 3 of the diff

      Apr 13, 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/154/diffs?diff_id=1571&start_sha=2c65a5957dc8da591d5cbad98b905f9447452c83#7aae345a89471814b19806db5e2e971fe3d1013e_29_29)
      Toggle commit list
    Please register or sign in to reply
  • François C.
    @fracolo started a discussion on the diff Apr 13, 2022
    Last updated by Damien Moulard Apr 13, 2022
    members/static/js/admin/manage_regular_shifts.js
    117 $("#subscribe_to_shift_template_button").off();
    118
    119 $("#shifts_calendar_area").hide();
    63 120
    64 121 if (selected_member.shift_template_id === undefined || selected_member.shift_template_id === null) {
    65 $('.member_shift').text("");
    122 $('.member_shift').text("X");
    123
    124 $("#subscribe_to_shift_template_button").show();
    125 $("#subscribe_to_shift_template_button").on("click", () => {
    126 retrieve_and_draw_shift_tempates();
    127 $("#shifts_calendar_area").show();
    66 128
    67 $("#remove_shift_template_button").hide();
    68 $("#remove_shift_template_button").off();
    129 // Wait for listeners to be set in common.js
    • François C. @fracolo commented Apr 13, 2022
      Master

      Situation où un mécanisme de publication de signal / souscription au signal éviterait d'attendre un temps arbitraire.

      Situation où un mécanisme de publication de signal / souscription au signal éviterait d'attendre un temps arbitraire.
    • Damien Moulard @DamienM commented Apr 13, 2022
      Developer

      Oui, je suis bien d'accord ! Je vais rajouter un TODO. Dans common.js il y a plusieurs méthodes imbriquées ce qui rendait compliquée l'utilisation de Promesses.

      Oui, je suis bien d'accord ! Je vais rajouter un TODO. Dans common.js il y a plusieurs méthodes imbriquées ce qui rendait compliquée l'utilisation de Promesses.
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • 1520f01b - fix pr comments

    Compare with previous version

    Apr 13, 2022

    added 1 commit

    • 1520f01b - fix pr comments

    Compare with previous version

    added 1 commit <ul><li>1520f01b - fix pr comments</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/154/diffs?diff_id=1571&start_sha=2c65a5957dc8da591d5cbad98b905f9447452c83)
    Toggle commit list
  • François C. @fracolo

    merged

    Apr 13, 2022

    merged

    merged
    Toggle commit list
  • François C. @fracolo

    mentioned in commit 1e561340

    Apr 13, 2022

    mentioned in commit 1e561340

    mentioned in commit 1e5613401e2ba8e8d80f00694e7a17445734af34
    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!154
×

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.