diff --git a/advlabdb/templates/assistant_group_experiment_form.html b/advlabdb/templates/assistant_group_experiment_form.html index 3480b01..1e86dde 100644 --- a/advlabdb/templates/assistant_group_experiment_form.html +++ b/advlabdb/templates/assistant_group_experiment_form.html @@ -63,7 +63,7 @@
-
+
@@ -76,11 +76,20 @@ + + + - {% 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 %} + + + {% endfor %} @@ -100,21 +122,21 @@
- +
{{ form.note }}
-

{{ form.note.description }}

- -
- - - - + {{ form.submit }} + +
+ + +

1.

+

2.

+

3. {{ form.note.description }}

+
{{ footer|safe }} {% endblock body %}
Protocol mark + Final experiment mark¹ + + University email + + Contact email² +
{{ student }} @@ -91,6 +100,19 @@ {{ protocol_experiment_mark }} + {% if final_experiment_mark is none %} + None + {% else %} + {{ final_experiment_mark }} + {% endif %} + + {{ student.uni_email }} + + {{ student.contact_email }} +
- {{ form.submit }} -