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

general: reformat using black

This commit is contained in:
Emmanuel Cazenave 2020-03-04 16:17:54 +01:00
parent bd40148eed
commit 3d9ea06ec7
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrono/api/views.py
View File

@ -610,7 +610,11 @@ class Fillslots(APIView):
return Response({'err': 1, 'err_class': 'no waiting list', 'err_desc': _('no waiting list')})
if event.waiting_list_places:
if payload.get('force_waiting_list') or (event.booked_places + places_count) > event.places or event.waiting_list:
if (
payload.get('force_waiting_list')
or (event.booked_places + places_count) > event.places
or event.waiting_list
):
# if this is full or there are people waiting, put new bookings
# in the waiting list.
in_waiting_list = True

14
chrono/manager/views.py
View File

@ -716,14 +716,12 @@ class EventDetailView(ViewableAgendaMixin, DetailView):
context = super(EventDetailView, self).get_context_data(**kwargs)
context['user_can_manage'] = self.agenda.can_be_managed(self.request.user)
event = self.get_object()
context['booked'] = (
event.booking_set
.filter(cancellation_datetime__isnull=True, in_waiting_list=False)
.order_by('creation_datetime'))
context['waiting'] = (
event.booking_set
.filter(cancellation_datetime__isnull=True, in_waiting_list=True)
.order_by('creation_datetime'))
context['booked'] = event.booking_set.filter(
cancellation_datetime__isnull=True, in_waiting_list=False
).order_by('creation_datetime')
context['waiting'] = event.booking_set.filter(
cancellation_datetime__isnull=True, in_waiting_list=True
).order_by('creation_datetime')
return context

5
chrono/urls.py
View File

@ -39,9 +39,8 @@ if 'mellon' in settings.INSTALLED_APPS:
if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
import debug_toolbar
urlpatterns = [
url(r'^__debug__/', include(debug_toolbar.urls)),
] + urlpatterns
urlpatterns = [url(r'^__debug__/', include(debug_toolbar.urls)),] + urlpatterns
# static and media files
urlpatterns += staticfiles_urlpatterns()

16
tests/test_api.py
View File

@ -973,7 +973,9 @@ def test_booking_api_force_waiting_list(app, some_data, user):
# no waiting list
assert event.waiting_list_places == 0
resp = app.post_json('/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True})
resp = app.post_json(
'/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True}
)
assert resp.json['err'] == 1
assert resp.json['reason'] == 'no waiting list' # legacy
assert resp.json['err_class'] == 'no waiting list'
@ -992,7 +994,9 @@ def test_booking_api_force_waiting_list(app, some_data, user):
assert resp.json['places']['waiting_list_reserved'] == 0
# add another booking
resp = app.post_json('/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': False})
resp = app.post_json(
'/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': False}
)
assert resp.json['err'] == 0
assert resp.json['places']['total'] == 10
assert resp.json['places']['available'] == 8
@ -1002,7 +1006,9 @@ def test_booking_api_force_waiting_list(app, some_data, user):
assert resp.json['places']['waiting_list_reserved'] == 0
# add a booking, but in waiting list
resp = app.post_json('/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True})
resp = app.post_json(
'/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True}
)
assert resp.json['err'] == 0
assert resp.json['places']['total'] == 10
assert resp.json['places']['available'] == 8
@ -1022,7 +1028,9 @@ def test_booking_api_force_waiting_list(app, some_data, user):
assert resp.json['places']['waiting_list_reserved'] == 2
# waiting list is full
resp = app.post_json('/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True})
resp = app.post_json(
'/api/agenda/%s/fillslot/%s/' % (agenda.pk, event.pk), params={'force_waiting_list': True}
)
assert resp.json['err'] == 1
assert resp.json['reason'] == 'sold out' # legacy
assert resp.json['err_class'] == 'sold out'