слил ветки

This commit is contained in:
Андрей Дувакин 2024-04-26 18:25:06 +05:00
parent 063e3f8fb8
commit bf48f67f62
4 changed files with 18 additions and 10 deletions

View File

@ -8,10 +8,14 @@ def get_film_to_sessions():
for session in film_sessions:
session_date = session.start_datetime.date()
session_film = session.film
sessions_by_date_and_film.setdefault(session_date, {}).setdefault(session_film, []).append(session)
sessions_by_date_and_film.setdefault(session_date, {}).setdefault(
session_film, []
).append(session)
for session_date in sessions_by_date_and_film:
for session_film in sessions_by_date_and_film[session_date]:
sessions_by_date_and_film[session_date][session_film].sort(key=lambda x: x.start_datetime)
sessions_by_date_and_film[session_date][session_film].sort(
key=lambda x: x.start_datetime
)
return sessions_by_date_and_film

View File

@ -1,7 +1,5 @@
import datetime
from collections import defaultdict
from datetime import date
from operator import attrgetter
from django.contrib.auth.decorators import login_required
from django.db import transaction
@ -23,11 +21,15 @@ def timetable_view(request):
for session in film_sessions:
session_date = session.start_datetime.date()
session_film = session.film
sessions_by_date_and_film.setdefault(session_date, {}).setdefault(session_film, []).append(session)
sessions_by_date_and_film.setdefault(session_date, {}).setdefault(
session_film, []
).append(session)
for session_date in sessions_by_date_and_film:
for session_film in sessions_by_date_and_film[session_date]:
sessions_by_date_and_film[session_date][session_film].sort(key=lambda x: x.start_datetime)
sessions_by_date_and_film[session_date][session_film].sort(
key=lambda x: x.start_datetime
)
template = render(
request,

View File

@ -7,9 +7,7 @@ from django.contrib.auth.forms import (
UserChangeForm,
UserCreationForm,
)
from django.core.validators import MaxLengthValidator, RegexValidator
from django.forms import DateInput, ModelForm
from django.utils.translation import gettext_lazy as _
from users.models import Profile
@ -60,7 +58,9 @@ class SignUpForm(UserCreationForm):
if len(username) > 150:
raise forms.ValidationError('Максимальная длина 150 символов.')
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
raise forms.ValidationError('Можно использовать только буквы, цифры и символы @/./+/-/_.')
raise forms.ValidationError(
'Можно использовать только буквы, цифры и символы @/./+/-/_.'
)
return username
@ -116,6 +116,8 @@ class UserForm(forms.ModelForm):
if len(username) > 150:
raise forms.ValidationError('Максимальная длина 150 символов.')
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
raise forms.ValidationError('Можно использовать только буквы, цифры и символы @/./+/-/_.')
raise forms.ValidationError(
'Можно использовать только буквы, цифры и символы @/./+/-/_.'
)
return username