From b33626e7a000977b7fef6cb93b41a3365082e7a0 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Mon, 20 Nov 2023 13:08:31 +0200
Subject: [PATCH] Fix the form

---
 app/templates/form_o2.html | 40 ++++++++++++++++++++++++++++++++++++++
 app/views.py               |  3 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 app/templates/form_o2.html

diff --git a/app/templates/form_o2.html b/app/templates/form_o2.html
new file mode 100644
index 0000000..fb040f0
--- /dev/null
+++ b/app/templates/form_o2.html
@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+{% block title %}Työkalu{% endblock %}
+{% block body %}
+<h1>Sir Miksalotti</h1>
+<form method="POST" action="/" enctype="multipart/form-data">
+  {{ form.csrf_token }}
+  <div class="form-group row">
+    {{ form.pressure.label(class_='col-sm-2 col-form-label') }}
+    <div class="col-sm-10">
+      {{ form.pressure() }}
+    </div>
+  </div>
+  <div class="form-group row">
+  {{ form.o2_bottle_percentage.label(class_='col-sm-2 col-form-label') }}
+    <div class="col-sm-10">
+      {{ form.o2_bottle_percentage() }}
+    </div>
+  </div>
+  <div class="form-group row">
+  {{ form.fill_amount.label(class_='col-sm-2 col-form-label') }}
+    <div class="col-sm-10">
+      {{ form.fill_amount() }}
+    </div>
+  </div>
+  <div class="form-group row">
+  {{ form.o2_target.label(class_='col-sm-2 col-form-label') }}
+    <div class="col-sm-10">
+      {{ form.o2_target() }}
+    </div>
+  </div>
+  <div class="form-group row">
+  {{ form.used_po2.label(class_='col-sm-2 col-form-label') }}
+    <div class="col-sm-10">
+      {{ form.used_po2() }}
+    </div>
+  </div>
+  <input type="submit" value="Laske" class="btn btn-primary">
+</form>
+<p>Työkalu on vapaaehtoisvoimin kehitetty ja sen käyttö tapahtuu omalla vastuulla.</p>
+{% endblock %}
diff --git a/app/views.py b/app/views.py
index b99103d..8b68575 100644
--- a/app/views.py
+++ b/app/views.py
@@ -37,7 +37,8 @@ def o2view():
 
     return render_template('co2_result.html', pressure_after=pressure_after, o2_percentage=o2_percentage, mod=mod)
 
-  return render_template('form.html', form=form)
+  return render_template('form_o2.html', form=form)
+
 @app.route('/feedback', methods=['GET', 'POST'])
 def feedback():
   form = FeedbackForm()