raphael/Familienduell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change plain text questions to base64 so the server will run on linux aswell

Browse Source
This commit is contained in:
Raphael 2016-03-28 00:04:37 +02:00
parent 0d0561bd76
commit cab717d18b
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/fragen.txt
View File

File diff suppressed because one or more lines are too long

39
web/js/main.js
View File

@ -234,7 +234,7 @@ function loadQuestionToGui(index) {
$("#schweinchenImg").hide(); $("#schweinchenImg").hide();
$("#answers").empty(); $("#answers").empty();
if(index > -1) { if(index > -1) {
$("#frageDiv").text("Frage: "+fragen[index]["frage"]); $("#frageDiv").html("Frage: "+fragen[index]["frage"]);
for(var i=0;i<fragen[index]["antworten"].length;i++) { for(var i=0;i<fragen[index]["antworten"].length;i++) {
if(fragen[index]["antworten"][i]["antwort"] != "") { if(fragen[index]["antworten"][i]["antwort"] != "") {
var oneLine = $('<div style="height:55px">'+ var oneLine = $('<div style="height:55px">'+
@ -328,22 +328,43 @@ function saveQuestions() {
var objToSave = []; var objToSave = [];
$.each($("#fragenListe").find("li"), function() { $.each($("#fragenListe").find("li"), function() {
var oneQ = { var oneQ = {
"frage" : $(this).find(".questionIn").val(), "frage" : replaceSomeCharactersInHtml($(this).find(".questionIn").val()),
"kuerzel" : $(this).find(".questionKIn").val(), "kuerzel" : replaceSomeCharactersInHtml($(this).find(".questionKIn").val()),
"antworten" : [] "antworten" : []
}; };
$.each($(this).find(".antTr"),function() { $.each($(this).find(".antTr"),function() {
oneQ["antworten"].push({ oneQ["antworten"].push({
"antwort" : $(this).find(".antwortInp").val(), "antwort" : replaceSomeCharactersInHtml($(this).find(".antwortInp").val()),
"anz" : $(this).find(".anz").val() "anz" : replaceSomeCharactersInHtml($(this).find(".anz").val())
}); });
}); });
objToSave.push(oneQ); objToSave.push(oneQ);
}); });
var jsonQues = JSON.stringify(objToSave); var jsonQues = JSON.stringify(objToSave);
jsonQues = btoa(jsonQues);
wsSend("fileOp","write###fragen.txt###"+jsonQues); wsSend("fileOp","write###fragen.txt###"+jsonQues);
} }
function replaceSomeCharactersInHtml(str) {
str = str.replace(/Ü/g, "&Uuml;");
str = str.replace(/ü/g, "&uuml;");
str = str.replace(/Ö/g, "&Ouml;");
str = str.replace(/ö/g, "&ouml;");
str = str.replace(/Ä/g, "&Auml;");
str = str.replace(/ä/g, "&auml;");
return str;
}
function replaceSomeCharactersInStd(str) {
str = str.replace(/&Uuml;/g, "Ü");
str = str.replace(/&uuml;/g, "ü");
str = str.replace(/&Ouml;/g, "Ö");
str = str.replace(/&ouml;/g, "ö");
str = str.replace(/&Auml;/g, "Ä");
str = str.replace(/&auml;/g, "ä");
return str;
}
function addNewQuestion(frage) { function addNewQuestion(frage) {
var newQHtml = $('<li style="list-style-type: none; padding: 5px; border: 1px solid black; margin-right: 80px; position: relative;"><i style="cursor:pointer; position: absolute; right: 5px;" class="fa fa-trash-o trash"></i><table>'+ var newQHtml = $('<li style="list-style-type: none; padding: 5px; border: 1px solid black; margin-right: 80px; position: relative;"><i style="cursor:pointer; position: absolute; right: 5px;" class="fa fa-trash-o trash"></i><table>'+
'<tr>'+ '<tr>'+
@ -365,11 +386,11 @@ function addNewQuestion(frage) {
'</tr><tr>'+ '</tr><tr>'+
'</table></li>'); '</table></li>');
if(frage != null) { if(frage != null) {
newQHtml.find(".questionIn").val(frage["frage"]); newQHtml.find(".questionIn").val(replaceSomeCharactersInStd(frage["frage"]));
newQHtml.find(".questionKIn").val(frage["kuerzel"]); newQHtml.find(".questionKIn").val(replaceSomeCharactersInStd(frage["kuerzel"]));
for(var i=0;i<frage["antworten"].length;i++) { for(var i=0;i<frage["antworten"].length;i++) {
$(newQHtml.find(".antwortInp")[i]).val(frage["antworten"][i]["antwort"]); $(newQHtml.find(".antwortInp")[i]).val(replaceSomeCharactersInStd(frage["antworten"][i]["antwort"]));
$(newQHtml.find(".anz")[i]).val(frage["antworten"][i]["anz"]); $(newQHtml.find(".anz")[i]).val(replaceSomeCharactersInStd(frage["antworten"][i]["anz"]));
} }
} }
newQHtml.find(".trash").click(function() { newQHtml.find(".trash").click(function() {

3
web/js/websocket.js
View File

@ -104,7 +104,8 @@ var connectWs = function() {
} else if(key == "file") { } else if(key == "file") {
if(value == "fragen.txt") { if(value == "fragen.txt") {
try { try {
fragen = JSON.parse(messageParts_a[2]); var base64 = atob(messageParts_a[2]);
fragen = JSON.parse(base64);
fillFragenEditor(); fillFragenEditor();
fillFragenSelect(); fillFragenSelect();
} catch(e) { } catch(e) {