From 0b06dba533ad66af82785b961dad1fb37e09c94d Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Thu, 24 Jan 2019 10:25:30 -0500 Subject: Hides expired bookings in the "My Bookings" Page This commit hides bookings that have ended from cluttering the "My Bookings" page. Change-Id: I0f98fbff97b1474e73a666aa0000e1923266fafb Signed-off-by: Parker Berberian --- dashboard/src/account/views.py | 16 ++++++++--- dashboard/src/templates/account/booking_list.html | 35 +++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) (limited to 'dashboard/src') diff --git a/dashboard/src/account/views.py b/dashboard/src/account/views.py index 6f390fa..2b4eccb 100644 --- a/dashboard/src/account/views.py +++ b/dashboard/src/account/views.py @@ -14,6 +14,7 @@ import urllib import oauth2 as oauth from django.conf import settings +from django.utils import timezone from django.contrib import messages from django.contrib.auth import logout, authenticate, login from django.contrib.auth.decorators import login_required @@ -21,7 +22,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.urls import reverse from django.http import HttpResponse -from django.utils import timezone from django.shortcuts import get_object_or_404 from django.utils.decorators import method_decorator from django.views.generic import RedirectView, TemplateView, UpdateView @@ -198,9 +198,17 @@ def account_booking_view(request): if not request.user.is_authenticated: return render(request, "dashboard/login.html", {'title': 'Authentication Required'}) template = "account/booking_list.html" - bookings = list(Booking.objects.filter(owner=request.user).order_by("-start")) - collab_bookings = list(request.user.collaborators.all().order_by("-start")) - context = {"title": "My Bookings", "bookings": bookings, "collab_bookings": collab_bookings} + bookings = list(Booking.objects.filter(owner=request.user, end__gt=timezone.now()).order_by("-start")) + my_old_bookings = Booking.objects.filter(owner=request.user, end__lt=timezone.now()).order_by("-start") + collab_old_bookings = request.user.collaborators.filter(end__lt=timezone.now()).order_by("-start") + expired_bookings = list(my_old_bookings.union(collab_old_bookings)) + collab_bookings = list(request.user.collaborators.filter(end__gt=timezone.now()).order_by("-start")) + context = { + "title": "My Bookings", + "bookings": bookings, + "collab_bookings": collab_bookings, + "expired_bookings": expired_bookings + } return render(request, template, context=context) diff --git a/dashboard/src/templates/account/booking_list.html b/dashboard/src/templates/account/booking_list.html index e56b19e..ed59b81 100644 --- a/dashboard/src/templates/account/booking_list.html +++ b/dashboard/src/templates/account/booking_list.html @@ -8,7 +8,7 @@

Booking {{booking.id}}