diff --git a/slaeforms/app.py b/slaeforms/app.py index bba8b89..c4a3540 100644 --- a/slaeforms/app.py +++ b/slaeforms/app.py @@ -18,7 +18,7 @@ class Response(db.Model): id = db.Column(db.Integer, primary_key=True) likert_result = db.Column(db.Integer, nullable=False) notes = db.Column(db.String(200)) - date_created = db.Column(db.DateTime, default=datetime.utcnow) + date_created = db.Column(db.DateTime, default=datetime.today()) def __repr__(self) -> str: return "" % self.id @@ -31,18 +31,27 @@ with app.app_context(): @app.route("/", methods=["GET", "POST"]) def testpage(): - global data if request.method == "POST": - data = request.form - print(data) - return redirect(url_for("datapage")) + likert_score = request.form["likertscale"] + text_input = request.form["feedback"] + print("new response: {likert_score_1} {text_input_1}".format(likert_score_1 = likert_score, text_input_1 = text_input)) + new_response = Response(likert_result = likert_score, notes = text_input) + + try: + db.session.add(new_response) + db.session.commit() + return redirect("/") #url_for("datapage") + except: + return "There was a problem while adding the response to the Database" + return render_template( "layout1.html" ) @app.route("/data") def datapage(): + responses = Response.query.order_by(Response.id).all() return render_template( "data.html", - value = str(data) + responses = responses ) \ No newline at end of file diff --git a/slaeforms/static/styles.css b/slaeforms/static/styles.css index c1d137b..1e1bfa4 100644 --- a/slaeforms/static/styles.css +++ b/slaeforms/static/styles.css @@ -54,6 +54,11 @@ h2,h3 { } } +input, label { + display: block; + margin: 0.5rem 0; + } + .likert input { max-width: 250px; position: fixed; diff --git a/slaeforms/templates/data.html b/slaeforms/templates/data.html index 67a26f7..12b5ba2 100644 --- a/slaeforms/templates/data.html +++ b/slaeforms/templates/data.html @@ -8,8 +8,14 @@ -

Task number 1

-

The Likertscale value is: {{ value }}

+

Task number 1 responses

+ {% for response in responses%} +

Likert score:

+ {{response.likert_result}} +

Feedback:

+ {{response.notes}} +

-------------------------------------------------------------------------

+ {% endfor %} \ No newline at end of file diff --git a/slaeforms/templates/layout1.html b/slaeforms/templates/layout1.html index 1b214cb..3c509fa 100644 --- a/slaeforms/templates/layout1.html +++ b/slaeforms/templates/layout1.html @@ -3,7 +3,7 @@ - + Testform @@ -38,16 +38,10 @@ -
-
- - - - - -
-
-

+ + + +

diff --git a/slaeforms/templates/styles.css b/slaeforms/templates/styles.css index c1d137b..1e1bfa4 100644 --- a/slaeforms/templates/styles.css +++ b/slaeforms/templates/styles.css @@ -54,6 +54,11 @@ h2,h3 { } } +input, label { + display: block; + margin: 0.5rem 0; + } + .likert input { max-width: 250px; position: fixed;