Merge branch 'master' of zhaojunzhe/fair-web into master

modules/socketio.js

@@ -27,26 +27,27 @@ function processOverallResult(source, config) {
     }
     return {
         compile: source.compile,
-        judge: config.showDetailResult ? (source.judge && {
+        judge: {
-            subtasks: source.judge.subtasks && source.judge.subtasks.map(st => ({
+          subtasks: source.judge && source.judge.subtasks ? source.judge.subtasks.map(st => ({
-                score: st.score,
+            score: st.score,
-                cases: st.cases.map(cs => ({
+            cases: st.cases.map(cs => ({
-                    status: cs.status,
+              status: cs.status,
-                    result: cs.result && {
+              errorMessage: cs.errorMessage,
-                        type: cs.result.type,
+              result: cs.result && {
-                        time: config.showUsage ? cs.result.time : undefined,
+                type: cs.result.type,
-                        memory: config.showUsage ? cs.result.memory : undefined,
+                time: config.showUsage ? cs.result.time : undefined,
-                        scoringRate: cs.result.scoringRate,
+                memory: config.showUsage ? cs.result.memory : undefined,
-                        systemMessage: cs.result.systemMessage,
+                scoringRate: cs.result.scoringRate,
-                        input: config.showTestdata ? cs.result.input : undefined,
+                systemMessage: cs.result.systemMessage,
-                        output: config.showTestdata ? cs.result.output : undefined,
+                input: config.showTestdata ? cs.result.input : undefined,
-                        userOutput: config.showTestdata ? cs.result.userOutput : undefined,
+                output: config.showTestdata ? cs.result.output : undefined,
-                        userError: config.showTestdata ? cs.result.userError : undefined,
+                userOutput: config.showTestdata ? cs.result.userOutput : undefined,
-                        spjMessage: config.showTestdata ? cs.result.spjMessage : undefined,
+                userError: config.showTestdata ? cs.result.userError : undefined,
-                    }
+                spjMessage: config.showTestdata ? cs.result.spjMessage : undefined,
-                }))
+              }
             }))
-        }) : null
+          })) : null
+        }
     };
 }
 function getCompileStatus(status) {
@@ -149,7 +150,8 @@ function initializeSocketIO(s) {
                 return {
                     ok: true,
                     finished: false,
-                    running: false
+                    running: false,
+                    result: processOverallResult(finishedJudgeList[taskId], clientDisplayConfigList[socket.id])
                 };
             }
         }

modules/submission.js

@@ -293,7 +293,7 @@ app.get('/submission/:id', async (req, res) => {
       formattedCode: judge.formattedCode ? judge.formattedCode.toString("utf8") : null,
       preferFormattedCode: res.locals.user ? res.locals.user.prefer_formatted_code : true,
       detailResult: processOverallResult(judge.result, currentConfig),
-      socketToken: (judge.task_id != null) ? jwt.sign({
+      socketToken: (judge.pending && judge.task_id != null) ? jwt.sign({
         taskId: judge.task_id,
         type: 'detail',
         displayConfig: displayConfig

views/admin_classify.ejs

@@ -160,7 +160,6 @@
         return !this.disabledId.includes(row.id);
       },
       toggleSelection(rows) {
-        console.log(rows);
         if (rows) {
           rows.forEach(row => {
             this.$refs.multipleTable.toggleRowSelection(row);
@@ -237,7 +236,7 @@
                 }
                 that.disabledId = findDifference(currentIdArray, that.usedProblemId);
                 that.multipleSelection = that.problemIdArray;
-                that.toggleSelection(that.multipleSelection)
+                that.getProblemPagination(1);
                 that.order = order;
               }
             },
@@ -249,7 +248,6 @@
       },
       show: function(id){
         let that = this;
-        this.getProblemPagination(1);
         if (id) {
           this.classifyId = id;
           this.getClassifyInfos(id);
@@ -274,7 +272,6 @@
             order: this.order,
             problemIdArray: this.multipleSelection.map(item=>item.id)
           }
-          console.log(obj.problemIdArray);
           if (this.classifyId === -1) {
             $.ajax({
               url: '/api/practice/create',

views/submission.ejs

@@ -351,17 +351,17 @@ if (token != null) {
       });
       socket.emit('join', token, function (data) {
         console.log("join! ", data);
-        let max=0;
-        if (data && data.result && data.result.judge) {
-          data.result.judge.subtasks.forEach(function (item) {
-            item.cases.forEach(function (one) {
-              max = one.result.time
-            });
-          });
-        }
         if (data && data.ok) {
-          if (data.finished) {
+          if (data.finished && data.result && data.result.judge) {
-            data.roughResult.maxItemTime = max;
+            let max=0;
+            data.result.judge.subtasks.forEach(function (item) {
+              item.cases.forEach(function (one) {
+                max = one.result.time
+              });
+            });
+            if (max !== 0) {
+              data.roughResult.maxItemTime = max;
+            }
             vueApp.roughData.result = data.roughResult;
             // if (!data.result) location.reload(true);
             vueApp.detailResult = data.result;

views/submission_contest.ejs

@@ -352,17 +352,17 @@ if (token != null) {
       });
       socket.emit('join', token, function (data) {
         console.log("join! ", data);
-        let max=0;
-        if (data && data.result && data.result.judge) {
-          data.result.judge.subtasks.forEach(function (item) {
-            item.cases.forEach(function (one) {
-              max = one.result.time
-            });
-          });
-        }
         if (data && data.ok) {
-          if (data.finished) {
+          if (data.finished && data.result && data.result.judge) {
-            data.roughResult.maxItemTime = max;
+            let max=0;
+            data.result.judge.subtasks.forEach(function (item) {
+              item.cases.forEach(function (one) {
+                max = one.result.time
+              });
+            });
+            if (max !== 0) {
+              data.roughResult.maxItemTime = max;
+            }
             vueApp.roughData.result = data.roughResult;
             // if (!data.result) location.reload(true);
             vueApp.detailResult = data.result;