diff --git a/assets/js/admin.js b/assets/js/admin.js index 0efa044..4f89b3d 100644 --- a/assets/js/admin.js +++ b/assets/js/admin.js @@ -132,7 +132,7 @@ function updateProblemProgressBar(){ function problemCorrect(user, problem, student, totalStudents){ //check score of a student for a problem - var rsection = $(""); + var rsection = $(""); var results = {tried: false, correct: false, style: false}; $.post("/submission/read/" + problem.id, {id: problem.id, student: user.username}, function(submissions){ if(submissions.length == 0){ @@ -155,14 +155,14 @@ function problemCorrect(user, problem, student, totalStudents){ numattempted++; if(results.correct) { numfunct++; - rsection.append(problem.value.correct + " / "); + rsection.append(problem.value.correct + "f"); } else { - rsection.append(problem.value.correct + " / "); + rsection.append(problem.value.correct + "f"); } if(results.style) { numstyle++; - rsection.append(problem.value.style); + rsection.append(problem.value.style + "s"); } else { - rsection.append(problem.value.style); + rsection.append(problem.value.style + "s"); } if(results.correct && results.style){ numearned++; @@ -395,13 +395,13 @@ function getIndividual(user, refresh) { var d = new Date(submission.createdAt); var a = $("
  • ") - .html("" + d.toLocaleString() + "") + .html("
    " + d.toLocaleString() + "
    ") .click(function (event) { event.preventDefault(); getSubmission(submission,user,problem); }); $("#ISL" + problem.id).append(a); - $("#ISL" + problem.id).append("style: " + submission.value.style + "correct: " + submission.value.correct + ""); + $("#ISL" + problem.id).append("
    Functionality: " + submission.value.correct + "/" + problem.value.correct + "
    Style: " + submission.value.style + "/" + problem.value.style + "
    "); if (parseInt(submission.value.style) > parseInt(earnedStylePoints)){ earnedStylePoints = parseInt(submission.value.style); totalEarned += parseInt(earnedStylePoints); diff --git a/views/home/admin.ejs b/views/home/admin.ejs index 85d7687..44658c8 100644 --- a/views/home/admin.ejs +++ b/views/home/admin.ejs @@ -107,6 +107,16 @@ form > button { .problem-name-first { width:35%; } +.submission-name-first { +width:31.5%; +} +.left-submission { + float:left; + width: 22.5%; +} +.style-submission { + margin-right:23.5% +} ul { list-style-type: none;