From aa94ca2c0cac4cede34f5768715b5ef3c69df93c Mon Sep 17 00:00:00 2001
From: Niklas Elsbrock <mail@nelsbrock.de>
Date: Wed, 28 Jul 2021 17:49:36 +0200
Subject: [PATCH] =?UTF-8?q?Klausurl=C3=A4ngeneingabe=20zu=20Textfeld=20gem?=
 =?UTF-8?q?acht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nateman/blueprints/klausuren.py          |  7 ++-----
 nateman/resources/default-config.yml     |  7 -------
 nateman/templates/klausuren/edit.html.j2 | 15 ++++++---------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/nateman/blueprints/klausuren.py b/nateman/blueprints/klausuren.py
index 072a732..331b5c2 100644
--- a/nateman/blueprints/klausuren.py
+++ b/nateman/blueprints/klausuren.py
@@ -171,6 +171,7 @@ def edit(klausur_id):
         flag_as_edited = ("flag-as-edited" in request.form)
 
         klausur_laenge_str = request.form.get("laenge", None)
+        print(klausur_laenge_str)
         if lehrer_can_access and not klausur_laenge_str:
             klausur_laenge = None
         else:
@@ -179,11 +180,7 @@ def edit(klausur_id):
             except ValueError:
                 abort(400)
                 return
-
-            if klausur_laenge not in config["klausuren"]["klausurlaengen"]:
-                abort(400)
-                return
-
+        print(klausur_laenge)
         klausur.laenge = klausur_laenge
 
         for kt in Klausurteilnahme.query.filter_by(klausur=klausur).all():
diff --git a/nateman/resources/default-config.yml b/nateman/resources/default-config.yml
index 494e402..6a46607 100644
--- a/nateman/resources/default-config.yml
+++ b/nateman/resources/default-config.yml
@@ -34,13 +34,6 @@ schule:
 klausuren:
   # Maximale Zeichenanzahl für Bemerkungen
   max-annotation-length: 64
-  # Bei der Klausurbearbeitung auswählbare Klausurlängen.
-  # Bestehende Daten werden von einer Änderung nicht beeinflusst.
-  klausurlaengen:
-    - 45
-    - 60
-    - 135
-    - 180
 
 
 # Logging-Einstellungen
diff --git a/nateman/templates/klausuren/edit.html.j2 b/nateman/templates/klausuren/edit.html.j2
index 48db2cf..03b5a2b 100644
--- a/nateman/templates/klausuren/edit.html.j2
+++ b/nateman/templates/klausuren/edit.html.j2
@@ -70,10 +70,10 @@
     noneVersaeumtCB.onchange();
 
     {% if lehrer_can_access %}
-      var laengeSelect = document.getElementById("laenge-select");
+      var laengeInput = document.getElementById("laenge-input");
       var flagAsEditedCb = document.getElementById("flag-as-edited-cb");
       flagAsEditedCb.onchange = function () {
-        laengeSelect.required = this.checked;
+        laengeInput.required = this.checked;
       }
 
       // beim Laden der Seite einmal ausführen
@@ -160,13 +160,10 @@
   <p>
     <label>
       Länge der Klausur:
-      <select name="laenge" id="laenge-select" required {% if no_edit %} disabled {% endif %}>
-        <option value="" {% if klausur.laenge is none %} selected {% endif %}
-                {% if not lehrer_can_access %} disabled {% endif %}>Bitte auswählen</option>
-        {% for l in nateman_config['klausuren']['klausurlaengen'] %}
-          <option value="{{ l }}" {% if l == klausur.laenge %} selected {% endif %}>{{ l }} Minuten</option>
-        {% endfor %}
-      </select>
+      <input type="number" name="laenge" id="laenge-input" class="small" min="0" max="2147483647"
+             {% if klausur.laenge is not none %} value="{{ klausur.laenge }}" {% endif %}
+             {% if not lehrer_can_access %} required {% endif %}>
+      Minuten
     </label>
   </p>