entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

api: rename show_events in bookable_events (#56615)

This commit is contained in:
Lauréline Guérin 2021-10-04 17:47:37 +02:00
parent 519b80c3a5
commit e4603ed856
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
chrono/api/views.py
View File

@ -455,7 +455,7 @@ def get_event_detail(
agenda=None,
min_places=1,
booked_user_external_id=None,
show_events=None,
bookable_events=None,
multiple_agendas=False,
disable_booked=True,
):
@ -513,8 +513,8 @@ def get_event_detail(
'places': get_event_places(event),
}
)
if show_events is not None:
details['api']['fillslot_url'] += '?events=%s' % show_events
if bookable_events is not None:
details['api']['fillslot_url'] += '?events=%s' % bookable_events
if booked_user_external_id:
if getattr(event, 'user_places_count', 0) > 0:
details['booked_for_external_user'] = 'main-list'
@ -525,7 +525,7 @@ def get_event_detail(
def get_events_meta_detail(
request, events, agenda=None, min_places=1, show_events=None, multiple_agendas=False
request, events, agenda=None, min_places=1, bookable_events=None, multiple_agendas=False
):
bookable_datetimes_number_total = 0
bookable_datetimes_number_available = 0
@ -540,7 +540,7 @@ def get_events_meta_detail(
event,
agenda=agenda,
min_places=min_places,
show_events=show_events,
bookable_events=bookable_events,
multiple_agendas=multiple_agendas,
)
return {
@ -763,19 +763,19 @@ class Datetimes(APIView):
user_external_id = payload.get('user_external_id') or payload.get('exclude_user_external_id')
disable_booked = bool(payload.get('exclude_user_external_id'))
show_events_raw = payload.get('events')
show_events = show_events_raw or 'future'
show_past = show_events in ['all', 'past']
show_future = show_events in ['all', 'future']
bookable_events_raw = payload.get('events')
bookable_events = bookable_events_raw or 'future'
book_past = bookable_events in ['all', 'past']
book_future = bookable_events in ['all', 'future']
entries = []
if show_past:
if book_past:
entries += agenda.get_past_events(
min_start=payload.get('date_start'),
max_start=payload.get('date_end'),
user_external_id=user_external_id,
)
if show_future:
if book_future:
entries += agenda.get_open_events(
min_start=payload.get('date_start'),
max_start=payload.get('date_end'),
@ -797,13 +797,17 @@ class Datetimes(APIView):
agenda=agenda,
min_places=payload['min_places'],
booked_user_external_id=payload.get('user_external_id'),
show_events=show_events_raw,
bookable_events=bookable_events_raw,
disable_booked=disable_booked,
)
for x in entries
],
'meta': get_events_meta_detail(
request, entries, agenda=agenda, min_places=payload['min_places'], show_events=show_events_raw
request,
entries,
agenda=agenda,
min_places=payload['min_places'],
bookable_events=bookable_events_raw,
),
}
return Response(response)