add attachment managment and rewrite migrations

This commit is contained in:
Timur
2025-03-03 00:24:24 +03:00
parent 0f088c0145
commit d567b06af3
16 changed files with 40 additions and 231 deletions
@@ -1,8 +1,8 @@
# Generated by Django 5.1.6 on 2025-03-02 10:28
# Generated by Django 5.1.6 on 2025-03-02 21:24
import apps.task.models
import django.db.models.deletion
import tinymce.models
import martor.models
import uuid
from django.db import migrations, models
@@ -22,16 +22,17 @@ class Migration(migrations.Migration):
name='CompetitionTask',
fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('in_competition_position', models.PositiveSmallIntegerField(blank=True, null=True)),
('in_competition_position', models.PositiveSmallIntegerField()),
('title', models.CharField(max_length=50, verbose_name='заголовок')),
('description', tinymce.models.HTMLField(max_length=300, verbose_name='описание')),
('description', martor.models.MartorField(verbose_name='описание')),
('max_attempts', models.PositiveSmallIntegerField(blank=True, null=True)),
('type', models.CharField(choices=[('input', 'Ввод правильного ответа'), ('checker', 'Ввод кода'), ('review', 'Ручная')], max_length=8, verbose_name='тип проверки')),
('correct_answer_file', models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to, verbose_name='файл с правильным ответом')),
('points', models.IntegerField(blank=True, null=True, verbose_name='баллы за задание')),
('answer_file_path', models.TextField(blank=True, default='stdout', help_text='Путь до файла в котором ожидается результат. Пример: stdout или ./output.txt', null=True, verbose_name='куда сделать вывод программы участнику')),
('submission_reviewers_count', models.PositiveSmallIntegerField(blank=True, default=1, null=True)),
('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
('reviewers', models.ManyToManyField(blank=True, to='review.reviewer')),
('reviewers', models.ManyToManyField(blank=True, help_text='Справа отображаются действующие проверяющие, слева - доступные для выбора. Для перемещения можно кликнуть 2 раза по проверяющему', to='review.reviewer', verbose_name='ревьюверы')),
],
options={
'verbose_name': 'задание',
@@ -43,12 +44,13 @@ class Migration(migrations.Migration):
fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('file', models.FileField(upload_to=apps.task.models.CompetitionTaskAttachment.file_upload_at, verbose_name='файл')),
('bind_at', models.FilePathField(verbose_name='путь сохранения')),
('bind_at', models.CharField(max_length=255, verbose_name='путь сохранения')),
('public', models.BooleanField(default=False, verbose_name='публичный')),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask', verbose_name='задание')),
],
options={
'abstract': False,
'verbose_name': 'вложение',
'verbose_name_plural': 'вложения',
},
),
migrations.CreateModel(
@@ -69,19 +71,20 @@ class Migration(migrations.Migration):
name='CompetitionTaskSubmission',
fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('status', models.CharField(choices=[('sent', 'Sent'), ('checking', 'Checking'), ('checked', 'Checked')], default='sent', max_length=8, verbose_name='статус')),
('content', models.FileField(upload_to=apps.task.models.CompetitionTaskSubmission.submission_content_upload_to)),
('stdout', models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTaskSubmission.submission_stdout_upload_to)),
('result', models.JSONField(blank=True, default=None, null=True)),
('earned_points', models.IntegerField(blank=True, null=True)),
('checked_at', models.DateTimeField(blank=True, null=True)),
('plagiarism_checked', models.BooleanField(default=False)),
('timestamp', models.DateTimeField(auto_now_add=True)),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
('status', models.CharField(choices=[('sent', 'Отправлено на проверку'), ('checking', 'Проверка'), ('checked', 'Проверено')], default='sent', max_length=8, verbose_name='статус')),
('content', models.FileField(upload_to=apps.task.models.CompetitionTaskSubmission.submission_content_upload_to, verbose_name='содержание посылки')),
('stdout', models.FileField(blank=True, help_text='Используется только при проверке чекером', null=True, upload_to=apps.task.models.CompetitionTaskSubmission.submission_stdout_upload_to, verbose_name='вывод программы')),
('result', models.JSONField(blank=True, default=None, null=True, verbose_name='результат проверки')),
('earned_points', models.IntegerField(blank=True, null=True, verbose_name='баллы за задание')),
('checked_at', models.DateTimeField(blank=True, null=True, verbose_name='дата проверки')),
('plagiarism_checked', models.BooleanField(default=False, verbose_name='проверено на плагиат')),
('timestamp', models.DateTimeField(auto_now_add=True, verbose_name='дата отправки')),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask', verbose_name='задание')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user', verbose_name='пользователь')),
],
options={
'abstract': False,
'verbose_name': 'посылка',
'verbose_name_plural': 'посылки',
},
),
]