From d2ac3a756861a1cd06f67c21b10147c6a72d5432 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Mon, 27 Jun 2022 22:13:35 +0200
Subject: [PATCH] Add table columns

---
 .../assistant_group_experiment_form.html      | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

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 @@
 
         <br>
 
-        <div class="d-inline-flex">
+        <div class="table-responsive">
             <table class="table table-striped table-bordered">
                 <thead class="thead-dark">
                     <tr>
@@ -76,11 +76,20 @@
                         <th scope="col">
                             Protocol mark
                         </th>
+                        <th scope="col">
+                            Final experiment mark¹
+                        </th>
+                        <th scope="col">
+                            University email
+                        </th>
+                        <th scope="col">
+                            Contact email²
+                        </th>
                     </tr>
                 </thead>
 
                 <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>
                             <th scope="row">
                                 {{ student }}
@@ -91,6 +100,19 @@
                             <td>
                                 {{ protocol_experiment_mark }}
                             </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>
                     {% endfor %}
                 </tbody>
@@ -100,21 +122,21 @@
         <br>
 
         <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">
                 {{ form.note }}
             </div>
         </div>
 
-        <p>{{ form.note.description }}</p>
-
-        <br>
-
-        <tr>
-            <td>
-                {{ form.submit }}
-            </td>
-        </tr>
+        {{ form.submit }}
     </form>
+
+    <hr>
+
+    <font size="2">
+        <p>1. </p>
+        <p>2. </p>
+        <p>3. {{ form.note.description }}</p>
+    </font>
     {{ footer|safe }}
 {% endblock body %}