From 16ca90f6eb6d0a03f15e34676978eab8f4a0b24a Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 5 Jun 2020 11:53:51 +0200 Subject: [PATCH] Add CorpContact.nation for nationality --- stages/admin.py | 2 +- stages/migrations/0032_contact_nationalite.py | 16 ++++++++++++++++ stages/models.py | 1 + stages/pdf.py | 3 +-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 stages/migrations/0032_contact_nationalite.py diff --git a/stages/admin.py b/stages/admin.py index eabb971..637a9ab 100644 --- a/stages/admin.py +++ b/stages/admin.py @@ -231,7 +231,7 @@ class CorpContactAdmin(admin.ModelAdmin): search_fields = ('last_name', 'first_name', 'role') fields = (('civility', 'last_name', 'first_name'), ('street', 'pcode', 'city'), - ('birth_date',), + ('birth_date', 'nation'), ('corporation',), ('sections', 'is_main', 'always_cc', 'archived'), ('role', 'ext_id'), ('tel', 'email'), ('avs',), diff --git a/stages/migrations/0032_contact_nationalite.py b/stages/migrations/0032_contact_nationalite.py new file mode 100644 index 0000000..adf34a2 --- /dev/null +++ b/stages/migrations/0032_contact_nationalite.py @@ -0,0 +1,16 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('stages', '0031_remove_contact_ccp'), + ] + + operations = [ + migrations.AddField( + model_name='corpcontact', + name='nation', + field=models.CharField(blank=True, max_length=40, verbose_name='Nationalité'), + ), + ] diff --git a/stages/models.py b/stages/models.py index 3de8612..68f67d0 100644 --- a/stages/models.py +++ b/stages/models.py @@ -482,6 +482,7 @@ class CorpContact(models.Model): first_name = models.CharField(max_length=40, blank=True, verbose_name='Prénom') last_name = models.CharField(max_length=40, verbose_name='Nom') birth_date = models.DateField(blank=True, null=True, verbose_name='Date de naissance') + nation = models.CharField("Nationalité", max_length=40, blank=True) role = models.CharField(max_length=40, blank=True, verbose_name='Fonction') street = models.CharField(max_length=100, blank=True, verbose_name='Rue') pcode = models.CharField(max_length=4, blank=True, verbose_name='Code postal') diff --git a/stages/pdf.py b/stages/pdf.py index dd097b8..2346086 100644 --- a/stages/pdf.py +++ b/stages/pdf.py @@ -307,8 +307,7 @@ class CompensationForm: [ self.formating('Date de naissance :'), django_format(person.birth_date, 'j F Y') if person.birth_date else '.' * 30, - self.formating('Nationalité :'), - '.' * 30, + self.formating('Nationalité :'), person.nation or '.' * 30, ], [ self.formating('N° de téléphone :'), person.tel or '.' * 30,