nelsbrock/NateMan
1
0
Fork 0
mirror of https://github.com/nelsbrock/NateMan.git synced 2026-08-14 21:36:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Koopschulentabelle durch koop-Boolean ersetzt

Browse Source
This commit is contained in:
nelsbrock
2021-08-10 17:53:16 +02:00
parent ea4227d37a
commit f31c4e802f
10 changed files with 318 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nateman/templates/klausuren/edit.html.j2
+4 -14
View File
@@ -191,10 +191,7 @@
<input type="checkbox" name="s_{{ kt.schueler.id }}" id="s_{{ kt.schueler.id }}" class="schueler-cb"
{% if kt.versaeumt %} checked {% endif %} {% if no_edit %} disabled {% endif %}>
{{ kt.schueler.nachname }}, {{ kt.schueler.vorname }}
<span class="detail">
({% if kt.schueler.stammschule is not none %}{{ kt.schueler.stammschule.name }},
{% endif %}{{ kt.schueler.id }})
</span>
<span class="detail">({{ kt.schueler.id }}{% if kt.schueler.koop %}, Koop{% endif %})</span>
</label>
<input type="submit" form="remove-form" name="r_{{ kt.schueler.id }}" class="plain" value="&#xD7;"
title="entfernen" {% if no_edit %} disabled {% endif %}>
@@ -237,7 +234,7 @@
<option value="new-schueler">Neuen Schüler hinzufügen...</option>
{% for schueler in not_in_klausur_list %}
<option value="{{ schueler.id }}">{{ schueler.nachname }}, {{ schueler.vorname }}
({% if schueler.stammschule is not none %}{{ schueler.stammschule.name }}, {% endif %}{{ schueler.id }})
({{ schueler.id }}{% if schueler.koop %}, Koop{% endif %})
</option>
{% endfor %}
</select>
@@ -254,15 +251,8 @@
<div><input type="text" name="new-schueler-vorname" id="new-schueler-vorname-input"></div>
</div>
<div>
<div><label for="new-schueler-stammschule-select">Stammschule:</label></div>
<div>
<select name="new-schueler-stammschule" id="new-schueler-stammschule-select">
<option value="" selected>(kein Koop-Schüler)</option>
{% for ks in Koopschule.query.all() %}
<option value="{{ ks.kuerzel }}">{{ ks.name }}</option>
{% endfor %}
</select>
</div>
<div><label for="new-schueler-koop-cb">Koop-Schüler:</label></div>
<div><input type="checkbox" name="new-schueler-koop" id="new-schueler-koop-cb"></div>
</div>
</div>
nateman/templates/schueler/versaeumnisse.html.j2
+1 -2
View File
@@ -61,8 +61,7 @@
{% for kt in versaeumt_list %}
<tr class="clickable" tabindex="0" data-href="{{ url_for('klausuren.edit', klausur_id=kt.klausur.id) }}">
<td>{{ kt.schueler.nachname }}, {{ kt.schueler.vorname }}
<span class="detail">({% if kt.schueler.stammschule is not none %}{{ kt.schueler.stammschule.name }},
{% endif %}{{ kt.schueler.id }})</span>
<span class="detail">({{ kt.schueler.id }}{% if kt.schueler.koop %}, Koop{% endif %})</span>
</td>
<td>{{ macros.date(kt.klausur.date) }}</td>
<td>{{ kt.klausur.kursname }}</td>