слил ветки
This commit is contained in:
parent
063e3f8fb8
commit
bf48f67f62
@ -8,10 +8,14 @@ def get_film_to_sessions():
|
|||||||
for session in film_sessions:
|
for session in film_sessions:
|
||||||
session_date = session.start_datetime.date()
|
session_date = session.start_datetime.date()
|
||||||
session_film = session.film
|
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_date in sessions_by_date_and_film:
|
||||||
for session_film in sessions_by_date_and_film[session_date]:
|
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
|
return sessions_by_date_and_film
|
||||||
|
|||||||
@ -1,7 +1,5 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from collections import defaultdict
|
|
||||||
from datetime import date
|
from datetime import date
|
||||||
from operator import attrgetter
|
|
||||||
|
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
@ -23,11 +21,15 @@ def timetable_view(request):
|
|||||||
for session in film_sessions:
|
for session in film_sessions:
|
||||||
session_date = session.start_datetime.date()
|
session_date = session.start_datetime.date()
|
||||||
session_film = session.film
|
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_date in sessions_by_date_and_film:
|
||||||
for session_film in sessions_by_date_and_film[session_date]:
|
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(
|
template = render(
|
||||||
request,
|
request,
|
||||||
|
|||||||
@ -7,9 +7,7 @@ from django.contrib.auth.forms import (
|
|||||||
UserChangeForm,
|
UserChangeForm,
|
||||||
UserCreationForm,
|
UserCreationForm,
|
||||||
)
|
)
|
||||||
from django.core.validators import MaxLengthValidator, RegexValidator
|
|
||||||
from django.forms import DateInput, ModelForm
|
from django.forms import DateInput, ModelForm
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
from users.models import Profile
|
from users.models import Profile
|
||||||
|
|
||||||
@ -60,7 +58,9 @@ class SignUpForm(UserCreationForm):
|
|||||||
if len(username) > 150:
|
if len(username) > 150:
|
||||||
raise forms.ValidationError('Максимальная длина 150 символов.')
|
raise forms.ValidationError('Максимальная длина 150 символов.')
|
||||||
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
|
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
|
||||||
raise forms.ValidationError('Можно использовать только буквы, цифры и символы @/./+/-/_.')
|
raise forms.ValidationError(
|
||||||
|
'Можно использовать только буквы, цифры и символы @/./+/-/_.'
|
||||||
|
)
|
||||||
|
|
||||||
return username
|
return username
|
||||||
|
|
||||||
@ -116,6 +116,8 @@ class UserForm(forms.ModelForm):
|
|||||||
if len(username) > 150:
|
if len(username) > 150:
|
||||||
raise forms.ValidationError('Максимальная длина 150 символов.')
|
raise forms.ValidationError('Максимальная длина 150 символов.')
|
||||||
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
|
if not all(char.isalnum() or char in '@/./+/-/_' for char in username):
|
||||||
raise forms.ValidationError('Можно использовать только буквы, цифры и символы @/./+/-/_.')
|
raise forms.ValidationError(
|
||||||
|
'Можно использовать только буквы, цифры и символы @/./+/-/_.'
|
||||||
|
)
|
||||||
|
|
||||||
return username
|
return username
|
||||||
|
|||||||
BIN
Документы/Текст к презентации.docx
Normal file
BIN
Документы/Текст к презентации.docx
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user