Ajout enseignants ECG/EPS
This commit is contained in:
parent
5bb1679527
commit
6dfc3c6e42
4 changed files with 40 additions and 2 deletions
|
|
@ -65,6 +65,11 @@ class KlassAdmin(admin.ModelAdmin):
|
|||
list_display = ('name', 'section')
|
||||
ordering = ('name',)
|
||||
list_filter = ('section', 'level',)
|
||||
fields = (
|
||||
('name',),
|
||||
('section', 'level'),
|
||||
('teacher', 'teacher_ecg', 'teacher_eps'),
|
||||
)
|
||||
inlines = [StudentInline]
|
||||
|
||||
|
||||
|
|
|
|||
21
stages/migrations/0019_teacher_ecg_eps.py
Normal file
21
stages/migrations/0019_teacher_ecg_eps.py
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('stages', '0018_student_comments'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='klass',
|
||||
name='teacher_ecg',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=models.deletion.SET_NULL, related_name='+', to='stages.Teacher', verbose_name='Maître ECG'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='klass',
|
||||
name='teacher_eps',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=models.deletion.SET_NULL, related_name='+', to='stages.Teacher', verbose_name='Maître EPS'),
|
||||
),
|
||||
]
|
||||
|
|
@ -70,6 +70,10 @@ class Klass(models.Model):
|
|||
level = models.ForeignKey(Level, verbose_name='Niveau', on_delete=models.PROTECT)
|
||||
teacher = models.ForeignKey('Teacher', blank=True, null=True,
|
||||
on_delete=models.SET_NULL, verbose_name='Maître de classe')
|
||||
teacher_ecg = models.ForeignKey('Teacher', blank=True, null=True,
|
||||
on_delete=models.SET_NULL, verbose_name='Maître ECG', related_name='+')
|
||||
teacher_eps = models.ForeignKey('Teacher', blank=True, null=True,
|
||||
on_delete=models.SET_NULL, verbose_name='Maître EPS', related_name='+')
|
||||
|
||||
objects = models.Manager()
|
||||
active = ActiveKlassManager()
|
||||
|
|
|
|||
|
|
@ -9,12 +9,20 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{{ klass.name }}</h2>
|
||||
<h2>Classe {{ klass.name }}
|
||||
{% if perms.stages.change_klass %}<a class="changelink" href="{% url 'admin:stages_klass_change' klass.pk %}"> </a>{% endif %}
|
||||
</h2>
|
||||
|
||||
<div style="float:right;">
|
||||
<a href="{% url 'class' object.pk %}?format=xls"><img src="{% static 'img/xls.png' %}" title="Exportation Excel" width="24"></a>
|
||||
</div>
|
||||
<h3>Liste des éléves</h3>
|
||||
|
||||
<div style="margin-bottom: 0.7em;">
|
||||
Maître de classe : {{ klass.teacher }}<br>
|
||||
Enseignant-e ECG : {{ klass.teacher_ecg|default_if_none:'-' }}<br>
|
||||
Enseignant-e EPS : {{ klass.teacher_eps|default_if_none:'-' }}
|
||||
</div>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<th>Nom, prénom</th>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue