PROD.2025/DataRush
1
0
Fork 0
mirror of https://gitlab.com/megazordpobeda/DataRush.git synced 2026-05-23 20:17:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

<type>(scope): <description>

Browse Source 
[body]

[footer(s)]
This commit is contained in:
ITQ
2025-03-03 12:42:04 +03:00
parent 1fd31bdeff
commit 04b1db4a1b
10 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/backend/apps/achievement/migrations/0001_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import apps.achievement.models import apps.achievement.models
import django.db.models.deletion import django.db.models.deletion
services/backend/apps/achievement/migrations/0002_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models
services/backend/apps/competition/migrations/0001_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import apps.competition.models import apps.competition.models
import datetime import datetime
services/backend/apps/review/migrations/0001_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import uuid import uuid
from django.db import migrations, models from django.db import migrations, models
services/backend/apps/review/migrations/0002_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models
services/backend/apps/task/migrations/0001_initial.py
+17 -16
View File
@@ -1,8 +1,8 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import apps.task.models import apps.task.models
import django.db.models.deletion import django.db.models.deletion
import martor.models import mdeditor.fields
import uuid import uuid
from django.db import migrations, models from django.db import migrations, models
@@ -22,17 +22,17 @@ class Migration(migrations.Migration):
name='CompetitionTask', name='CompetitionTask',
fields=[ fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('in_competition_position', models.PositiveSmallIntegerField()), ('in_competition_position', models.PositiveSmallIntegerField(verbose_name='позиция в соревновании')),
('title', models.CharField(max_length=50, verbose_name='заголовок')), ('title', models.CharField(max_length=50, verbose_name='заголовок')),
('description', martor.models.MartorField(verbose_name='описание')), ('description', mdeditor.fields.MDTextField(verbose_name='описание')),
('max_attempts', models.PositiveSmallIntegerField(blank=True, null=True)), ('max_attempts', models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='максимальное кол-во попыток')),
('type', models.CharField(choices=[('input', 'Ввод правильного ответа'), ('checker', 'Ввод кода'), ('review', 'Ручная')], max_length=8, verbose_name='тип проверки')), ('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='файл с правильным ответом')), ('correct_answer_file', models.FileField(blank=True, help_text='Имеет смысл только при автоматической (ввод ответа или кода) проверке.', null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to, verbose_name='файл с правильным ответом')),
('points', models.IntegerField(blank=True, null=True, 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='куда сделать вывод программы участнику')), ('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)), ('submission_reviewers_count', models.PositiveSmallIntegerField(blank=True, default=1, null=True, verbose_name='кол-во проверяющих для зачета задачи')),
('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')), ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition', verbose_name='привязанное соревнование')),
('reviewers', models.ManyToManyField(blank=True, help_text='Справа отображаются действующие проверяющие, слева - доступные для выбора. Для перемещения можно кликнуть 2 раза по проверяющему', to='review.reviewer', verbose_name='ревьюверы')), ('reviewers', models.ManyToManyField(blank=True, help_text='Справа отображаются действующие проверяющие, слева - доступные для выбора. Для перемещения можно кликнуть 2 раза по проверяющему. Имеет смысл только при ручном типе проверки.', to='review.reviewer', verbose_name='ревьюверы')),
], ],
options={ options={
'verbose_name': 'задание', 'verbose_name': 'задание',
@@ -57,14 +57,15 @@ class Migration(migrations.Migration):
name='CompetitionTaskCriteria', name='CompetitionTaskCriteria',
fields=[ fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('name', models.TextField()), ('name', models.TextField(verbose_name='название')),
('slug', models.SlugField()), ('slug', models.SlugField(verbose_name='техническое название')),
('description', models.TextField()), ('description', models.TextField(verbose_name='описание критерии')),
('max_value', models.PositiveSmallIntegerField()), ('max_value', models.PositiveSmallIntegerField(verbose_name='максимальное кол-во баллов')),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='criteries', to='task.competitiontask')), ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='criteries', to='task.competitiontask')),
], ],
options={ options={
'abstract': False, 'verbose_name': 'критерий',
'verbose_name_plural': 'критерии',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
services/backend/apps/team/migrations/0001_initial.py
+1 -1
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import django.db.models.deletion import django.db.models.deletion
import uuid import uuid
services/backend/apps/user/migrations/0001_initial.py
+4 -3
View File
@@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-03-03 07:20 # Generated by Django 5.1.6 on 2025-03-03 09:41
import uuid import uuid
from django.db import migrations, models from django.db import migrations, models
@@ -17,11 +17,12 @@ class Migration(migrations.Migration):
name='User', name='User',
fields=[ fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('avatar', models.ImageField(blank=True, null=True, upload_to='', verbose_name='аватар')),
('email', models.EmailField(max_length=254, unique=True, verbose_name='почта')), ('email', models.EmailField(max_length=254, unique=True, verbose_name='почта')),
('username', models.SlugField(unique=True, verbose_name='юзернейм')), ('username', models.SlugField(unique=True, verbose_name='юзернейм')),
('password', models.TextField(verbose_name='пароль')), ('password', models.TextField(verbose_name='пароль')),
('created_at', models.DateTimeField(auto_now=True)), ('created_at', models.DateTimeField(auto_now=True, verbose_name='дата создания')),
('status', models.CharField(choices=[('student', 'Student'), ('metodist', 'Metodist')], default='student', max_length=10)), ('status', models.CharField(choices=[('student', 'Участник соревнований'), ('metodist', 'Методист (составитель заданий)')], default='student', max_length=10, verbose_name='роль участника')),
('achievements', models.ManyToManyField(blank=True, to='achievement.achievement', verbose_name='ачивки пользователя')), ('achievements', models.ManyToManyField(blank=True, to='achievement.achievement', verbose_name='ачивки пользователя')),
], ],
options={ options={
services/backend/apps/user/models.py
+1 -1
View File
@@ -11,7 +11,7 @@ class UserRole(models.TextChoices):
class User(BaseModel): class User(BaseModel):
avatar = models.ImageField(verbose_name="аватар") avatar = models.ImageField(verbose_name="аватар", null=True, blank=True)
email = models.EmailField(unique=True, verbose_name="почта") email = models.EmailField(unique=True, verbose_name="почта")
username = models.SlugField(unique=True, verbose_name="юзернейм") username = models.SlugField(unique=True, verbose_name="юзернейм")
password = models.TextField(verbose_name="пароль") password = models.TextField(verbose_name="пароль")
services/backend/config/urls.py
+1 -1
View File
@@ -13,7 +13,7 @@ admin.site.index_title = "DataRush"
urlpatterns = [ urlpatterns = [
# mdeditor # mdeditor
path(r'mdeditor/', include('mdeditor.urls')), path(r"mdeditor/", include("mdeditor.urls")),
# Admin urls # Admin urls
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
# API urls # API urls