diff --git a/profiles/migrations/0018_auto_20220909_1740.py b/profiles/migrations/0018_auto_20220909_1740.py new file mode 100644 index 0000000000000000000000000000000000000000..08c6e8df8023ac07da04702ba6390975783bd426 --- /dev/null +++ b/profiles/migrations/0018_auto_20220909_1740.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2 on 2022-09-09 15:40 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('profiles', '0017_student_qpv'), + ] + + operations = [ + migrations.AddField( + model_name='student', + name='dateOfBirth', + field=models.DateField(default=datetime.date(2000, 1, 1)), + preserve_default=False, + ), + migrations.AlterField( + model_name='tutor', + name='promotion', + field=models.IntegerField(choices=[(2025, '2025'), (2024, '2024'), (2023, '2023'), (2022, '2022'), (2021, '2021')], default=2025), + ), + ] diff --git a/profiles/serializers.py b/profiles/serializers.py index 941fc2c4198be36eac6acfcd78f77599505138a0..76a1c54429c08d3c510c258b6a0e0c709d11cbef 100644 --- a/profiles/serializers.py +++ b/profiles/serializers.py @@ -31,11 +31,10 @@ class StudentSerializer(serializers.HyperlinkedModelSerializer): read_only=True) registration = StudentRegistrationSerializer() - class Meta: # noqa model = Student fields = ( - 'user_id', 'user', 'url', 'registration', 'visits', 'gender', 'addressNumber', 'street', 'city', 'personalPhone', 'parentsPhone', 'parentsEmail', 'school', 'grade', 'scholarship', 'fatherActivity', 'motherActivity', 'parentsStatus', 'dependantsNumber', 'specialTeaching', 'nationality', 'zipCode', 'classType', 'year') + 'user_id', 'user', 'url', 'registration', 'visits', 'gender', 'addressNumber', 'street', 'city', 'personalPhone', 'parentsPhone', 'parentsEmail', 'school', 'grade', 'scholarship', 'fatherActivity', 'motherActivity', 'parentsStatus', 'dependantsNumber', 'specialTeaching', 'nationality', 'zipCode', 'classType', 'year', 'dateOfBirth') extra_kwargs = { 'url': {'view_name': 'api:student-detail'}, } diff --git a/register/migrations/0003_registration_dateofbirth.py b/register/migrations/0003_registration_dateofbirth.py new file mode 100644 index 0000000000000000000000000000000000000000..7582fb15a323a7138bb29d8ba4ec16da45aea99c --- /dev/null +++ b/register/migrations/0003_registration_dateofbirth.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2 on 2022-09-09 15:40 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('register', '0002_registration_phone_number'), + ] + + operations = [ + migrations.AddField( + model_name='registration', + name='dateOfBirth', + field=models.DateField(default=datetime.date(1997, 10, 19)), + preserve_default=False, + ), + ] diff --git a/register/serializers.py b/register/serializers.py index 01cea366ada0994d6e2b0d6ef2bd5ea185d32e11..12b6c582130261a88e1e97eb9c9252526b423a45 100644 --- a/register/serializers.py +++ b/register/serializers.py @@ -24,7 +24,7 @@ class RegistrationSerializer(serializers.ModelSerializer): model = Registration fields = ('id', 'email', 'password', 'first_name', 'last_name', 'phone_number', - 'submitted', 'validated',) + 'submitted', 'validated', 'dateOfBirth') extra_kwargs = { 'submitted': {'read_only': True}, @@ -43,6 +43,7 @@ class RegistrationSerializer(serializers.ModelSerializer): - Build/save the nested objects (address, emergency contact) - Build/save a user and a student profile """ + password = validated_data.pop('password') registration = Registration.objects.create(**validated_data) diff --git a/register/signals.py b/register/signals.py index 05723916545d82fbd1d52383913b6884eefc2e92..18c9ea040ee616b96e05e5b43cabecb1682c2cb0 100644 --- a/register/signals.py +++ b/register/signals.py @@ -27,5 +27,6 @@ def create_user_and_student(sender, instance: Registration, Student.objects.create( user=user, + dateOfBirth=instance.dateOfBirth, registration=instance, )