Merge pull request #35 from IU-MAP/client/volunteer_judge

v1.1.0

client/checker.sh

@@ -7,23 +7,35 @@ if ! [ -f "data/$2.zip" ]; then
 fi	
 
 if ! [ -d "judge/$2" ]; then
-	echo "Directory not exist"
+	echo "Test directory missing"
 	mkdir judge/$2
-	unzip data/$2.zip -d judge/$2
 fi	
 
-cat data/$1 > judge/$2/solution.cpp && g++ -std=c++11 judge/$2/solution.cpp -o judge/$2/solution.out && for ((i=1;;i++))
+if ! [ -d "judge/$2/testdata" ]; then
+	echo "Testdata directory missing"
+	unzip data/$2.zip -d judge/$2
+fi	
+cat data/$1 > judge/$2/solution.cpp
+g++ -std=c++11 judge/$2/solution.cpp -o judge/$2/solution.out
+max_runtime = 0
+for ((i=1;;i++))
 do
 	INPUT=judge/$2/testdata/input/$i.in
 	OUTPUT=judge/$2/testdata/output/$i.out
 	if [ -f "$INPUT" ] && [ -f "$OUTPUT" ]; then	
+		start=`date +%s.%N`
 		./judge/$2/solution.out < $INPUT > judge/$2/out
+		end=`date +%s.%N`
+		runtime=$( echo "$end - $start" | bc -l )
+		if [[ "$runtime" > "$max_runtime" ]]; then
+			max_runtime="$runtime"
+		fi
 		if ! diff -w judge/$2/out $OUTPUT
 		then
 			exit 1
 		fi
 	else
+		echo $max_runtime
 		exit 0
 	fi
 done
-

client/connect.js

@@ -45,6 +45,7 @@ const runSolution = async (solutionId) => {
             await axios.put(`${host}/api/solutions/${data._id}`, {
               problem: data.problem._id,
               status: "ok",
+              time: Math.round(parseFloat(stdout)*1000),
             });
           }
         }

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {

server/controllers/solutionController.js

@@ -243,6 +243,7 @@ exports.api_solution_update = [
       problem: req.body.problem,
       message: req.body.message,
       status: req.body.status,
+      time: req.body.time,
       _id: req.params.id,
     });
 

server/models/solution.js

@@ -11,6 +11,11 @@ var SolutionSchema = new Schema({
     enum: ["submitted", "ok", "failed", "running"],
     default: "submitted",
   },
+  time: {
+    type: Number,
+    required: true,
+    default: -1,
+  },
 });
 
 // Virtual for this Solution object's URL.

server/public/stylesheets/style.css

@@ -5,9 +5,82 @@
 }
 
 .ok {
-  color: green;
+  color: #000;
+  background-color: #90ee90;
+  padding: 2px 10px 4px 10px;
+  border-radius: 4px;
+  content: 'Correct'
+}
+
+.ok {
+  visibility: hidden;
+}
+
+.ok:after {
+  visibility: visible;
+  color: #000;
+  background-color: #90ee90;
+  padding: 2px 10px 4px 10px;
+  margin-left: -20px;
+  border-radius: 4px;
+  content: 'Correct';
 }
 
 .failed {
   color: brown;
 }
+
+h1 {
+  margin-top: 20px;
+  margin-bottom: 25px;
+  border-bottom: 2px solid #000;
+}
+
+.col-sm-2 {
+  padding-top: 75px;
+  padding-bottom: 1000px;
+  background-color: #EFEFEF;
+}
+
+.col-sm-2 a:link,
+.col-sm-2 a:visited, 
+.col-sm-2 a:active {
+  font-size: 120%;
+}
+
+.col-sm-10 {
+  padding-left: 30px;
+}
+
+a:link,
+a:visited, 
+a:active {
+  color: darkorange;
+}
+
+a:hover {
+  text-decoration: none;
+  color: orange;
+}
+
+p {
+  font-size: 120%;
+}
+
+hr {
+  background-color: #000;
+}
+
+.btn {
+  background-color: darkorange;
+  border: none;
+  font-size: 120%;
+  margin-top: 20px;
+  float: right;
+  padding-left: 25px;
+  padding-right: 25px;
+}
+
+.btn:hover {
+  background-color: orange;
+}

server/views/solution_form.pug

@@ -15,7 +15,10 @@ block content
         label(for="file") Code (C++ only): 
         div.custom-file
           input#file.custom-file-input(type='file', name='file' required='true' accept='.cpp')
-          label.custom-file-label(for='file') Choose file
+          label.custom-file-label(for='file') Choose file 
+      div.form-group
+        label(for="judge") Judge on me: 
+        input(type="checkbox" checked)
       button.btn.btn-primary(type='submit') Submit
   else 
     p No problem available. Please wait, or 

server/views/solution_list.pug

@@ -2,11 +2,16 @@ extends layout
 
 block content
   h1= title
-
   ul
-    each solution in solution_list
+    each solution in solution_list.reverse()
       li 
-        a(href=solution.url) #{solution._id}
+        a(href=solution.url) #{solution._id} 
+        img(src="/stylesheets/"+solution.status+".png") 
+        if solution.status == "ok"
+            b()    [#{solution.time} ms]
+        else if solution.status != "failed"
+            b() 
+            img(type="button" src="/stylesheets/donate.png") 
 
     else
       li There are no solutions.