From ba0b6931875de2c3fe6cc1dfa3b87004fffc4b16 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Tue, 21 Nov 2017 17:34:15 +0100
Subject: [PATCH] Minor display improvements

---
 .gitignore                           | 2 ++
 candidats/admin.py                   | 3 +--
 candidats/migrations/0001_initial.py | 2 +-
 candidats/models.py                  | 2 +-
 stages/models.py                     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdd541d..ae5cdee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.pyc
 database.db
 common/local_settings.py
+media/
 scripts/epcstages.json
+static/
diff --git a/candidats/admin.py b/candidats/admin.py
index 4f687e2..dc86e0c 100644
--- a/candidats/admin.py
+++ b/candidats/admin.py
@@ -57,7 +57,7 @@ class CandidateAdmin(admin.ModelAdmin):
             'fields': (('first_name', 'last_name', 'gender'),
                        ('street', 'pcode', 'city', 'district'),
                        ('mobile', 'email'),
-                       ('birth_date', 'avs', 'handicap'),
+                       ('birth_date', 'avs', 'handicap', 'has_photo'),
                        ('section', 'option'),
                        ('corporation', 'instructor'),
                        ('deposite_date', 'date_confirmation_mail', 'canceled_file'),
@@ -73,7 +73,6 @@ class CandidateAdmin(admin.ModelAdmin):
             'fields': (('registration_form', 'certificate_of_payement', 'cv', 'certif_of_cfc',
                         'police_record', 'certif_of_800h', 'reflexive_text', 'work_certificate',
                         'marks_certificate', 'proc_admin_ext', 'promise', 'contract'),
-                       'comment',
                        ('interview_date', 'interview_room'),
                        ('examination_result', 'interview_result', 'file_result', 'total_result_points',
                         'total_result_mark')
diff --git a/candidats/migrations/0001_initial.py b/candidats/migrations/0001_initial.py
index e834e2a..bd3f605 100644
--- a/candidats/migrations/0001_initial.py
+++ b/candidats/migrations/0001_initial.py
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
                 ('integration_second_year', models.BooleanField(default=False, verbose_name='Intégration')),
                 ('date_confirmation_mail', models.DateField(blank=True, null=True, verbose_name='Mail de confirmation')),
                 ('canceled_file', models.BooleanField(default=False, verbose_name='Dossier retiré')),
-                ('has_photo', models.BooleanField(default=False)),
+                ('has_photo', models.BooleanField(default=False, verbose_name='Photo')),
                 ('registration_form', models.BooleanField(default=False, verbose_name="Formulaire d'inscription")),
                 ('certificate_of_payement', models.BooleanField(default=False, verbose_name='Attest. paiement')),
                 ('police_record', models.BooleanField(default=False, verbose_name='Casier judic.')),
diff --git a/candidats/models.py b/candidats/models.py
index fc3dd96..83ae97c 100644
--- a/candidats/models.py
+++ b/candidats/models.py
@@ -49,7 +49,7 @@ class Candidate(models.Model):
     integration_second_year = models.BooleanField('Intégration', default=False)
     date_confirmation_mail = models.DateField('Mail de confirmation', blank=True, null=True)
     canceled_file = models.BooleanField('Dossier retiré', default=False)
-    has_photo = models.BooleanField(default=False)
+    has_photo = models.BooleanField(default=False, verbose_name='Photo')
 
     corporation = models.ForeignKey(
         'stages.Corporation', null=True, blank=True, on_delete=models.SET_NULL, verbose_name='Employeur'
diff --git a/stages/models.py b/stages/models.py
index 817cabe..1adfd7f 100644
--- a/stages/models.py
+++ b/stages/models.py
@@ -283,7 +283,7 @@ class CorpContact(models.Model):
         verbose_name = "Contact"
 
     def __str__(self):
-        return '%s %s' % (self.last_name, self.first_name)
+        return '{0} {1}, {2}'.format(self.last_name, self.first_name, self.corporation)
 
 
 class Domain(models.Model):