diff --git a/app/experiment/views.py b/app/experiment/views.py
index 7a08b88e9418b7a3d6119213ac18f74dcdde9328..044061b6226a23aa2e6dd8f3f087a8b852b1d10c 100644
--- a/app/experiment/views.py
+++ b/app/experiment/views.py
@@ -1,17 +1,21 @@
+from flask_cors import CORS, cross_origin
+from app import socketio
+from flask_socketio import emit
+import embody_plot
import os
import secrets
import json
from flask import (
- Flask,
- render_template,
- request,
- session,
- flash,
- redirect,
- url_for,
+ Flask,
+ render_template,
+ request,
+ session,
+ flash,
+ redirect,
+ url_for,
Blueprint,
jsonify
)
@@ -21,7 +25,7 @@ from sqlalchemy import and_, update
from flask_login import login_required
from werkzeug import secure_filename
-from app import app, db
+from app import app, db
from app.routes import APP_ROOT
from app.models import background_question, experiment
from app.models import background_question_answer
@@ -31,41 +35,42 @@ from app.models import answer_set, answer, forced_id
from app.models import user, trial_randomization
from app.models import embody_answer, embody_question
from app.forms import (
- CreateBackgroundQuestionForm,
- CreateQuestionForm, UploadStimuliForm, EditBackgroundQuestionForm,
- EditQuestionForm, EditExperimentForm, UploadResearchBulletinForm,
- EditPageForm, RemoveExperimentForm, GenerateIdForm,CreateEmbodyForm
+ CreateBackgroundQuestionForm,
+ CreateQuestionForm, UploadStimuliForm, EditBackgroundQuestionForm,
+ EditQuestionForm, EditExperimentForm, UploadResearchBulletinForm,
+ EditPageForm, RemoveExperimentForm, GenerateIdForm, CreateEmbodyForm
)
-from app.utils import get_mean_from_slider_answers
+from app.utils import get_mean_from_slider_answers, map_answers_to_questions
-#Stimuli upload folder setting
+# Stimuli upload folder setting
#APP_ROOT = os.path.dirname(os.path.abspath(__file__))
-experiment_blueprint = Blueprint("experiment", __name__,
- template_folder='templates',
- #static_folder='static',
- url_prefix='/experiment')
+experiment_blueprint = Blueprint("experiment", __name__,
+ template_folder='templates',
+ # static_folder='static',
+ url_prefix='/experiment')
# Set sliders/embody:
DEFAULT_EMBODY_PICTURE = '/static/img/dummy_600.png'
DEFAULT_EMBODY_QUESTION = 'Color the regions whose activity you feel increasing or getting stronger'
+
@experiment_blueprint.route('/view')
@login_required
def view():
-
- #crap:3lines
+
+ # crap:3lines
exp_id = request.args.get('exp_id', None)
media = page.query.filter_by(experiment_idexperiment=exp_id).all()
- # stimulus type
+ # stimulus type
mtype = page.query.filter_by(experiment_idexperiment=exp_id).first()
-
- #experiment info
- experiment_info = experiment.query.filter_by(idexperiment = exp_id).all()
- #background questions
+ # experiment info
+ experiment_info = experiment.query.filter_by(idexperiment=exp_id).all()
+
+ # background questions
questions_and_options = {}
questions = background_question.query.filter_by(
experiment_idexperiment=exp_id).all()
@@ -81,7 +86,7 @@ def view():
questions1 = questions_and_options
- #sliderset
+ # sliderset
categories_and_scales = {}
categories = question.query.filter_by(experiment_idexperiment=exp_id).all()
@@ -109,51 +114,59 @@ def remove():
exp_status = experiment.query.filter_by(idexperiment=exp_id).first()
if exp_status.status != 'Hidden':
-
+
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
-
+
form = RemoveExperimentForm(request.form)
-
+
if request.method == 'POST' and form.validate():
-
+
if form.remove.data == 'DELETE':
-
- #This removes all experiment data from the database!
-
- #Remove research bulletin if it exists
- empty_filevariable = experiment.query.filter_by(idexperiment=exp_id).first()
-
+
+ # This removes all experiment data from the database!
+
+ # Remove research bulletin if it exists
+ empty_filevariable = experiment.query.filter_by(
+ idexperiment=exp_id).first()
+
if empty_filevariable.research_notification_filename is not None:
- target = os.path.join(APP_ROOT, empty_filevariable.research_notification_filename)
-
- if os.path.exists(target):
+ target = os.path.join(
+ APP_ROOT, empty_filevariable.research_notification_filename)
+
+ if os.path.exists(target):
os.remove(target)
-
- #Tables
- remove_forced_id = forced_id.query.filter_by(experiment_idexperiment=exp_id).all()
+
+ # Tables
+ remove_forced_id = forced_id.query.filter_by(
+ experiment_idexperiment=exp_id).all()
remove_rows(remove_forced_id)
- #background_question_option & background_question & background question answers:
- remove_background_question = background_question.query.filter_by(experiment_idexperiment=exp_id).all()
-
- #Remove all background questions and all answers given to each bg question
+ # background_question_option & background_question & background question answers:
+ remove_background_question = background_question.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
+ # Remove all background questions and all answers given to each bg question
for a in range(len(remove_background_question)):
- remove_background_question_option = background_question_option.query.filter_by(background_question_idbackground_question=remove_background_question[a].idbackground_question).all()
+ remove_background_question_option = background_question_option.query.filter_by(
+ background_question_idbackground_question=remove_background_question[a].idbackground_question).all()
remove_rows(remove_background_question_option)
- remove_background_question_answers = background_question_answer.query.filter_by(background_question_idbackground_question=remove_background_question[a].idbackground_question).all()
+ remove_background_question_answers = background_question_answer.query.filter_by(
+ background_question_idbackground_question=remove_background_question[a].idbackground_question).all()
remove_rows(remove_background_question_answers)
db.session.delete(remove_background_question[a])
db.session.commit()
-
- #Remove all questions and answers
- remove_question = question.query.filter_by(experiment_idexperiment=exp_id).all()
+
+ # Remove all questions and answers
+ remove_question = question.query.filter_by(
+ experiment_idexperiment=exp_id).all()
for a in range(len(remove_question)):
- remove_question_answers = answer.query.filter_by(question_idquestion=remove_question[a].idquestion).all()
+ remove_question_answers = answer.query.filter_by(
+ question_idquestion=remove_question[a].idquestion).all()
remove_rows(remove_question_answers)
db.session.delete(remove_question[a])
db.session.commit()
@@ -162,54 +175,58 @@ def remove():
remove_embody_answers = embody_answer.query.filter(embody_answer.page_idpage.in_(list(map(
lambda x: x[0], page.query.with_entities(page.idpage).filter_by(experiment_idexperiment=exp_id).all())))).all()
remove_rows(remove_embody_answers)
- remove_embody_questions = embody_question.query.filter_by(experiment_idexperiment=exp_id).all()
+ remove_embody_questions = embody_question.query.filter_by(
+ experiment_idexperiment=exp_id).all()
for a in range(len(remove_embody_questions)):
target = APP_ROOT + remove_embody_questions[a].picture
- if os.path.exists(target) and DEFAULT_EMBODY_PICTURE != remove_embody_questions[a].picture:
+ if os.path.exists(target) and DEFAULT_EMBODY_PICTURE != remove_embody_questions[a].picture:
os.remove(target)
remove_rows(remove_embody_questions)
- #Remove all pages and datafiles
- remove_pages = page.query.filter_by(experiment_idexperiment=exp_id).all()
-
+ # Remove all pages and datafiles
+ remove_pages = page.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
for a in range(len(remove_pages)):
if remove_pages[a].type != 'text':
target = os.path.join(APP_ROOT, remove_pages[a].media)
- if os.path.exists(target):
+ if os.path.exists(target):
os.remove(target)
-
- #Now that the files are removed we can delete the page
+
+ # Now that the files are removed we can delete the page
db.session.delete(remove_pages[a])
db.session.commit()
-
- #Remove all answer_sets and trial_randomization orders
- remove_answer_set = answer_set.query.filter_by(experiment_idexperiment=exp_id).all()
-
+ # Remove all answer_sets and trial_randomization orders
+ remove_answer_set = answer_set.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
for a in range(len(remove_answer_set)):
- remove_trial_randomizations = trial_randomization.query.filter_by(answer_set_idanswer_set=remove_answer_set[a].idanswer_set).all()
+ remove_trial_randomizations = trial_randomization.query.filter_by(
+ answer_set_idanswer_set=remove_answer_set[a].idanswer_set).all()
remove_rows(remove_trial_randomizations)
db.session.delete(remove_answer_set[a])
db.session.commit()
-
- #Remove experiment table
- remove_experiment = experiment.query.filter_by(idexperiment=exp_id).first()
+
+ # Remove experiment table
+ remove_experiment = experiment.query.filter_by(
+ idexperiment=exp_id).first()
db.session.delete(remove_experiment)
db.session.commit()
# Remove empty directories
os.rmdir(APP_ROOT + '/static/embody_images/' + str(exp_id))
os.rmdir(APP_ROOT + '/static/experiment_stimuli/' + str(exp_id))
-
+
flash("Experiment was removed from database!")
return redirect(url_for('index'))
-
+
else:
flash("Experiment was not removed!")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
return render_template('remove_experiment.html', form=form, exp_id=exp_id)
@@ -217,7 +234,8 @@ def remove():
@login_required
def publish():
exp_id = request.args.get('exp_id', None)
- publish_experiment = experiment.query.filter_by(idexperiment = exp_id).first()
+ publish_experiment = experiment.query.filter_by(
+ idexperiment=exp_id).first()
publish_experiment.status = 'Public'
flash("Changed status to Public")
db.session.commit()
@@ -228,7 +246,7 @@ def publish():
@login_required
def hide():
exp_id = request.args.get('exp_id', None)
- hide_experiment = experiment.query.filter_by(idexperiment = exp_id).first()
+ hide_experiment = experiment.query.filter_by(idexperiment=exp_id).first()
hide_experiment.status = 'Hidden'
flash("Changed status to Hidden")
db.session.commit()
@@ -239,7 +257,8 @@ def hide():
@login_required
def private():
exp_id = request.args.get('exp_id', None)
- private_experiment = experiment.query.filter_by(idexperiment = exp_id).first()
+ private_experiment = experiment.query.filter_by(
+ idexperiment=exp_id).first()
private_experiment.status = 'Private'
flash("Changed status to Private")
db.session.commit()
@@ -257,9 +276,10 @@ def randomization():
elif status == 'Off':
flash("Disabled trial randomization")
- experiment.query.filter_by(idexperiment = exp_id).first().randomization = status
+ experiment.query.filter_by(
+ idexperiment=exp_id).first().randomization = status
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
@@ -277,9 +297,10 @@ def set_forced_id():
elif status == 'Off':
flash("Disabled forced ID login")
- experiment.query.filter_by(idexperiment = exp_id).first().use_forced_id = status
+ experiment.query.filter_by(
+ idexperiment=exp_id).first().use_forced_id = status
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
@@ -291,29 +312,34 @@ def view_forced_id_list():
exp_id = request.args.get('exp_id', None)
id_list = forced_id.query.filter_by(experiment_idexperiment=exp_id).all()
form = GenerateIdForm(request.form)
-
+
if request.method == 'POST' and form.validate():
- for i in range(int(request.form['number'])):
+ for i in range(int(request.form['number'])):
random_id = str(request.form['string']) + str(secrets.token_hex(3))
- check_answer_set = answer_set.query.filter_by(session=random_id).first()
- check_forced_id = forced_id.query.filter_by(pregenerated_id=random_id).first()
-
- #here we check if the generated id is found from given answers from the whole database in answer_set table
- #or from forced_id table. If so another id is generated instead to avoid a duplicate
+ check_answer_set = answer_set.query.filter_by(
+ session=random_id).first()
+ check_forced_id = forced_id.query.filter_by(
+ pregenerated_id=random_id).first()
+
+ # here we check if the generated id is found from given answers from the whole database in answer_set table
+ # or from forced_id table. If so another id is generated instead to avoid a duplicate
if check_answer_set is not None or check_forced_id is not None:
-
+
#flash("ID already existed; generated a new one")
random_id = secrets.token_hex(3)
- check_answer_set = answer_set.query.filter_by(session=random_id).first()
- check_forced_id = forced_id.query.filter_by(pregenerated_id=random_id).first()
-
- input_id = forced_id(experiment_idexperiment=exp_id, pregenerated_id=random_id)
+ check_answer_set = answer_set.query.filter_by(
+ session=random_id).first()
+ check_forced_id = forced_id.query.filter_by(
+ pregenerated_id=random_id).first()
+
+ input_id = forced_id(
+ experiment_idexperiment=exp_id, pregenerated_id=random_id)
db.session.add(input_id)
db.session.commit()
-
+
return redirect(url_for('experiment.view_forced_id_list', exp_id=exp_id))
-
+
return render_template('view_forced_id_list.html', exp_id=exp_id, id_list=id_list)
@@ -324,27 +350,27 @@ def upload_research_notification():
exp_id = request.args.get('exp_id', None)
form = UploadResearchBulletinForm(request.form)
-
+
if request.method == 'POST':
path = 'static/experiment_stimuli/' + str(exp_id)
target = os.path.join(APP_ROOT, path)
-
+
if not os.path.isdir(target):
os.mkdir(target)
-
- #This returns a list of filenames: request.files.getlist("file")
+
+ # This returns a list of filenames: request.files.getlist("file")
for file in request.files.getlist("file"):
- #save files in the correct folder
+ # save files in the correct folder
filename = file.filename
destination = "/".join([target, filename])
file.save(destination)
-
- #add pages to the db
- db_path = path + str('/') + str(filename)
+
+ # add pages to the db
+ db_path = path + str('/') + str(filename)
bulletin = experiment.query.filter_by(idexperiment=exp_id).first()
bulletin.research_notification_filename = db_path
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
return render_template('upload_research_notification.html', exp_id=exp_id, form=form)
@@ -354,17 +380,19 @@ def upload_research_notification():
@login_required
def remove_research_notification():
'''Remove research bulletin'''
-
+
exp_id = request.args.get('exp_id', None)
- empty_filevariable = experiment.query.filter_by(idexperiment=exp_id).first()
- target = os.path.join(APP_ROOT, empty_filevariable.research_notification_filename)
-
- if os.path.exists(target):
+ empty_filevariable = experiment.query.filter_by(
+ idexperiment=exp_id).first()
+ target = os.path.join(
+ APP_ROOT, empty_filevariable.research_notification_filename)
+
+ if os.path.exists(target):
os.remove(target)
-
+
empty_filevariable.research_notification_filename = None
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
@@ -374,22 +402,20 @@ def edit():
'''Edit experiment details'''
exp_id = request.args.get('exp_id', None)
- current_experiment = experiment.query.filter_by(idexperiment=exp_id).first()
-
+ current_experiment = experiment.query.filter_by(
+ idexperiment=exp_id).first()
+
form = EditExperimentForm(request.form, obj=current_experiment)
form.language.default = current_experiment.language
-
+
if request.method == 'POST' and form.validate():
-
+
form.populate_obj(current_experiment)
db.session.commit()
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
-
- return render_template('edit_experiment.html', form=form, exp_id=exp_id)
-
+ return redirect(url_for('experiment.view', exp_id=exp_id))
+ return render_template('edit_experiment.html', form=form, exp_id=exp_id)
# Background questions:
@@ -397,94 +423,100 @@ def edit():
@experiment_blueprint.route('/add_bg_question', methods=['GET', 'POST'])
@login_required
def add_bg_question():
-
+
exp_id = request.args.get('exp_id', None)
exp_status = experiment.query.filter_by(idexperiment=exp_id).first()
if exp_status.status != 'Hidden':
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
form = CreateBackgroundQuestionForm(request.form)
-
+
if request.method == 'POST' and form.validate():
-
- #Split the form data into a list that separates questions followed by the corresponding options
+
+ # Split the form data into a list that separates questions followed by the corresponding options
str = form.bg_questions_and_options.data
str_list = str.split('/n')
-
- #Iterate through the questions and options list
+
+ # Iterate through the questions and options list
for a in range(len(str_list)):
- #Split the list cells further into questions and options
+ # Split the list cells further into questions and options
list = str_list[a].split(';')
-
- #Input the first item of the list as a question in db and the items followed by that as options for that question
+
+ # Input the first item of the list as a question in db and the items followed by that as options for that question
for x in range(len(list)):
if x == 0:
- add_bgquestion = background_question(background_question=list[x], experiment_idexperiment=exp_id)
+ add_bgquestion = background_question(
+ background_question=list[x], experiment_idexperiment=exp_id)
db.session.add(add_bgquestion)
db.session.commit()
else:
- add_bgq_option = background_question_option(background_question_idbackground_question=add_bgquestion.idbackground_question, option=list[x])
+ add_bgq_option = background_question_option(
+ background_question_idbackground_question=add_bgquestion.idbackground_question, option=list[x])
db.session.add(add_bgq_option)
db.session.commit()
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
+ return redirect(url_for('experiment.view', exp_id=exp_id))
+
return render_template('add_bg_question.html', form=form)
@experiment_blueprint.route('/edit_bg_question', methods=['GET', 'POST'])
@login_required
def edit_bg_question():
-
+
bg_question_id = request.args.get('idbackground_question', None)
- #Search for the right question and for the right options. Form a string of those separated with ";" and insert the
- #formed string into the edit form
- current_bg_question = background_question.query.filter_by(idbackground_question=bg_question_id).first()
- exp_id=current_bg_question.experiment_idexperiment
+ # Search for the right question and for the right options. Form a string of those separated with ";" and insert the
+ # formed string into the edit form
+ current_bg_question = background_question.query.filter_by(
+ idbackground_question=bg_question_id).first()
+ exp_id = current_bg_question.experiment_idexperiment
question_string = current_bg_question.background_question
- options = background_question_option.query.filter_by(background_question_idbackground_question=bg_question_id).all()
-
- for o in range(len(options)):
- question_string = str(question_string) + str("; ") + str(options[o].option)
-
+ options = background_question_option.query.filter_by(
+ background_question_idbackground_question=bg_question_id).all()
+
+ for o in range(len(options)):
+ question_string = str(question_string) + \
+ str("; ") + str(options[o].option)
+
form = EditBackgroundQuestionForm(request.form)
form.bg_questions_and_options.data = question_string
- #After user chooses to update the question and options lets replace the old question and options with the ones from the form
+ # After user chooses to update the question and options lets replace the old question and options with the ones from the form
if request.method == 'POST' and form.validate():
- #Explode the string with new values from the form
+ # Explode the string with new values from the form
form_values = form.new_values.data
form_values_list = form_values.split(';')
-
- #Check and remove possible whitespaces from string beginnings with lstrip
+
+ # Check and remove possible whitespaces from string beginnings with lstrip
for x in range(len(form_values_list)):
form_values_list[x] = form_values_list[x].lstrip()
-
- #Cycle through strings and update db
+
+ # Cycle through strings and update db
for x in range(len(form_values_list)):
-
- #Replace question and update the object to database
+
+ # Replace question and update the object to database
if x == 0:
- current_bg_question.background_question = form_values_list[x]
+ current_bg_question.background_question = form_values_list[x]
db.session.commit()
-
- #Delete old options from db
+
+ # Delete old options from db
for o in options:
db.session.delete(o)
db.session.commit()
-
- #Insert new options to db
+
+ # Insert new options to db
else:
- new_option = background_question_option(background_question_idbackground_question=current_bg_question.idbackground_question, option=form_values_list[x])
+ new_option = background_question_option(
+ background_question_idbackground_question=current_bg_question.idbackground_question, option=form_values_list[x])
db.session.add(new_option)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
return render_template('edit_bg_question.html', form=form, exp_id=exp_id)
@@ -498,24 +530,24 @@ def remove_bg_question():
if exp_status.status != 'Hidden':
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
remove_id = request.args.get('idbackground_question', None)
- remove_options = background_question_option.query.filter_by(background_question_idbackground_question=remove_id).all()
-
- for a in range(len(remove_options)):
+ remove_options = background_question_option.query.filter_by(
+ background_question_idbackground_question=remove_id).all()
+
+ for a in range(len(remove_options)):
db.session.delete(remove_options[a])
db.session.commit()
-
- remove_question = background_question.query.filter_by(idbackground_question=remove_id).first()
-
+
+ remove_question = background_question.query.filter_by(
+ idbackground_question=remove_id).first()
+
db.session.delete(remove_question)
db.session.commit()
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
-
+ return redirect(url_for('experiment.view', exp_id=exp_id))
@experiment_blueprint.route('/set_embody')
@@ -523,7 +555,7 @@ def remove_bg_question():
def set_embody():
'''Enable/disable embody tool'''
exp_id = request.args.get('exp_id', None)
- exp = experiment.query.filter_by(idexperiment = exp_id).first()
+ exp = experiment.query.filter_by(idexperiment=exp_id).first()
exp.embody_enabled = (True if exp.embody_enabled == False else False)
return redirect(url_for('experiment.view', exp_id=exp_id))
@@ -543,10 +575,11 @@ def add_embody():
# TODO: check if default image already added
- default_embody = embody_question(experiment_idexperiment=exp_id, picture=DEFAULT_EMBODY_PICTURE, question=DEFAULT_EMBODY_QUESTION)
- db.session.add(default_embody)
+ default_embody = embody_question(
+ experiment_idexperiment=exp_id, picture=DEFAULT_EMBODY_PICTURE, question=DEFAULT_EMBODY_QUESTION)
+ db.session.add(default_embody)
exp_info.embody_enabled = 1
- db.session.commit()
+ db.session.commit()
return redirect(url_for('experiment.view', exp_id=exp_id))
else:
@@ -556,10 +589,10 @@ def add_embody():
picture = request.files.get("picture")
question = request.form.get("question")
- # get filename
+ # get filename
filename = secure_filename(picture.filename)
path = 'static/embody_images/' + str(exp_id)
- db_path = '/' + path + str('/') + str(filename)
+ db_path = '/' + path + str('/') + str(filename)
target = os.path.join(APP_ROOT, path)
# create folder with experiment id (if it does not exist)
@@ -570,14 +603,13 @@ def add_embody():
destination = "/".join([target, filename])
picture.save(destination)
- #add pages to the db
- new_embody = embody_question(experiment_idexperiment=exp_id, question=question, picture=db_path)
+ # add pages to the db
+ new_embody = embody_question(
+ experiment_idexperiment=exp_id, question=question, picture=db_path)
db.session.add(new_embody)
exp_info.embody_enabled = 1
db.session.commit()
-
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
+ return redirect(url_for('experiment.view', exp_id=exp_id))
return render_template('add_embody.html', form=form)
@@ -585,7 +617,7 @@ def add_embody():
@experiment_blueprint.route('/add_questions', methods=['GET', 'POST'])
@login_required
def add_questions():
-
+
exp_id = request.args.get('exp_id', None)
exp_status = experiment.query.filter_by(idexperiment=exp_id).first()
@@ -594,47 +626,49 @@ def add_questions():
return redirect(url_for('experiment.view', exp_id=exp_id))
else:
form = CreateQuestionForm(request.form)
-
+
if request.method == 'POST' and form.validate():
-
+
str = form.questions_and_options.data
str_list = str.split('/n')
-
- for a in range(len(str_list)):
+
+ for a in range(len(str_list)):
list = str_list[a].split(';')
-
- #If there are the right amount of values for the slider input values
+
+ # If there are the right amount of values for the slider input values
if len(list) == 3:
- add_question = question(experiment_idexperiment=exp_id, question=list[0], left=list[1], right=list[2])
+ add_question = question(
+ experiment_idexperiment=exp_id, question=list[0], left=list[1], right=list[2])
db.session.add(add_question)
db.session.commit()
-
- #If slider has too many or too litlle parameters give an error and redirect back to input form
+
+ # If slider has too many or too litlle parameters give an error and redirect back to input form
else:
- flash("Error Each slider must have 3 parameters separated by ; Some slider has:")
+ flash(
+ "Error Each slider must have 3 parameters separated by ; Some slider has:")
flash(len(list))
return redirect(url_for('create.experiment_questions', exp_id=exp_id))
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
+ return redirect(url_for('experiment.view', exp_id=exp_id))
+
return render_template('add_questions.html', form=form)
@experiment_blueprint.route('/edit_question', methods=['GET', 'POST'])
@login_required
def edit_question():
-
+
question_id = request.args.get('idquestion', None)
current_question = question.query.filter_by(idquestion=question_id).first()
form = EditQuestionForm(request.form, obj=current_question)
-
+
if request.method == 'POST' and form.validate():
-
+
form.populate_obj(current_question)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=current_question.experiment_idexperiment))
-
+
return render_template('edit_question.html', form=form)
@@ -648,21 +682,23 @@ def remove_question():
if exp_status.status != 'Hidden':
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
remove_id = request.args.get('idquestion', None)
- remove_question = question.query.filter_by(idquestion=remove_id).first()
+ remove_question = question.query.filter_by(
+ idquestion=remove_id).first()
# remove answers before removing questions
- remove_answers = answer.query.filter_by(question_idquestion=remove_question.idquestion).all()
+ remove_answers = answer.query.filter_by(
+ question_idquestion=remove_question.idquestion).all()
for a in range(len(remove_answers)):
db.session.delete(remove_answers[a])
db.session.commit()
-
+
db.session.delete(remove_question)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
@@ -676,29 +712,30 @@ def remove_embody():
if exp_status.status != 'Hidden':
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
remove_id = request.args.get('idembody', None)
- remove_question = embody_question.query.filter_by(idembody=remove_id).first()
+ remove_question = embody_question.query.filter_by(
+ idembody=remove_id).first()
# remove embody image from server
if DEFAULT_EMBODY_PICTURE != remove_question.picture:
os.remove(APP_ROOT + remove_question.picture)
- remove_answers = embody_answer.query.filter_by(embody_question_idembody=remove_question.idembody).all()
+ remove_answers = embody_answer.query.filter_by(
+ embody_question_idembody=remove_question.idembody).all()
remove_rows(remove_answers)
db.session.delete(remove_question)
db.session.commit()
-
- question_count = embody_question.query.filter_by(experiment_idexperiment=exp_id).count()
+ question_count = embody_question.query.filter_by(
+ experiment_idexperiment=exp_id).count()
if question_count == 0:
exp_status.embody_enabled = 0
db.session.commit()
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
+ return redirect(url_for('experiment.view', exp_id=exp_id))
# Stimuli:
@@ -709,56 +746,59 @@ def add_stimuli():
exp_id = request.args.get('exp_id', None)
exp_status = experiment.query.filter_by(idexperiment=exp_id).first()
-
+
if exp_status.status != 'Hidden':
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
else:
- #If there are no pages set for the experiment lets reroute user to create experiment stimuli upload instead
- is_there_any_stimuli = page.query.filter_by(experiment_idexperiment = exp_id).first()
-
+ # If there are no pages set for the experiment lets reroute user to create experiment stimuli upload instead
+ is_there_any_stimuli = page.query.filter_by(
+ experiment_idexperiment=exp_id).first()
+
if is_there_any_stimuli is None:
return redirect(url_for('create.experiment_upload_stimuli', exp_id=exp_id))
-
+
stimulus_type = request.args.get('stimulus_type', None)
form = UploadStimuliForm(request.form)
-
+
if request.method == 'POST':
if stimulus_type == 'text':
string = form.text.data
str_list = string.split('/n')
-
+
for a in range(len(str_list)):
- add_text_stimulus = page(experiment_idexperiment=exp_id, type='text', text=str_list[a], media='none')
+ add_text_stimulus = page(
+ experiment_idexperiment=exp_id, type='text', text=str_list[a], media='none')
db.session.add(add_text_stimulus)
db.session.commit()
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
+ return redirect(url_for('experiment.view', exp_id=exp_id))
+
else:
- #Upload stimuli into /static/experiment_stimuli/exp_id folder
- #Create the pages for the stimuli by inserting experiment_id, stimulus type, text and names of the stimulus files (as a path to the folder)
+ # Upload stimuli into /static/experiment_stimuli/exp_id folder
+ # Create the pages for the stimuli by inserting experiment_id, stimulus type, text and names of the stimulus files (as a path to the folder)
path = 'static/experiment_stimuli/' + str(exp_id)
target = os.path.join(APP_ROOT, path)
-
+
if not os.path.isdir(target):
os.mkdir(target)
-
- #This returns a list of filenames: request.files.getlist("file")
+
+ # This returns a list of filenames: request.files.getlist("file")
for file in request.files.getlist("file"):
- #save files in the correct folder
+ # save files in the correct folder
filename = file.filename
destination = "/".join([target, filename])
file.save(destination)
- #add pages to the db
- db_path = path + str('/') + str(filename)
- new_page = page(experiment_idexperiment=exp_id, type=form.type.data, media=db_path)
+ # add pages to the db
+ db_path = path + str('/') + str(filename)
+ new_page = page(experiment_idexperiment=exp_id,
+ type=form.type.data, media=db_path)
db.session.add(new_page)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
return render_template('add_stimuli.html', form=form, stimulus_type=stimulus_type)
@@ -778,38 +818,38 @@ def edit_stimuli():
if request.method == 'POST' and form.validate():
print("POST IMAGE")
- #If the stimulus type is not text, then the old stimulus file is deleted from os and replaced
+ # If the stimulus type is not text, then the old stimulus file is deleted from os and replaced
if edit_page.type != 'text':
- #remove old file
+ # remove old file
target = os.path.join(APP_ROOT, edit_page.media)
os.remove(target)
- #upload new file
+ # upload new file
path = 'static/experiment_stimuli/' + str(exp_id)
target = os.path.join(APP_ROOT, path)
-
+
if not os.path.isdir(target):
os.mkdir(target)
-
- #This returns a list of filenames: request.files.getlist("file")
+
+ # This returns a list of filenames: request.files.getlist("file")
for file in request.files.getlist("file"):
- #save files in the correct folder
+ # save files in the correct folder
filename = file.filename
destination = "/".join([target, filename])
file.save(destination)
-
- #update db object
- db_path = path + str('/') + str(filename)
- edit_page.media=db_path
+
+ # update db object
+ db_path = path + str('/') + str(filename)
+ edit_page.media = db_path
db.session.commit()
- #If editing text stimulus no need for filehandling
+ # If editing text stimulus no need for filehandling
else:
- form.populate_obj(edit_page)
- db.session.commit()
-
+ form.populate_obj(edit_page)
+ db.session.commit()
+
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
return render_template('edit_stimuli.html', form=form, edit_page=edit_page)
@@ -821,65 +861,68 @@ def remove_stimuli():
exp_status = experiment.query.filter_by(idexperiment=exp_id).first()
if exp_status.status != 'Hidden':
-
+
flash("Experiment is public. Cannot modify structure.")
return redirect(url_for('experiment.view', exp_id=exp_id))
-
+
else:
-
+
remove_id = request.args.get('idpage', None)
remove_page = page.query.filter_by(idpage=remove_id).first()
- experiment_pages = page.query.filter_by(experiment_idexperiment=exp_id).all()
-
- #if stimulustype is text, the stimulus itself is text on the database, other stimulus types are real files
- #on the server and need to be deleted
+ experiment_pages = page.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
+ # if stimulustype is text, the stimulus itself is text on the database, other stimulus types are real files
+ # on the server and need to be deleted
if remove_page.type != 'text':
-
- #helper variable
+
+ # helper variable
do_not_delete_file = 'False'
-
- #if the file to be deleted is in duplicate use of another page then we won't delete the file
+
+ # if the file to be deleted is in duplicate use of another page then we won't delete the file
for a in range(len(experiment_pages)):
if experiment_pages[a].media == remove_page.media and experiment_pages[a].idpage != remove_page.idpage:
do_not_delete_file = 'True'
-
- #If no other page is using the file then lets remove it
+
+ # If no other page is using the file then lets remove it
if do_not_delete_file == 'False':
target = os.path.join(APP_ROOT, remove_page.media)
os.remove(target)
-
+
# remove slider answer from this page
- remove_question_answers = answer.query.filter_by(page_idpage=remove_page.idpage).all()
+ remove_question_answers = answer.query.filter_by(
+ page_idpage=remove_page.idpage).all()
remove_rows(remove_question_answers)
# remove embody answer from this page
- remove_embody_answers = embody_answer.query.filter_by(page_idpage=remove_page.idpage).all()
+ remove_embody_answers = embody_answer.query.filter_by(
+ page_idpage=remove_page.idpage).all()
remove_rows(remove_embody_answers)
db.session.delete(remove_page)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
-
-
+
if remove_page.type == 'text':
-
+
# remove slider answer from this page
- remove_question_answers = answer.query.filter_by(page_idpage=remove_page.idpage).all()
+ remove_question_answers = answer.query.filter_by(
+ page_idpage=remove_page.idpage).all()
remove_rows(remove_question_answers)
# remove embody answer from this page
- remove_embody_answers = embody_answer.query.filter_by(page_idpage=remove_page.idpage).all()
+ remove_embody_answers = embody_answer.query.filter_by(
+ page_idpage=remove_page.idpage).all()
remove_rows(remove_embody_answers)
db.session.delete(remove_page)
db.session.commit()
-
+
return redirect(url_for('experiment.view', exp_id=exp_id))
-
- return redirect(url_for('experiment.view', exp_id=exp_id))
+ return redirect(url_for('experiment.view', exp_id=exp_id))
# Misc:
@@ -889,13 +932,14 @@ def remove_stimuli():
def statistics():
# TODO: Answers are in normal order although questions might be in randomized order
-
+
exp_id = request.args.get('exp_id', None)
-
- experiment_info = experiment.query.filter_by(idexperiment = exp_id).all()
- participants = answer_set.query.filter_by(experiment_idexperiment= exp_id).all()
-
- #started and finished ratings counters
+
+ experiment_info = experiment.query.filter_by(idexperiment=exp_id).all()
+ participants = answer_set.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
+ # started and finished ratings counters
started_ratings = answer_set.query.filter_by(
experiment_idexperiment=exp_id).count()
experiment_page_count = page.query.filter_by(
@@ -903,32 +947,40 @@ def statistics():
finished_ratings = answer_set.query.filter(and_(
answer_set.answer_counter == experiment_page_count, answer_set.experiment_idexperiment == exp_id)).count()
-
- #Rating task headers
- question_headers = question.query.filter_by(experiment_idexperiment=exp_id).all()
- stimulus_headers = page.query.filter_by(experiment_idexperiment=exp_id).all()
-
+ # Rating task headers
+ question_headers = question.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+ stimulus_headers = page.query.filter_by(
+ experiment_idexperiment=exp_id).all()
+
pages = page.query.filter_by(experiment_idexperiment=exp_id).all()
questions = question.query.filter_by(experiment_idexperiment=exp_id).all()
pages_and_questions = {}
for p in pages:
questions_list = [(p.idpage, a.idquestion) for a in questions]
- pages_and_questions[p.idpage] = questions_list
-
- #List of answers per participant in format question Stimulus ID/Question ID
- #those are in answer table as page_idpage and question_idquestion respectively
+ pages_and_questions[p.idpage] = questions_list
+
+ # List of answers per participant in format question Stimulus ID/Question ID
+ # those are in answer table as page_idpage and question_idquestion respectively
slider_answers = {}
for participant in participants:
if participant.answer_counter > 0:
- answers = answer.query.filter_by(answer_set_idanswer_set=participant.idanswer_set)\
+ answers = answer.query.filter_by(
+ answer_set_idanswer_set=participant.idanswer_set)\
.order_by(answer.page_idpage)\
- .all()
- slider_answers[participant.session] = [ a.answer for a in answers]
+ .all()
+
+ # flatten pages and questions to list of tuples (page_id, question_id)
+ _questions = [
+ item for sublist in pages_and_questions.values() for item in sublist]
+
+ slider_answers[participant.session] = map_answers_to_questions(
+ answers, _questions)
slider_answers['mean'] = get_mean_from_slider_answers(slider_answers)
- #Background question answers
+ # Background question answers
bg_questions = background_question.query.filter_by(
experiment_idexperiment=exp_id).all()
bg_answers_for_participants = {}
@@ -940,23 +992,22 @@ def statistics():
bg_answers_list = [(a.answer) for a in bg_answers]
bg_answers_for_participants[participant.session] = bg_answers_list
-
# embody questions
embody_questions = embody_question.query.filter_by(
experiment_idexperiment=exp_id).all()
- return render_template('experiment_statistics.html',
- experiment_info=experiment_info,
- participants_and_answers=slider_answers,
- pages_and_questions=pages_and_questions,
- bg_questions=bg_questions,
- bg_answers_for_participants=bg_answers_for_participants,
- started_ratings=started_ratings,
- finished_ratings=finished_ratings,
- question_headers=question_headers,
- stimulus_headers=stimulus_headers,
- embody_questions=embody_questions
- )
+ return render_template('experiment_statistics.html',
+ experiment_info=experiment_info,
+ participants_and_answers=slider_answers,
+ pages_and_questions=pages_and_questions,
+ bg_questions=bg_questions,
+ bg_answers_for_participants=bg_answers_for_participants,
+ started_ratings=started_ratings,
+ finished_ratings=finished_ratings,
+ question_headers=question_headers,
+ stimulus_headers=stimulus_headers,
+ embody_questions=embody_questions
+ )
def remove_rows(rows):
@@ -966,16 +1017,11 @@ def remove_rows(rows):
db.session.commit()
-import embody_plot
-from flask_cors import CORS,cross_origin
-from flask_socketio import emit
-from app import socketio
-
-
@socketio.on('connect', namespace="/create_embody")
def create_embody():
emit('success', {'connection': 'on'})
+
@socketio.on('draw', namespace="/create_embody")
def create_embody(page_id):
@@ -986,7 +1032,8 @@ def create_embody(page_id):
img_path = embody_plot.get_coordinates(page, embody)
app.logger.info(img_path)
- emit('end', {'path':img_path})
+ emit('end', {'path': img_path})
+
@socketio.on('end', namespace="/create_embody")
def create_embody():
diff --git a/app/routes.py b/app/routes.py
index 820e3fb983c0d941f18e8b985b1115e86529de43..b0cf9bee961a4fb443c778b6cf4c0a481c37a6de 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -21,7 +21,7 @@ from app.models import background_question_option
from app.models import answer_set, answer, forced_id
from app.models import user, trial_randomization
from app.forms import LoginForm, RegisterForm, StartWithIdForm
-from app.utils import saved_data_as_file
+from app.utils import saved_data_as_file, map_answers_to_questions
# Stimuli upload folder setting
APP_ROOT = os.path.dirname(os.path.abspath(__file__))
@@ -402,7 +402,20 @@ def download_csv():
.order_by(answer.page_idpage) \
.all()
- answers_list = [str(a.answer).strip() for a in slider_answers]
+
+ pages_and_questions = {}
+ for p in pages:
+ questions_list = [(p.idpage, a.idquestion) for a in questions]
+ pages_and_questions[p.idpage] = questions_list
+
+ _questions = [
+ item for sublist in pages_and_questions.values() for item in sublist]
+
+ answers_list = map_answers_to_questions(slider_answers, _questions)
+
+ # typecast elemnts to string
+ answers_list = [str(a).strip() for a in answers_list]
+
answer_row += ';'.join(answers_list) + \
';' if slider_answers else len(
questions) * len(pages) * ';'
diff --git a/app/utils.py b/app/utils.py
index b157f4d04da0daefa9913179c11349f09aa2ccad..98108034e59768681f873a6250ccc879f89fae1b 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -5,11 +5,12 @@ from flask import send_file
def map_values_to_int(values: dict):
- values = [map(int, i) for i in list(values.values())]
- return zip_longest(*values, fillvalue=None)
+ #values = [map(int, i) for i in list(values.values())]
+ return zip_longest(*values.values(), fillvalue=None)
def calculate_mean(values: list) -> float:
+ print(values)
n_answers = sum(x is not None for x in values)
sum_of_answers = float(sum(filter(None, values)))
mean = sum_of_answers / n_answers
@@ -34,3 +35,27 @@ def saved_data_as_file(filename, data):
attachment_filename=filename)
finally:
os.remove(path)
+
+
+def get_values_from_list_of_answers(page_question, answers):
+ page_id = page_question[0]
+ question_id = page_question[1]
+ for _answer in answers:
+ if _answer.question_idquestion == question_id and \
+ _answer.page_idpage == page_id:
+ return int(_answer.answer)
+
+ return None
+
+
+def map_answers_to_questions(answers, questions):
+ '''
+ questions = [(4, 1), (4, 2), (5, 1), (5, 2), (6, 1), (6, 2)]
+ +
+ answers = [{p:6, q:1, a:100}, {p:6, q:2, a:99}]
+ ->
+ partial_answer = [None, None, None, None, 100, 99]
+ '''
+ return list(map(
+ lambda x: get_values_from_list_of_answers(x, answers),
+ questions))