From 0124d9db97d8f1580b1d839c4c69229b20888d7b Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Fri, 22 Mar 2019 00:46:19 -0500 Subject: [PATCH] chrome is horrible --- website/public/scout/scripts.js | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/website/public/scout/scripts.js b/website/public/scout/scripts.js index 39996fd6..e2f0efe7 100644 --- a/website/public/scout/scripts.js +++ b/website/public/scout/scripts.js @@ -136,13 +136,12 @@ function cseries(seriesName) { if (seriesName == "quantitative") { document.getElementById('FormData').innerHTML += "

" + 'Sandstorm' + "

"; - document.getElementById('FormData').innerHTML += "
"; + document.getElementById('FormData').innerHTML += "
""
"; var ss = firebase.firestore().collection('appBuilding').doc('team-' + teamNum).collection('competitions').doc(currentComp).collection('appElements').doc('quantitativeSandstorm'); ss.get().then(function(doc) { if (doc.exists) { - processAndAppendReturn(doc.data()) + processAndAppendReturn(doc.data(),'repsec1') } - document.getElementById('FormData').innerHTML += "
"; }).then(function() { document.getElementById('FormData').innerHTML += "

" + 'TeleOp' + "

"; document.getElementById('FormData').innerHTML += "
"; @@ -204,7 +203,7 @@ function cseries(seriesName) { }); } -function processAndAppendReturn(data) { +function processAndAppendReturn(data,newloc) { labels = Object.keys(data); var index = labels.indexOf('header'); if (index > -1) { @@ -230,30 +229,28 @@ function processAndAppendReturn(data) { return a[1].order - b[1].order; }) for (var j = 0; j < questions.length; j++) { - document.getElementById('FormData').innerHTML += "
"; - document.getElementById('FormData').innerHTML += questions[j][0]; + document.getElementById(newLoc).innerHTML += "
"; + document.getElementById(newloc+j.toString()).innerHTML += questions[j][0]; if (questions[j][1]['type'] == 'shortText') { - document.getElementById('FormData').innerHTML += ""; + document.getElementById(newloc+j.toString()).innerHTML += ""; } else if (questions[j][1]['type'] == 'textField') { - document.getElementById('FormData').innerHTML += "
"; + document.getElementById(newloc+j.toString()).innerHTML += "
"; } else if (questions[j][1]['type'] == 'stepper') { - document.getElementById('FormData').innerHTML += "" + (questions[j][1]['defaultValue']).toString() + ""; + document.getElementById(newloc+j.toString()).innerHTML += "" + (questions[j][1]['defaultValue']).toString() + ""; }else if (questions[j][1]['type'] == 'label') { - document.getElementById('FormData').innerHTML += "" + '0' + ""; + document.getElementById(newloc+j.toString()).innerHTML += "" + '0' + ""; } else if (questions[j][1]['type'] == 'slider') { - document.getElementById('FormData').innerHTML += "  " + questions[j][1]['min'] + "  "; - document.getElementById('FormData').innerHTML += ""; - document.getElementById('FormData').innerHTML += "  " + questions[j][1]['max']; + document.getElementById(newloc+j.toString()).innerHTML += "  " + questions[j][1]['min'] + "  "; + document.getElementById(newloc+j.toString()).innerHTML += ""; + document.getElementById(newloc+j.toString()).innerHTML += "  " + questions[j][1]['max']; } else if (questions[j][1]['type'] == 'segment') { - document.getElementById('FormData').innerHTML += "
" + document.getElementById(newloc+j.toString()).innerHTML += "
" for (var k = 0; k < questions[j][1]['elements'].length; k++) { //// TODO: replace with real buttons for good styling - document.getElementById('FormData').innerHTML += questions[j][1]['elements'][k]; - document.getElementById('FormData').innerHTML += "" + document.getElementById(questions[j][0]).innerHTML += questions[j][1]['elements'][k]; + document.getElementById(questions[j][0]).innerHTML += "" } - document.getElementById('FormData').innerHTML += "
" } - document.getElementById('FormData').innerHTML += "
"; } }