diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78ec5ac..b9f8f82 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,12 @@ + + - + - @@ -124,6 +125,6 @@ - + \ No newline at end of file diff --git a/IDManager.py b/IDManager.py new file mode 100644 index 0000000..6ad892d --- /dev/null +++ b/IDManager.py @@ -0,0 +1,4 @@ +class idManager(): + + def getLevels(self,ip): + return ["test1","test2"] diff --git a/__pycache__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc new file mode 100644 index 0000000..414d365 Binary files /dev/null and b/__pycache__/IDManager.cpython-39.pyc differ diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc index 1a93338..f9deae6 100644 Binary files a/__pycache__/main.cpython-39.pyc and b/__pycache__/main.cpython-39.pyc differ diff --git a/data/questionare.csv b/data/questionare.csv new file mode 100644 index 0000000..5c9e176 --- /dev/null +++ b/data/questionare.csv @@ -0,0 +1,7 @@ +127.0.0.1,D,A,D +127.0.0.1,A,B,D +127.0.0.1,A,B,D +127.0.0.1,D,A,A +127.0.0.1,A,A,B +127.0.0.1,C,A,A +127.0.0.1,D,A,B diff --git a/data/questionare.xlsx b/data/questionare.xlsx index 4641c76..592d27f 100644 Binary files a/data/questionare.xlsx and b/data/questionare.xlsx differ diff --git a/main.py b/main.py index d21248c..15d3a82 100644 --- a/main.py +++ b/main.py @@ -1,14 +1,16 @@ import os -from pyExcel import ExcelWork +import csv +from IDManager import idManager from flask import Flask, render_template, request, redirect, url_for app = Flask(__name__, static_folder='') +idm = idManager() replayDataPath = "reps/" evalDataPath = "evals/" -questionarePath = "data/questionare.xlsx" +questionarePath = "data/questionare.csv" @app.route('/annotation') @@ -22,15 +24,16 @@ def gamepreplay(): result = request.form ip = request.remote_addr # Save the result to questionare - excel = ExcelWork(questionarePath) - questionareLine = excel.getMaxRow()+1 - print(questionareLine) - excel.setCell(questionareLine,1,ip) - excel.setCell(questionareLine, 2, result.get("gamestyle")) - excel.setCell(questionareLine, 3, result.get("frequency")) - excel.setCell(questionareLine, 4, result.get("age")) - excel.saveFile() - print(questionareLine) + write_csv(questionarePath,[ip,result.get("gamestyle"),result.get("frequency"),result.get("age")]) + # excel = ExcelWork(questionarePath) + # questionareLine = excel.getMaxRow()+1 + # print(questionareLine) + # excel.setCell(questionareLine,1,ip) + # excel.setCell(questionareLine, 2, result.get("gamestyle")) + # excel.setCell(questionareLine, 3, result.get("frequency")) + # excel.setCell(questionareLine, 4, result.get("age")) + # excel.saveFile() + # print(questionareLine) print(result.get("gamestyle")) return redirect(url_for('gameplay', id=ip)) @@ -42,8 +45,8 @@ def gamequestion(): @app.route('/gameplay/') def gameplay(id): - print(id) - return render_template('GamePlay.html') + gamelevels = idm.getLevels(id) + return render_template('GamePlay.html',gamelevels = gamelevels) @app.route('/annotation/') @@ -78,7 +81,10 @@ def saveFile(path, filename, content): f = open(file_path, "w", encoding="utf8") f.write(content) f.close() - +def write_csv(path, data): + with open(path,'a+') as f: + csv_write = csv.writer(f) + csv_write.writerow(data) if __name__ == '__main__': app.debug = True diff --git a/templates/GameAnnotation.html b/templates/GameAnnotation.html index 1415fde..6c65df7 100644 --- a/templates/GameAnnotation.html +++ b/templates/GameAnnotation.html @@ -234,7 +234,7 @@
-

Level A Review

+

Level B Review

Drag Picture To Move

diff --git a/templates/GamePlay.html b/templates/GamePlay.html index e0415ca..93e9218 100644 --- a/templates/GamePlay.html +++ b/templates/GamePlay.html @@ -207,13 +207,15 @@ return element; }*/ var divElement = document.getElementById("GameWindow"); + var level1 = "test1"; + var level2 = "test2"; cheerpjCreateDisplay(500,500,divElement); cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l"); console.log("Cheerpj Initialize Succeed!"); - - PlayLevel("test1", "test1") + + PlayLevel(level1, level1) .then(function (){alert("Game Over!")}) - .then(PlayLevel("test2", "test2") + .then(PlayLevel(level2, level2) .then(function (){ alert("Go to Evaluation Window") window.location.href = "/annotation" diff --git a/templates/data.js b/templates/data.js index d9edaa5..e1f1a47 100644 --- a/templates/data.js +++ b/templates/data.js @@ -63,4 +63,18 @@ function PlayLevel(group, level){ // var addressID = $("input[name='sex']:checked").val(); // alert(addressID) -} \ No newline at end of file + } + + function getLevels(){ + var gameLevelstr = "{{gamelevels}}"; + var levels = gameLevelstr.split(",") + levels.replace("'","") + gameLevels.replace("[","") + gameLevels.replace("]","") + + console.log(levels); + console.log(levels[0]); + var level1 = "test1"; + var level2 = "test2"; + return 0; + } \ No newline at end of file