diff --git a/src/bot/admin.py b/src/bot/admin.py index 2b0bc0d..a415664 100644 --- a/src/bot/admin.py +++ b/src/bot/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from bot.models import CreatedPair, PassedPair, Recruiter, Student +from src.bot.models import CreatedPair, PassedPair, Recruiter, Student @admin.register(CreatedPair) @@ -12,8 +12,8 @@ class CreatedPairAdmin(admin.ModelAdmin): search_fields = ( "student__telegram_id", "recruiter__telegram_id", - "student__tg_username", - "recruiter__tg_username", + "student__telegram_username", + "recruiter__telegram_username", ) @@ -26,14 +26,14 @@ class PassedPairAdmin(admin.ModelAdmin): "student", "recruiter", "date", - "is_interview_successful", + "interview_successful", ) - list_filter = ("date", "is_interview_successful") + list_filter = ("date", "interview_successful") search_fields = ( "student__telegram_id", "recruiter__telegram_id", - "student__tg_username", - "recruiter__tg_username", + "student__telegram_username", + "recruiter__telegram_username", ) @@ -45,13 +45,13 @@ class StudentAdmin(admin.ModelAdmin): "telegram_id", "name", "surname", - "tg_username", + "telegram_username", "registration_date", "last_login_date", - "is_vacant", + "has_pair", ) - list_filter = ("registration_date", "last_login_date", "is_vacant") - search_fields = ("telegram_id", "tg_username") + list_filter = ("registration_date", "last_login_date", "has_pair") + search_fields = ("telegram_id", "telegram_username") @admin.register(Recruiter) @@ -62,10 +62,10 @@ class RecruiterAdmin(admin.ModelAdmin): "telegram_id", "name", "surname", - "tg_username", + "telegram_username", "registration_date", "last_login_date", - "is_vacant", + "has_pair", ) - list_filter = ("registration_date", "last_login_date", "is_vacant") - search_fields = ("telegram_id", "tg_username") + list_filter = ("registration_date", "last_login_date", "has_pair") + search_fields = ("telegram_id", "telegram_username") diff --git a/src/bot/models.py b/src/bot/models.py index b0cee0d..c6871d5 100644 --- a/src/bot/models.py +++ b/src/bot/models.py @@ -17,7 +17,7 @@ class PracticumUser(models.Model): ) name = models.CharField(max_length=255, verbose_name="Имя") surname = models.CharField(max_length=255, verbose_name="Фамилия") - tg_username = models.CharField( + telegram_username = models.CharField( max_length=255, verbose_name="Ник в телеграмме", unique=True ) registration_date = models.DateField( @@ -26,13 +26,13 @@ class PracticumUser(models.Model): last_login_date = models.DateField( auto_now=True, verbose_name="Заходил в последний раз" ) - is_vacant = models.BooleanField(default=False, verbose_name="Есть пара") + has_pair = models.BooleanField(default=False, verbose_name="Есть пара") class Meta: abstract = True def __str__(self): - return f"{self.tg_username} | id: {self.telegram_id}" + return f"{self.telegram_username} | id: {self.telegram_id}" class Student(PracticumUser): @@ -75,8 +75,8 @@ class Meta: def __str__(self): return ( - f"Студент {self.student.tg_username} | " - f"Рекрутер {self.recruiter.tg_username}" + f"Студент {self.student.telegram_username} | " + f"Рекрутер {self.recruiter.telegram_username}" ) @@ -93,14 +93,14 @@ class Meta: fields=["student", "recruiter"], name="unique_created_pair" ), ] - verbose_name = "Текущая пара" - verbose_name_plural = "Текущие пары" + verbose_name = "Активная пара" + verbose_name_plural = "Активные пары" class PassedPair(CustomPair): """Модель созвона.""" - is_interview_successful = models.BooleanField( + interview_successful = models.BooleanField( default=False, verbose_name="Встреча прошла успешно" )