From 27fb1897df4a17b399fe18fddf313af2e62f9972 Mon Sep 17 00:00:00 2001
From: Nils G <nils.gondermann@ruhr-uni-bochum.de>
Date: Wed, 22 Apr 2020 11:21:46 +0200
Subject: [PATCH] Renamed submits to prompts
---
controllers/game.py | 13 +++++++------
models/i_players.py | 2 +-
static/renderer/debug.js | 10 +++++-----
views/game/index.html | 10 +++++-----
views/include/websocket.html | 6 +++---
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/controllers/game.py b/controllers/game.py
index 358c336..0f606c9 100644
--- a/controllers/game.py
+++ b/controllers/game.py
@@ -24,6 +24,7 @@ def start():
if not room_record:
return(FAIL(CODE_SEMANTIC))
+ #TODO: Enable
#if room_record.started:
# return(FAIL(CODE_CONFLICT))
@@ -81,20 +82,20 @@ def roles():
if not isinstance(definition, dict):
return(FAIL(CODE_MISSING))
- if not JSON_CONTAINS(definition, [("role", str), ("submits", list)]):
+ if not JSON_CONTAINS(definition, [("role", str), ("prompts", list)]):
return(FAIL(CODE_MISSING))
- for submit in definition["submits"]:
- if not isinstance(submit, dict):
+ for prompt in definition["prompts"]:
+ if not isinstance(prompt, dict):
return(FAIL(CODE_MISSING))
change[player["uid"]] = definition
#===========================================
- #Update roles and submits on server
+ #Update roles and prompts on server
for uid in change:
- submitString = base64.standard_b64encode(json.dumps(change[uid]["submits"]).encode("ascii")).decode("utf-8")
- db(db.Player.id == uid).update(role=change[uid]["role"], submits=submitString)
+ promptString = base64.standard_b64encode(json.dumps(change[uid]["prompts"]).encode("ascii")).decode("utf-8")
+ db(db.Player.id == uid).update(role=change[uid]["role"], inputs=promptString)
#Update roles on clients
websocket_response = base64.standard_b64encode(json.dumps(change).encode("ascii")).decode("utf-8")
diff --git a/models/i_players.py b/models/i_players.py
index 2ec1252..a54e753 100644
--- a/models/i_players.py
+++ b/models/i_players.py
@@ -4,7 +4,7 @@ db.define_table(
Field('hashcode', 'string', notnull=True),
Field('name', 'string', notnull=True),
Field('role', 'string', default="idle"),
- Field('submits', 'string', default=base64.standard_b64encode(b'[]'), notnull=True),
+ Field('prompts', 'string', default=base64.standard_b64encode(b'[]'), notnull=True),
Field('creation', 'datetime', default=request.now, notnull=True)
)
diff --git a/static/renderer/debug.js b/static/renderer/debug.js
index 13b0006..945d8f2 100644
--- a/static/renderer/debug.js
+++ b/static/renderer/debug.js
@@ -1,4 +1,4 @@
-function render(_name, _role, _roles){
+function render(_role, _roles){
if(_role in _roles) {
renderRole(_roles[_role], _roles["idle"]);
@@ -47,7 +47,7 @@ function renderRole(_definition, _roleIdle) {
$("#game_content").html("");
- var currentSubmit = submits[submitcount];
+ var prompt = prompts[currentPrompt];
for(var index in elements) {
@@ -58,10 +58,10 @@ function renderRole(_definition, _roleIdle) {
var name = element["name"];
var value = element["value"];
- if(currentSubmit){
- for(var varname in currentSubmit){
+ if(prompt){
+ for(var varname in prompt){
while(value.indexOf("$"+varname) != -1){
- value = value.replace("$"+varname, currentSubmit[varname]);
+ value = value.replace("$"+varname, prompt[varname]);
}
}
}
diff --git a/views/game/index.html b/views/game/index.html
index 74daff1..e5d264d 100644
--- a/views/game/index.html
+++ b/views/game/index.html
@@ -14,19 +14,19 @@
</div>
<script type="text/javascript">
- var name = "{{=player_record.name}}";
- var playerid = "{{=player_record.id}}";
+ const name = "{{=player_record.name}}";
+ const playerid = "{{=player_record.id}}";
var role = "{{=player_record.role}}";
var roles = JSON.parse(atob('{{=XML(room_record.roles)}}'));
- var submits = JSON.parse(atob('{{=XML(player_record.submits)}}'));;
- var submitcount = 0;
+ var prompts = JSON.parse(atob('{{=XML(player_record.prompts)}}'));;
+ var currentPrompt = 0;
</script>
{{block game_js}}{{end game_js}}
<script type="text/javascript">
$(document).ready(function(){
- render(name, role, roles);
+ render(role, roles);
});
</script>
diff --git a/views/include/websocket.html b/views/include/websocket.html
index 4453964..70ead17 100644
--- a/views/include/websocket.html
+++ b/views/include/websocket.html
@@ -25,15 +25,15 @@
role_definition = JSON.parse(atob(data));
if(playerid in role_definition) {
role = role_definition[playerid]["role"];
- submits = role_definition[playerid]["submits"];
- submitcount = 0;
+ prompts = role_definition[playerid]["prompts"];
+ currentPrompt = 0;
}
break;
default:
set_error("{{=T('Invalid WebSocket data received')}}: '" + type + "'");
return;
}
- render(name, role, roles);
+ render(role, roles);
};
ws.onerror = function(e) {
--
GitLab