diff --git a/competition/migrations/0003_alter_solution_corrected_solution_and_more.py b/competition/migrations/0003_alter_solution_corrected_solution_and_more.py new file mode 100644 index 0000000..a2e5154 --- /dev/null +++ b/competition/migrations/0003_alter_solution_corrected_solution_and_more.py @@ -0,0 +1,26 @@ +# Generated by Django 4.2.15 on 2024-11-23 23:11 + +import base.models +import competition.models +import django.core.files.storage +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('competition', '0002_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='solution', + name='corrected_solution', + field=base.models.RestrictedFileField(blank=True, storage=django.core.files.storage.FileSystemStorage(base_url='/protected/', location='/home/michal/Documents/kody/STROM/webstrom-backend/protected_media/'), upload_to=competition.models.get_corrected_solution_path, verbose_name='opravené riešenie'), + ), + migrations.AlterField( + model_name='solution', + name='solution', + field=base.models.RestrictedFileField(blank=True, storage=django.core.files.storage.FileSystemStorage(base_url='/protected/', location='/home/michal/Documents/kody/STROM/webstrom-backend/protected_media/'), upload_to=competition.models.get_solution_path, verbose_name='účastnícke riešenie'), + ), + ] diff --git a/personal/migrations/0003_alter_profile_parent_phone_alter_profile_phone.py b/personal/migrations/0003_alter_profile_parent_phone_alter_profile_phone.py new file mode 100644 index 0000000..6c734c9 --- /dev/null +++ b/personal/migrations/0003_alter_profile_parent_phone_alter_profile_phone.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.15 on 2024-11-23 23:11 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('personal', '0002_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='parent_phone', + field=models.CharField(blank=True, help_text='Telefonné číslo v medzinárodnom formáte (napr. +421 123 456 789).', max_length=32, null=True, validators=[django.core.validators.RegexValidator(message='Zadaj telefónne číslo vo formáte +421 123 456 789 alebo 0912 345 678.', regex='^(\\+\\d{1,3}\\d{9})$')], verbose_name='telefónne číslo na rodiča'), + ), + migrations.AlterField( + model_name='profile', + name='phone', + field=models.CharField(blank=True, help_text='Telefonné číslo v medzinárodnom formáte (napr. +421 123 456 789).', max_length=32, null=True, validators=[django.core.validators.RegexValidator(message='Zadaj telefónne číslo vo formáte +421 123 456 789 alebo 0912 345 678.', regex='^(\\+\\d{1,3}\\d{9})$')], verbose_name='telefónne číslo'), + ), + ] diff --git a/personal/models.py b/personal/models.py index 6b71574..27c9dd1 100644 --- a/personal/models.py +++ b/personal/models.py @@ -114,12 +114,12 @@ class Meta: verbose_name='rok maturity') phone = models.CharField( - verbose_name='telefónne číslo', max_length=32, blank=True, + verbose_name='telefónne číslo', max_length=32, blank=True, null=True, validators=[phone_number_validator], help_text='Telefonné číslo v medzinárodnom formáte (napr. +421 123 456 789).') parent_phone = models.CharField( - verbose_name='telefónne číslo na rodiča', max_length=32, blank=True, + verbose_name='telefónne číslo na rodiča', max_length=32, blank=True, null=True, validators=[phone_number_validator], help_text='Telefonné číslo v medzinárodnom formáte (napr. +421 123 456 789).') diff --git a/personal/serializers.py b/personal/serializers.py index a209657..9dab618 100644 --- a/personal/serializers.py +++ b/personal/serializers.py @@ -118,8 +118,8 @@ def create(self, validated_data): last_name=validated_data['last_name'], school=school, year_of_graduation=grade.get_year_of_graduation_by_date(), - phone=validated_data['phone'], - parent_phone=validated_data['parent_phone'] + phone=validated_data.get('phone', None), + parent_phone=validated_data.get('parent_phone', None), )