This commit is contained in:
Egor Matveev 2021-11-21 23:32:12 +03:00
parent 30fab7926e
commit 8bf25ef4f0
5 changed files with 6 additions and 9 deletions

View File

@ -40,6 +40,7 @@ def do_action(message: Message):
bot.send_message(message.chat.id, "Отлично! Теперь отправь мне свое имя") bot.send_message(message.chat.id, "Отлично! Теперь отправь мне свое имя")
elif user.userinfo.name is None: elif user.userinfo.name is None:
user.userinfo.name = message.text user.userinfo.name = message.text
user.userinfo.verified = True
user.userinfo.save() user.userinfo.save()
bot.send_message(message.chat.id, f"Регистрация завершена! Теперь можешь ты можешь войти в сервис под именем пользователя: {user.username}") bot.send_message(message.chat.id, f"Регистрация завершена! Теперь можешь ты можешь войти в сервис под именем пользователя: {user.username}")
else: else:

View File

@ -1,7 +1,6 @@
from Main.models.userinfo import UserInfo from Main.models.userinfo import UserInfo
from Main.models.group import Group from Main.models.group import Group
from Main.models.task import Task from Main.models.task import Task
from Main.models.file import File
from Main.models.set import Set from Main.models.set import Set
from Main.models.subscription import Subscription from Main.models.subscription import Subscription
from Main.models.settask import SetTask from Main.models.settask import SetTask

View File

@ -1,7 +0,0 @@
from django.db import models
from Main.models.task import Task
class File(models.Model):
task = models.ForeignKey(Task, on_delete=models.CASCADE)
name = models.TextField()

View File

@ -1,5 +1,6 @@
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models from django.db import models
from django.db.models import Q
from django.utils import timezone from django.utils import timezone
from Main.models.group import Group from Main.models.group import Group
@ -21,6 +22,7 @@ class UserInfo(models.Model):
telegram_chat_id = models.TextField(default="") telegram_chat_id = models.TextField(default="")
notification_solution_result = models.BooleanField(default=False) notification_solution_result = models.BooleanField(default=False)
code = models.IntegerField(null=True) code = models.IntegerField(null=True)
verified = models.BooleanField(default=False)
@property @property
def has_favourite_language(self): def has_favourite_language(self):

View File

@ -8,4 +8,6 @@ class RatingView(BaseView):
required_login = True required_login = True
def get(self): def get(self):
self.context["users"] = User.objects.all().order_by('-userinfo__rating') self.context["users"] = User.objects.filter(userinfo__verified=True).order_by(
"-userinfo__rating", "date_joined"
)