diff --git a/.gitignore b/.gitignore index 5ba6a53..1e51223 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -data/db.sqlite3 +data/*.sqlite3* diff --git a/app/base/models/booking.py b/app/base/models/booking.py index 4527ef7..b6a86fe 100755 --- a/app/base/models/booking.py +++ b/app/base/models/booking.py @@ -11,7 +11,7 @@ if TYPE_CHECKING: from django.db.models import OuterRef from app.base.models.person import Person from app.base.models.booking_type import BookingType - from datetime import timedelta + from datetime import timedelta # noqa F401 class Booking(models.Model): diff --git a/app/base/views/trigger/toggle_checkin.py b/app/base/views/trigger/toggle_checkin.py index 41d1ee7..2b5a8ef 100755 --- a/app/base/views/trigger/toggle_checkin.py +++ b/app/base/views/trigger/toggle_checkin.py @@ -1,3 +1,4 @@ +from datetime import timedelta from django.contrib.auth.mixins import LoginRequiredMixin from django.shortcuts import redirect from django.utils import timezone @@ -11,17 +12,17 @@ class ToggleCheckinView(LoginRequiredMixin, View): user = Person.objects.get(id=kwargs['user_id']) next = self.request.GET.get('next') booking = user.current_checkin # performs db query + now = timezone.now() + now -= timedelta(microseconds=now.microsecond) # remove precision if booking: - booking.end_time = timezone.now() + booking.end_time = now booking.save() else: plan = self.request.GET.get('plan') # get() throws exception if not-exist. This is intended behavior! # If you need `None` instead, use `filter().first()` book_type = BookingType.objects.get(key=plan) - Booking.objects.create( - user=user, type=book_type, begin_time=timezone.now() - ) + Booking.objects.create(user=user, type=book_type, begin_time=now) return redirect(next)