From 3814c8a4d679d0466a450bdd10cacfe083f32b87 Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 13:46:24 +0300 Subject: [PATCH 1/4] fix namings at review admin --- services/backend/apps/review/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/apps/review/admin.py b/services/backend/apps/review/admin.py index c35598b..48730de 100644 --- a/services/backend/apps/review/admin.py +++ b/services/backend/apps/review/admin.py @@ -4,7 +4,7 @@ from apps.review.models import Review, Reviewer @admin.register(Reviewer) -class ReviewAdmin(admin.ModelAdmin): +class ReviewersAdmin(admin.ModelAdmin): list_display = ("name", "surname",) search_fields = ("name", "surname",) From 9d9f6c811fd0cb8071e6360fb1cfe61d28885a0a Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 13:53:34 +0300 Subject: [PATCH 2/4] adad filter_horizontal to reviewers --- services/backend/apps/competition/admin.py | 1 + services/backend/apps/task/admin.py | 3 +++ services/backend/apps/task/models.py | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/services/backend/apps/competition/admin.py b/services/backend/apps/competition/admin.py index 6c78551..a28901d 100644 --- a/services/backend/apps/competition/admin.py +++ b/services/backend/apps/competition/admin.py @@ -7,6 +7,7 @@ from apps.task.admin import CompetitionTaskInline @admin.register(Competition) class CompetitionAdmin(admin.ModelAdmin): list_display = ( + "id", "title", "end_date", "type", diff --git a/services/backend/apps/task/admin.py b/services/backend/apps/task/admin.py index dd3ed25..a09f852 100644 --- a/services/backend/apps/task/admin.py +++ b/services/backend/apps/task/admin.py @@ -12,6 +12,9 @@ class CompletionAttachmentInline(admin.StackedInline): @admin.register(CompetitionTask) class CompetitionTaskAdmin(admin.ModelAdmin): list_display = ("title", "type", "points") + filter_horizontal = ( + "reviewers", + ) @admin.register(CompetitionTaskSubmission) diff --git a/services/backend/apps/task/models.py b/services/backend/apps/task/models.py index b2741ed..3be2e97 100644 --- a/services/backend/apps/task/models.py +++ b/services/backend/apps/task/models.py @@ -51,7 +51,12 @@ class CompetitionTask(BaseModel): ) # only when "review" type - reviewers = models.ManyToManyField(Reviewer, blank=True) + reviewers = models.ManyToManyField( + Reviewer, + blank=True, + verbose_name="ревьюверы", + help_text="Справа отображаются действующие проверяющие, слева - доступные для выбора. Для перемещения можно кликнуть 2 раза по проверяющему" + ) def __str__(self): return self.title From bef7337d1c0c361de66d6d51c4ef80312ac3b513 Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 13:53:57 +0300 Subject: [PATCH 3/4] remove reviews admin --- services/backend/apps/review/admin.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/backend/apps/review/admin.py b/services/backend/apps/review/admin.py index 48730de..c173af7 100644 --- a/services/backend/apps/review/admin.py +++ b/services/backend/apps/review/admin.py @@ -7,11 +7,3 @@ from apps.review.models import Review, Reviewer class ReviewersAdmin(admin.ModelAdmin): list_display = ("name", "surname",) search_fields = ("name", "surname",) - - -@admin.register(Review) -class ReviewAdmin(admin.ModelAdmin): - list_display = ("id", "reviewer", "submission",) - search_fields = ("id", "reviewer__id", "reviewer__name", "reviewer__surname", - "submission__id", "submission__content") - list_filter = ("submission__plagiarism_checked", "submission__status",) From 45f3f610e4bda0d8da3bafc044eb5ff855f16b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A1=D1=83=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Sun, 2 Mar 2025 13:54:48 +0300 Subject: [PATCH 4/4] feat: added task_position in reviewer responce --- services/backend/api/v1/review/schemas.py | 1 + 1 file changed, 1 insertion(+) diff --git a/services/backend/api/v1/review/schemas.py b/services/backend/api/v1/review/schemas.py index 3e47f62..1b79004 100644 --- a/services/backend/api/v1/review/schemas.py +++ b/services/backend/api/v1/review/schemas.py @@ -37,6 +37,7 @@ class SubmissionOut(ModelSchema): submitted_at: datetime = Field(..., alias="timestamp") competition: UUID = Field(..., alias="task.competition.id") competition_name: str = Field(..., alias="task.competition.title") + task_position: int = Field(..., alias="task.in_competition_position") @staticmethod def resolve_criteries(self, context) -> list[CriteriaOut] | None: