Skip to content

T
third-party
Opened by  

Ticket 1680 & 1695 - retirer clemenceau au calendrier et ajuster le calendrier à la bonne taille de service

la durée du service est encore à ajuster (objectif de jeudi)

{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard
    @DamienM started a discussion on the diff
    Resolved by Damien Moulard
    shifts/views.py
    119 119 event["id"] = value['id']
    120 120 smax = int(value['seats_available']) + int(value['seats_reserved'])
    121 121
    122 title_prefix = ''
    122 title_prefix = '- '
    123 123 if len(value['address_id']) == 2 and ',' in value['address_id'][1]:
    124 title_prefix = str(value['address_id'][1]).split(",")[1] + " -- "
    • Damien Moulard @DamienM commented
      Developer

      On ne peut pas simplement enlever cette ligne, car les autres coops utilisent aussi cette fonctionnalité et ont peut-être envie de garder le nom de leur local dans l'affichage du service.

      Pour personnaliser le code pour chaque coop, on utilise des variables de config. Là vu qu'on est sur un besoin spécifique Cagette, tu peu utiliser le paramètre COMPANY_CODE. La méthode getattr(settings, 'COMPANY_CODE', '') permet de récupérer une variable de config si elle existe, sinon de donner une valeur par défaut.

    • Damien Moulard @DamienM commented
      Developer

      J'ai l'impression qu'on s'est mal compris !

      l'idée, c'est de récupéré le paramètre COMPANY_CODE, s'il est égal à 'lacagette' enlever le nom du mag (ce que t'avais fait), sinon laisser comme c'était

    Please register or sign in to reply
  • Félicie @felicie

    added 33 commits

    • c31c58a7...934b8216 - 31 commits from branch evolution_bdm
    • a7ecd0d6 - Merge branch 'evolution_bdm' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into ticket_1680
    • ae2cb3df - compagny_code added

    Compare with previous version

    added 33 commits

    • c31c58a7...934b8216 - 31 commits from branch evolution_bdm
    • a7ecd0d6 - Merge branch 'evolution_bdm' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into ticket_1680
    • ae2cb3df - compagny_code added

    Compare with previous version

    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • a630c440 - add word break to tiles title

    Compare with previous version

    added 1 commit

    • a630c440 - add word break to tiles title

    Compare with previous version

    Toggle commit list
  • Félicie @felicie

    added 2 commits

    • 11d6b3ab - pretty calendar
    • 58cbb59f - Merge branch 'ticket_1680' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into ticket_1680

    Compare with previous version

    added 2 commits

    • 11d6b3ab - pretty calendar
    • 58cbb59f - Merge branch 'ticket_1680' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into ticket_1680

    Compare with previous version

    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    Compare with previous version

    added 1 commit

    Compare with previous version

    Toggle commit list
  • Damien Moulard @DamienM

    resolved all discussions

    resolved all discussions

    Toggle commit list
  • Damien Moulard @DamienM

    enabled an automatic merge when the pipeline for 10420b89 succeeds

    enabled an automatic merge when the pipeline for 10420b89 succeeds

    Toggle commit list
  • Damien Moulard @DamienM

    merged

    merged

    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 9305e1ab

    mentioned in commit 9305e1ab

    Toggle commit list
  • François C.
    @fracolo started a discussion on commit 11d6b3ab
    shifts/views.py
    120 120 smax = int(value['seats_available']) + int(value['seats_reserved'])
    121 121
    122 122 value['address_id'] = getattr(settings, 'COMPANY_CODE', '')
    123 title_prefix = ' - '
    123 title_prefix = ''
    124 124 if len(value['address_id']) == 2 and ',' in value['address_id'][1]:
    125 125 title_prefix = str(value['address_id'][1]).split(",")[1] + " --"
    126 126
    127 127 event["title"] = title_prefix + str(value['seats_reserved']) + "/" + str(smax)
    128 128
    129
    129 130 event["start"] = dateIsoUTC(value['date_begin_tz'])
    130 event["end"] = dateIsoUTC(value['date_end_tz'])
    131
    132 datetime_object = datetime.datetime.strptime(value['date_end_tz'], "%Y-%m-%d %H:%M:%S") - datetime.timedelta(minutes=15)
    Please register or sign in to reply
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 to comment