0002-agendas-propagate-check-status-to-secondary-bookings.patch

Valentin Deniaud, 04 août 2021 12:30

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] agendas: propagate check status to secondary bookings
 (#55900)

 chrono/agendas/models.py    | 14 +++++++++----
 chrono/manager/views.py     |  1 +
 tests/manager/test_event.py | 40 +++++++++++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 6 deletions(-)

         def mark_user_absence(self, reason=None):
             self.user_absence_reason = reason
             self.user_was_present = False
             self.save()
             self.event.set_is_checked()
             with transaction.atomic():
                 self.secondary_booking_set.update(user_absence_reason=reason)
                 self.secondary_booking_set.update(user_was_present=False)
                 self.save()
                 self.event.set_is_checked()
         def mark_user_presence(self):
             self.user_absence_reason = ''
             self.user_was_present = True
             self.save()
             self.event.set_is_checked()
             with transaction.atomic():
                 self.secondary_booking_set.update(user_absence_reason='')
                 self.secondary_booking_set.update(user_was_present=True)
                 self.save()
                 self.event.set_is_checked()
         def get_user_block(self):
             template_vars = Context(settings.TEMPLATE_VARS)

chrono/manager/views.py
2805	2805	event__cancelled=False,
2806	2806	cancellation_datetime__isnull=True,
2807	2807	in_waiting_list=False,
	2808	primary_booking__isnull=True,
2808	2809	)
2809	2810
2810	2811	def response(self, request, booking):

         booking7 = Booking.objects.create(
             event=event, user_first_name='User', user_last_name='Waiting', in_waiting_list=True
+        )
         booking8 = Booking.objects.create(
             event=event, user_first_name='User', user_last_name='Secondary', primary_booking=booking1
+        )
         login(app)
         # event not in past
-...
         app.get('/manage/agendas/%s/events/%s/check' % (agenda2.pk, event.pk), status=404)
         resp = resp.click('Check')
         assert 'Bookings (5/10)' in resp
         assert 'Bookings (6/10)' in resp
         assert 'Waiting List (1/5)' in resp
         assert (
             resp.text.index('Bookings (5/10)')
             resp.text.index('Bookings (6/10)')
             < resp.text.index('User 01')
             < resp.text.index('User 05')
             < resp.text.index('User 17')
-...
             status=404,
+        )
         # secondary booking
         app.post(
             '/manage/agendas/%s/bookings/%s/presence' % (agenda.pk, booking8.pk),
             params={'csrfmiddlewaretoken': token},
             status=404,
+        )
         app.post(
             '/manage/agendas/%s/bookings/%s/absence' % (agenda.pk, booking8.pk),
             params={'csrfmiddlewaretoken': token},
             status=404,
+        )
         # unknown agenda
         app.post(
             '/manage/agendas/%s/bookings/%s/presence' % (0, booking1.pk),
-...
             agenda=agenda,
+        )
         booking = Booking.objects.create(event=event, user_first_name='User', user_last_name='42')
         secondary_booking = Booking.objects.create(
             event=event, user_first_name='User', user_last_name='42', primary_booking=booking
+        )
         assert agenda.mark_event_checked_auto is False
         login(app)
-...
         booking.refresh_from_db()
         assert booking.user_was_present is True
         assert booking.user_absence_reason == ''
         secondary_booking.refresh_from_db()
         assert secondary_booking.user_was_present is True
         assert secondary_booking.user_absence_reason == ''
         event.refresh_from_db()
         assert event.checked is False
-...
         booking.refresh_from_db()
         assert booking.user_was_present is False
         assert booking.user_absence_reason == ''
         secondary_booking.refresh_from_db()
         assert secondary_booking.user_was_present is False
         assert secondary_booking.user_absence_reason == ''
         event.refresh_from_db()
         assert event.checked is True
-...
         booking.refresh_from_db()
         assert booking.user_was_present is False
         assert booking.user_absence_reason == 'Foo reason'
         secondary_booking.refresh_from_db()
         assert secondary_booking.user_was_present is False
         assert secondary_booking.user_absence_reason == 'Foo reason'
         # set as present
         app.post(
-...
         booking.refresh_from_db()
         assert booking.user_was_present is True
         assert booking.user_absence_reason == ''
         secondary_booking.refresh_from_db()
         assert secondary_booking.user_was_present is True
         assert secondary_booking.user_absence_reason == ''
         # mark the event as checked
         event.checked = True
-...
         assert '/manage/agendas/%s/events/%s/absence' % (agenda.pk, event.pk) not in resp
         booking2 = Booking.objects.create(event=event, user_first_name='User', user_last_name='35')
         secondary_booking = Booking.objects.create(
             event=event, user_first_name='User', user_last_name='35', primary_booking=booking2
+        )
         resp = app.get('/manage/agendas/%s/events/%s/check' % (agenda.pk, event.pk))
         assert 'Mark all bookings without status' in resp
         assert '/manage/agendas/%s/events/%s/presence' % (agenda.pk, event.pk) in resp
-...
         booking2.refresh_from_db()
         assert booking2.user_was_present is True
         assert booking2.user_absence_reason == ''
         secondary_booking.refresh_from_db()
         assert secondary_booking.user_was_present is True
         assert secondary_booking.user_absence_reason == ''
         event.refresh_from_db()
         assert event.checked is True
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0002-agendas-propagate-check-status-to-secondary-bookings.patch