Skip to content
Snippets Groups Projects
Unverified Commit ab98e29c authored by Arthur Guédon's avatar Arthur Guédon Committed by GitHub
Browse files

merge dev into master (#26)


* Password reset feature (#8)

* Add Django Rest auth module

* Try to make the send reset password email work

* Modified template mail for reset

* Add Django Rest auth module

* Try to make the send reset password email work

* Modified template mail for reset

* test

* Added utf-8 support to exported csv and switched delimiter from , to ; in admin interface

* Disabled emails while in dev

* Added multi selection filter in admin

* Fixed mail settings

* Added year field to Tutor serializer

* Fixed year updated before registration form filled

* commit for automatic deploy

* Testing CI

Co-authored-by: default avatarchiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: default avatarflorimondmanca <florimond.manca@gmail.com>
Co-authored-by: default avatarDylan Sechet <dylan.sechet82@gmail.com>
parent 2ec43f40
No related branches found
No related tags found
No related merge requests found
# Generated by Django 2.2 on 2020-09-18 17:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('profiles', '0008_auto_20200918_1913'),
]
operations = [
migrations.AlterField(
model_name='student',
name='nationality',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='nationalité'),
),
migrations.AlterField(
model_name='student',
name='parentsEmail',
field=models.EmailField(blank=True, max_length=70, null=True, verbose_name='adresse mail parentale'),
),
migrations.AlterField(
model_name='student',
name='parentsStatus',
field=models.CharField(blank=True, max_length=70, null=True, verbose_name='statut des parents'),
),
migrations.AlterField(
model_name='student',
name='scholarship',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='boursier'),
),
migrations.AlterField(
model_name='student',
name='specialTeaching',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='enseignement de spécialité'),
),
]
# Generated by Django 2.2 on 2020-09-23 11:55
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('profiles', '0009_auto_20200918_1921'),
('profiles', '0009_auto_20200923_1329'),
]
operations = [
]
# Generated by Django 2.2 on 2020-09-23 13:07
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('profiles', '0010_merge_20200923_1355'),
('profiles', '0010_auto_20200923_1444'),
]
operations = [
]
# Generated by Django 2.2 on 2020-09-25 12:50
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('profiles', '0012_student_year'),
('profiles', '0011_merge_20200923_1507'),
]
operations = [
]
# Generated by Django 2.2 on 2020-11-16 10:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('profiles', '0013_merge_20200925_1450'),
]
operations = [
migrations.AlterField(
model_name='student',
name='school',
field=models.CharField(blank=True, max_length=70, null=True, verbose_name='établissement'),
),
]
......@@ -185,6 +185,7 @@ class Student(ProfileMixin, models.Model):
def save(self, *args, **kwargs):
"""Updates the year field based on the last modified date"""
if self.city != None: # Ne mettre à jour que quand les données personnelles sont remplies
date_now = datetime.now()
if date_now.month>=9:
self.year = f"{date_now.year}/{date_now.year+1}"
......
......@@ -35,7 +35,7 @@ class StudentSerializer(serializers.HyperlinkedModelSerializer):
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')
'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')
extra_kwargs = {
'url': {'view_name': 'api:student-detail'},
}
......@@ -4,7 +4,6 @@ from rest_framework import serializers
from .serializers import UserSerializer
from .models import User
class UserField(serializers.Field):
"""A field for representing a user.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment