diff --git a/CineSync/CineSync/urls.py b/CineSync/CineSync/urls.py index 0a13bf9..b520031 100644 --- a/CineSync/CineSync/urls.py +++ b/CineSync/CineSync/urls.py @@ -9,7 +9,6 @@ urlpatterns = [ path('admin/', admin.site.urls), path('films/', include('films.urls'), name='films'), path('timetable/', include('timetable.urls'), name='timetable'), - path('orders/', include('tickets.urls'), name='orders'), path('tickets/', include('tickets.urls'), name='tickets'), path("auth/", include("users.urls"), name="auth"), path("auth/", include("django.contrib.auth.urls"), name="auth"), diff --git a/CineSync/static/css/includes/film_timtable_card.css b/CineSync/static/css/includes/film_timtable_card.css index bea6a7c..de4befc 100644 --- a/CineSync/static/css/includes/film_timtable_card.css +++ b/CineSync/static/css/includes/film_timtable_card.css @@ -67,4 +67,39 @@ align-items: flex-start; flex-direction: row; flex-wrap: nowrap; +} +.countries_block { + max-width: 15vw; + overflow-x: auto; + margin-left: 0.8vw; + display: flex; + flex-wrap: nowrap; + flex-direction: row; + padding: 0.2vw; + border-radius: 0.5vw; +} +.countries { + display: flex; + flex-wrap: nowrap; + align-items: center; + margin-left: 0.1vw; + flex-direction: row; +} +.countries span { + color: #aaaaaa; + font-weight: bold; + padding: 0.4vw; +} +.countries_block::-webkit-scrollbar { + height: 5px; +} +.countries_block::-webkit-scrollbar-thumb { + background-color: #0d1d3a; + border-radius: 5vw; + border: 2px solid #eaeaea; +} +.film_title { + font-size: 1.5vw; + max-width: 40vw; + overflow-y: auto; } \ No newline at end of file diff --git a/CineSync/templates/includes/film_timetable_card.html b/CineSync/templates/includes/film_timetable_card.html index 7fc3c1b..047c298 100644 --- a/CineSync/templates/includes/film_timetable_card.html +++ b/CineSync/templates/includes/film_timetable_card.html @@ -9,8 +9,15 @@ {% endif %}
- + {{ film.age_limit }} +
+ {% for country in film.countries.all %} +
+ {{ country }} +
+ {% endfor %} +
{% for time_sessions in session %} diff --git a/CineSync/tickets/urls.py b/CineSync/tickets/urls.py index 039860b..28ea775 100644 --- a/CineSync/tickets/urls.py +++ b/CineSync/tickets/urls.py @@ -6,5 +6,5 @@ app_name = 'tickets' urlpatterns = [ path('', ticket_view, name='tickets'), - path('/order/success', order_success, name='order_success'), + path('order/success', order_success, name='order_success'), ] diff --git a/CineSync/timetable/models.py b/CineSync/timetable/models.py index 8497903..07491ad 100644 --- a/CineSync/timetable/models.py +++ b/CineSync/timetable/models.py @@ -11,11 +11,14 @@ class FilmSessionsManager(Manager): def nearest_timetable(self): current_datetime = timezone.now() end_datetime = current_datetime + timedelta(days=5) - films_sessions = super().get_queryset().filter( + films_sessions = super().get_queryset().select_related( + 'film', + ).prefetch_related( + 'film__genres', + 'film__countries', + ).filter( start_datetime__gte=current_datetime, start_datetime__lte=end_datetime, - ).prefetch_related( - FilmSession.film.field.name, ).order_by( FilmSession.start_datetime.field.name, )