checks and xs everywhere

kkatzen · May 1, 2015 · 364209f · 364209f
1 parent 159ea1d
commit 364209f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/assets/js/admin.js b/assets/js/admin.js
@@ -295,18 +295,28 @@ function getSubmission(submission,user,problem) {
 
             if(currentId == submission.id){
                 var a = $("<li></li>")
-                .html('<div class="submission-timestamp">' + d.toLocaleString() + "</div><div class='submission-points'>Functionality: " + submission.value.correct + "</div><div class='submission-points'>Style: " + submission.value.style + '</div>')
+                .html('<div class="submission-timestamp">' + d.toLocaleString() + "</div><div class='submission-points'>Functionality: " + submission.value.correct + "/" + problem.value.correct + "</div><div class='submission-points'>Style: " + submission.value.style + "/" + problem.value.style + '</div>')
                 .click(function (event) {
                     event.preventDefault();
                     getSubmission(submission,user,problem);
                 });
+                if ((submission.value.correct == problem.value.correct) && (submission.value.style == problem.value.style)) {
+                    a.append(correct("8px"));
+                } else {
+                    a.append(wrong("8px")); 
+                }
             }else {
                 var a = $("<li></li>")
-                .html("<a href='#submission' data-toggle='pill'><div class='submission-timestamp'>" + d.toLocaleString() + '</div></a><div class="submission-points">Functionality: ' + submission.value.correct + "</div><div class='submission-points'>Style: " + submission.value.style + '</div>')
+                .html("<a href='#submission' data-toggle='pill'><div class='submission-timestamp'>" + d.toLocaleString() + '</div></a><div class="submission-points">Functionality: ' + submission.value.correct + "/" + problem.value.correct + "</div><div class='submission-points'>Style: " + submission.value.style + "/" + problem.value.style + '</div>')
                 .click(function (event) {
                     event.preventDefault();
                     getSubmission(submission,user,problem);
                 });
+                if (submission.value.correct == problem.value.correct && submission.value.style == problem.value.style) {
+                    a.append(correct("8px"));
+                } else {
+                    a.append(wrong("8px")); 
+                }
             }
             $("#relatedSubmissions").append(a);
         });

diff --git a/views/home/admin.ejs b/views/home/admin.ejs
@@ -146,7 +146,7 @@ ul {
 }
 .submission-timestamp {
 	float:left;
-	width:60%
+	width:50%
 }
 
 </style>