From a5b5c4156cc05c5fc31dc99457f26556305a15ec Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Mon, 19 Sep 2022 15:49:57 +0200
Subject: [PATCH] Show assistants the weightings

---
 advlabdb/assistantModelViews.py               |  2 +-
 ...assistant_group_experiment_form.jinja.html | 49 ++++++++++++++++---
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/advlabdb/assistantModelViews.py b/advlabdb/assistantModelViews.py
index 08bcebd..3de19fa 100644
--- a/advlabdb/assistantModelViews.py
+++ b/advlabdb/assistantModelViews.py
@@ -194,7 +194,7 @@ class AssistantGroupExperimentView(SecureAssistantModelView):
         return self.render(
             "assistant_group_experiment_form.jinja.html",
             form=form,
-            experiment_label=group_experiment.semester_experiment.experiment.str(),
+            semester_experiment=group_experiment.semester_experiment,
             group_number=group_experiment.group.number,
             appointment_fields=appointment_fields,
             experiment_mark_zip=zip(
diff --git a/advlabdb/templates/assistant_group_experiment_form.jinja.html b/advlabdb/templates/assistant_group_experiment_form.jinja.html
index e9d1d69..bafae44 100644
--- a/advlabdb/templates/assistant_group_experiment_form.jinja.html
+++ b/advlabdb/templates/assistant_group_experiment_form.jinja.html
@@ -9,14 +9,6 @@
     <div class="d-inline-flex">
         <table class="table table-bordered">
             <tbody>
-                <tr>
-                    <th scope="row">
-                        Experiment
-                    </th>
-                    <td>
-                        {{ experiment_label }}
-                    </td>
-                </tr>
                 <tr>
                     <th scope="row">
                         Group number
@@ -31,6 +23,47 @@
 
     <br>
 
+    <div class="d-inline-flex">
+        <table class="table table-bordered">
+            <tbody>
+                <tr>
+                    <th scope="row">
+                        Experiment
+                    </th>
+                    <td>
+                        {{ semester_experiment.experiment.str() }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">
+                        Oral mark weighting
+                    </th>
+                    <td>
+                        {{ semester_experiment.oral_weighting }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">
+                        Protocol mark weighting
+                    </th>
+                    <td>
+                        {{ semester_experiment.protocol_weighting }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">
+                        Final experiment mark weighting
+                    </th>
+                    <td>
+                        {{ semester_experiment.final_weighting }}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <br>
+
     <form method="POST">
         {{ form.csrf_token }}
         <div class="d-inline-flex">