Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/apps/competition/migrations/0004_alter_competition_description_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.1.6 on 2025-03-01 14:46
+
+import tinymce.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competition', '0003_remove_competition_tasks'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='competition',
+            name='description',
+            field=tinymce.models.HTMLField(verbose_name='описание'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='end_date',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='дедлайн участия'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='image_url',
+            field=models.FileField(blank=True, null=True, upload_to='', verbose_name='изображение соревнования'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='participation_type',
+            field=models.CharField(choices=[('edu', 'Образовательный'), ('competitive', 'Соревновательный')], max_length=11, verbose_name='тип соревнования'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='start_date',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='дедлайн участия'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='title',
+            field=models.CharField(max_length=100, verbose_name='аазвание'),
+        ),
+        migrations.AlterField(
+            model_name='competition',
+            name='type',
+            field=models.CharField(choices=[('solo', 'Индивидуальный')], max_length=10, verbose_name='тип участия'),
+        ),
+    ]

services/backend/apps/competition/models.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from django.db import models
+from tinymce.models import HTMLField
 
 from apps.core.models import BaseModel
 from apps.user.models import User
@@ -17,29 +18,29 @@ class Competition(BaseModel):
     def image_url_upload_to(instance, filename):
         return f"/competitions/{instance.id}/image"
 
-    title = models.CharField(max_length=100, verbose_name="Название")
-    description = models.TextField(verbose_name="Описание")
+    title = models.CharField(max_length=100, verbose_name="название")
+    description = models.TextField(verbose_name="описание")
     image_url = models.FileField(
-        verbose_name="Изображение соревнования",
+        verbose_name="изображение соревнования",
         null=True,
         blank=True,
         upload_to=image_url_upload_to,
     )
     end_date = models.DateTimeField(
-        verbose_name="Дедлайн участия", null=True, blank=True
+        verbose_name="дедлайн участия", null=True, blank=True
     )
     start_date = models.DateTimeField(
-        verbose_name="Дедлайн участия", null=True, blank=True
+        verbose_name="дедлайн участия", null=True, blank=True
     )
     type = models.CharField(
         max_length=10,
         choices=CompetitionType.choices,
-        verbose_name="Тип участия",
+        verbose_name="тип участия",
     )
     participation_type = models.CharField(
         max_length=11,
         choices=CompetitionParticipationType.choices,
-        verbose_name="Тип соревнования",
+        verbose_name="тип соревнования",
     )
     participants = models.ManyToManyField(
         User, related_name="participants", blank=True, editable=False
@@ -48,6 +49,8 @@ class Competition(BaseModel):
     def __str__(self):
         return self.title
 
+
+
     class Meta:
         verbose_name = "соревнование"
         verbose_name_plural = "соревнования"