mirror of
https://codeberg.org/Mo8it/AdvLabDB.git
synced 2024-11-08 21:21:06 +00:00
Add table columns
This commit is contained in:
parent
c0bcdc4da5
commit
d2ac3a7568
1 changed files with 34 additions and 12 deletions
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<div class="d-inline-flex">
|
<div class="table-responsive">
|
||||||
<table class="table table-striped table-bordered">
|
<table class="table table-striped table-bordered">
|
||||||
<thead class="thead-dark">
|
<thead class="thead-dark">
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -76,11 +76,20 @@
|
||||||
<th scope="col">
|
<th scope="col">
|
||||||
Protocol mark
|
Protocol mark
|
||||||
</th>
|
</th>
|
||||||
|
<th scope="col">
|
||||||
|
Final experiment mark¹
|
||||||
|
</th>
|
||||||
|
<th scope="col">
|
||||||
|
University email
|
||||||
|
</th>
|
||||||
|
<th scope="col">
|
||||||
|
Contact email²
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for student, oral_experiment_mark, protocol_experiment_mark in experiment_mark_zip %}
|
{% for student, oral_experiment_mark, protocol_experiment_mark, final_experiment_mark in experiment_mark_zip %}
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">
|
<th scope="row">
|
||||||
{{ student }}
|
{{ student }}
|
||||||
|
@ -91,6 +100,19 @@
|
||||||
<td>
|
<td>
|
||||||
{{ protocol_experiment_mark }}
|
{{ protocol_experiment_mark }}
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
{% if final_experiment_mark is none %}
|
||||||
|
<span style='color:red'><strong>None</strong></span>
|
||||||
|
{% else %}
|
||||||
|
{{ final_experiment_mark }}
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{ student.uni_email }}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{ student.contact_email }}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -100,21 +122,21 @@
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<div class="form-group form-row">
|
<div class="form-group form-row">
|
||||||
<label for={{ form.note.id }} class="col-form-label">{{ form.note.label }}</label>
|
<label for={{ form.note.id }} class="col-form-label">{{ form.note.label }}³</label>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{{ form.note }}
|
{{ form.note }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p>{{ form.note.description }}</p>
|
{{ form.submit }}
|
||||||
|
|
||||||
<br>
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{{ form.submit }}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<font size="2">
|
||||||
|
<p>1. </p>
|
||||||
|
<p>2. </p>
|
||||||
|
<p>3. {{ form.note.description }}</p>
|
||||||
|
</font>
|
||||||
{{ footer|safe }}
|
{{ footer|safe }}
|
||||||
{% endblock body %}
|
{% endblock body %}
|
||||||
|
|
Loading…
Reference in a new issue