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

Merged
Opened Nov 28, 2021 by Administrator@root 
  • Report abuse
Report abuse

Integration Evolution bdm

  • Discussion 1
  • Commits 211
  • Pipelines 90
  • Changes 108
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Félicie
    @felicie started a discussion on commit 6b6c53bc Nov 23, 2021
    • Félicie @felicie

      mentioned in commit 5a758c56

      Nov 23, 2021

      mentioned in commit 5a758c56

      mentioned in commit 5a758c569b23535a57e1c2b6c7460830822d2303
      Toggle commit list
    Please register or sign in to reply
  • Administrator @root

    merged

    Nov 28, 2021

    merged

    merged
    Toggle commit list
  • Administrator @root

    mentioned in commit 38643bd9

    Nov 28, 2021

    mentioned in commit 38643bd9

    mentioned in commit 38643bd9c43058d235bcb03c96f039df4af17348
    Toggle commit list
  • François C.
    @fracolo started a discussion on commit 11d6b3ab Oct 25, 2022
    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)
    • François C. @fracolo commented Oct 25, 2022
      Master

      https://redmine.cooperatic.fr/issues/1680

      https://redmine.cooperatic.fr/issues/1680
    Please register or sign in to reply
  • 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!87
×

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.