diff --git a/CineSync/core/functions.py b/CineSync/core/functions.py index dba162a..2ffb501 100644 --- a/CineSync/core/functions.py +++ b/CineSync/core/functions.py @@ -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 diff --git a/CineSync/timetable/views.py b/CineSync/timetable/views.py index b379694..1e89c9e 100644 --- a/CineSync/timetable/views.py +++ b/CineSync/timetable/views.py @@ -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, diff --git a/CineSync/users/forms.py b/CineSync/users/forms.py index 0d44221..967411e 100644 --- a/CineSync/users/forms.py +++ b/CineSync/users/forms.py @@ -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 diff --git a/Документы/Текст к презентации.docx b/Документы/Текст к презентации.docx new file mode 100644 index 0000000..1ea13b5 Binary files /dev/null and b/Документы/Текст к презентации.docx differ