.gitignore

@@ -3,7 +3,7 @@
 *.pyc
 __pycache__/
 
-
+instance/
 
 uploads/
 zip_exports/

slaeforms/app.py

@@ -15,9 +15,9 @@ from sqlalchemy.orm import DeclarativeBase
 import os
 import csv
 from zipfile import ZipFile
-import hashlib
 
-# activate environment: cd C:\...\...\....\...\Code\SLAEForms Testing\.venv\Scripts\
+random_order = True
+# activate environment: cd C:\Users\Jan\Google Drive\Master Stuff\Code\SLAEForms Testing\.venv\Scripts\
 # then this: activate
 
 #SETUP--------------------------------------------------
@@ -41,7 +41,7 @@ app.secret_key = b"29fe9e8edd407c5491d4f1c05632d9fa33e26ed8734a3f5e080ebac3772a5
 
 UPLOAD_FOLDER = 'uploads'
 EXPORT_FOLDER = 'exports'
-PASSWORD = 'd5aff9fc14d1f20f4ccddaa8b4f2c1765228b74ed0b1dfb868bf1064e0d655e2'
+PASSWORD = '#1ACGmsjd'
 CONFIGFILE = 'userstudy1.json'
 # CONFIGFILE = 'test.json'
 # CONFIGFILE = 'default.json'
@@ -191,7 +191,6 @@ def startpage():
                         case "single_video": 
                             order = list(config[name]["stimuli"]["list"]) # order = list of simuli keys
                             print("order: ",order)
-                            if "order" in config[name]["stimuli"]:
                             if config[name]["stimuli"]["order"] == "random":
                                 random.shuffle(order) #in random order
                             session["block_order"][name] = order
@@ -623,8 +622,7 @@ def show_tables():
 def login():
 
     if request.method == "POST":
-        pwhash = hashlib.sha256(request.form["password"].encode('utf-8')).hexdigest()
-        if pwhash == PASSWORD:
+        if request.form["password"] == PASSWORD:
             session["logged_in"] = True
             return redirect(url_for("all_links"))
 

slaeforms/templates/standard_template.html

@@ -262,8 +262,7 @@ step={{question["step"]}}
 
             {% elif (questions[question]["type"] == "multiplechoice") %}
             <div class="compressWidth">
-                <p>
-                    <div>
+                <label>
                     {{ questions[question]['text']}}
 
                     {% for point in questions[question]["points"] %}
@@ -273,8 +272,7 @@ step={{question["step"]}}
                         {{ questions[question]['points'][point]['text']}}</label>
 
                     {% endfor %}
-                </div>
-            </p>
+                </label>
             </div>
             <div class="spacer" aria-hidden="true" style="height:30px"></div>
 

slaeforms/userstudy1.json

@@ -8,7 +8,6 @@
         "template": "standard_template.html",
         "stimuli": {
             "type": "single_video",
-            "order": "",
             "list": {
                 "video_1": "platzhalter-video.mp4"
             },