улучшил карточку отображения фильма
This commit is contained in:
parent
a6756b7c0d
commit
79b88a26bf
@ -9,7 +9,6 @@ urlpatterns = [
|
|||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
path('films/', include('films.urls'), name='films'),
|
path('films/', include('films.urls'), name='films'),
|
||||||
path('timetable/', include('timetable.urls'), name='timetable'),
|
path('timetable/', include('timetable.urls'), name='timetable'),
|
||||||
path('orders/', include('tickets.urls'), name='orders'),
|
|
||||||
path('tickets/', include('tickets.urls'), name='tickets'),
|
path('tickets/', include('tickets.urls'), name='tickets'),
|
||||||
path("auth/", include("users.urls"), name="auth"),
|
path("auth/", include("users.urls"), name="auth"),
|
||||||
path("auth/", include("django.contrib.auth.urls"), name="auth"),
|
path("auth/", include("django.contrib.auth.urls"), name="auth"),
|
||||||
|
|||||||
@ -67,4 +67,39 @@
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
flex-wrap: nowrap;
|
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;
|
||||||
}
|
}
|
||||||
@ -9,8 +9,15 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="film_card_column">
|
<div class="film_card_column">
|
||||||
<div class="film_card_title_row">
|
<div class="film_card_title_row">
|
||||||
<label>{{film.name}}</label>
|
<label class="film_title">{{film.name}}</label>
|
||||||
<span class="age_limit">{{ film.age_limit }}</span>
|
<span class="age_limit">{{ film.age_limit }}</span>
|
||||||
|
<div class="countries_block">
|
||||||
|
{% for country in film.countries.all %}
|
||||||
|
<div class="countries">
|
||||||
|
<span>{{ country }}</span>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="film_card_row">
|
<div class="film_card_row">
|
||||||
{% for time_sessions in session %}
|
{% for time_sessions in session %}
|
||||||
|
|||||||
@ -6,5 +6,5 @@ app_name = 'tickets'
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', ticket_view, name='tickets'),
|
path('', ticket_view, name='tickets'),
|
||||||
path('/order/success', order_success, name='order_success'),
|
path('order/success', order_success, name='order_success'),
|
||||||
]
|
]
|
||||||
|
|||||||
@ -11,11 +11,14 @@ class FilmSessionsManager(Manager):
|
|||||||
def nearest_timetable(self):
|
def nearest_timetable(self):
|
||||||
current_datetime = timezone.now()
|
current_datetime = timezone.now()
|
||||||
end_datetime = current_datetime + timedelta(days=5)
|
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__gte=current_datetime,
|
||||||
start_datetime__lte=end_datetime,
|
start_datetime__lte=end_datetime,
|
||||||
).prefetch_related(
|
|
||||||
FilmSession.film.field.name,
|
|
||||||
).order_by(
|
).order_by(
|
||||||
FilmSession.start_datetime.field.name,
|
FilmSession.start_datetime.field.name,
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user