From f993de64e612d070dcf12ce15c0cacf1fe31a412 Mon Sep 17 00:00:00 2001
From: salazard <hamzatouizrat@yahoo.com>
Date: Fri, 28 Oct 2022 21:51:34 +0200
Subject: [PATCH] fiwe modifcation
---
api/urls.py | 3 +++
profiles/serializers.py | 2 +-
users/migrations/0006_user_hassignedvharter.py | 18 ++++++++++++++++++
users/migrations/0007_auto_20221028_1429.py | 18 ++++++++++++++++++
users/models.py | 1 +
5 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 users/migrations/0006_user_hassignedvharter.py
create mode 100644 users/migrations/0007_auto_20221028_1429.py
diff --git a/api/urls.py b/api/urls.py
index 46497be..4c66c98 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -17,6 +17,8 @@ app_name = 'api'
urlpatterns = [
url(r'^auth/get-token/$', obtain_auth_token, name='get-auth-token'),
+ url(r'^charter/$', users_views.UserCheckChartViewSet.as_view()),
+
]
router = routers.DefaultRouter(trailing_slash=True)
@@ -24,6 +26,7 @@ router = routers.DefaultRouter(trailing_slash=True)
# Users views
router.register('users', users_views.UserViewSet)
+
# Profiles views
router.register('tutors', profiles_views.TutorViewSet)
router.register('students', profiles_views.StudentViewSet, base_name='student')
diff --git a/profiles/serializers.py b/profiles/serializers.py
index 76a1c54..d5774a1 100644
--- a/profiles/serializers.py
+++ b/profiles/serializers.py
@@ -34,7 +34,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', 'year', 'dateOfBirth')
+ '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'},
}
diff --git a/users/migrations/0006_user_hassignedvharter.py b/users/migrations/0006_user_hassignedvharter.py
new file mode 100644
index 0000000..85d00f8
--- /dev/null
+++ b/users/migrations/0006_user_hassignedvharter.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-10-28 12:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0005_remove_user_qpv'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='HasSignedVharter',
+ field=models.BooleanField(blank=True, default='False', null=True, verbose_name='Chartre'),
+ ),
+ ]
diff --git a/users/migrations/0007_auto_20221028_1429.py b/users/migrations/0007_auto_20221028_1429.py
new file mode 100644
index 0000000..0e770c6
--- /dev/null
+++ b/users/migrations/0007_auto_20221028_1429.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-10-28 12:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0006_user_hassignedvharter'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='user',
+ old_name='HasSignedVharter',
+ new_name='HasSignedCharter',
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index 264547d..9989306 100644
--- a/users/models.py
+++ b/users/models.py
@@ -79,6 +79,7 @@ class User(AbstractUser):
phone_number = models.CharField('téléphone',
max_length=20, null=True, blank=True)
+ HasSignedCharter = models.BooleanField('Chartre', null=True, blank=True,default='False')
@property
def student(self):
--
GitLab