claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor display improvements

Browse source
This commit is contained in:
alazo 2017-11-21 17:34:15 +01:00 • committed by Claude Paroz
parent a08c25b893
commit ba0b693187
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,4 +1,6 @@
*.pyc
database.db
common/local_settings.py
media/
scripts/epcstages.json
static/

3
candidats/admin.py
View file

@ -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')

2
candidats/migrations/0001_initial.py
View file

@ -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.')),

2
candidats/models.py
View file

@ -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'

2
stages/models.py
View file

@ -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):