Add report fields to Student

This commit is contained in:
Claude Paroz 2018-02-05 13:59:29 +01:00
parent 2a7f57859d
commit 7488cbcd31
4 changed files with 39 additions and 1 deletions

View file

@ -5,7 +5,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('stages', '__latest__'),
('stages', '__first__'),
('candidats', '0002_deposit_date_non_null'),
]

View file

@ -95,10 +95,13 @@ class StudentAdmin(admin.ModelAdmin):
ordering = ('last_name', 'first_name')
list_filter = (('archived', ArchivedListFilter), ('klass', KlassRelatedListFilter))
search_fields = ('last_name', 'first_name', 'pcode', 'city', 'klass__name')
readonly_fields = ('report_sem1_sent', 'report_sem2_sent')
fields = (('last_name', 'first_name', 'ext_id'), ('street', 'pcode', 'city', 'district'),
('email', 'tel', 'mobile'), ('gender', 'avs', 'birth_date'),
('archived', 'dispense_ecg', 'dispense_eps', 'soutien_dys'),
('klass', 'option_ase'),
('report_sem1', 'report_sem1_sent'),
('report_sem2', 'report_sem2_sent'),
('corporation', 'instructor'))
actions = ['archive']

View file

@ -0,0 +1,31 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stages', '0003_student_birthdate_nullable'),
]
operations = [
migrations.AddField(
model_name='student',
name='report_sem1',
field=models.FileField(blank=True, null=True, upload_to='bulletins', verbose_name='Bulletin 1er sem.'),
),
migrations.AddField(
model_name='student',
name='report_sem1_sent',
field=models.DateTimeField(blank=True, null=True, verbose_name='Date envoi bull. sem 1'),
),
migrations.AddField(
model_name='student',
name='report_sem2',
field=models.FileField(blank=True, null=True, upload_to='bulletins', verbose_name='Bulletin 2e sem.'),
),
migrations.AddField(
model_name='student',
name='report_sem2_sent',
field=models.DateTimeField(blank=True, null=True, verbose_name='Date envoi bull. sem 2'),
),
]

View file

@ -176,6 +176,10 @@ class Student(models.Model):
on_delete=models.SET_NULL, verbose_name='FEE/FPP')
klass = models.ForeignKey(Klass, verbose_name='Classe', blank=True, null=True,
on_delete=models.PROTECT)
report_sem1 = models.FileField('Bulletin 1er sem.', null=True, blank=True, upload_to='bulletins')
report_sem1_sent = models.DateTimeField('Date envoi bull. sem 1', null=True, blank=True)
report_sem2 = models.FileField('Bulletin 2e sem.', null=True, blank=True, upload_to='bulletins')
report_sem2_sent = models.DateTimeField('Date envoi bull. sem 2', null=True, blank=True)
archived = models.BooleanField(default=False, verbose_name='Archivé')
archived_text = models.TextField(blank=True)