Merge branch 'main' into disallownegs

Author: meisterT

webapp/src/DataFixtures/Test/RejudgingFirstToSolveFixture.php

@@ -22,13 +22,16 @@ public function load(ObjectManager $manager): void
 
         $manager->persist($team2);
 
+        $contest = $manager->getRepository(Contest::class)->findOneBy(['shortname' => 'demo']);
+        // Two submissions, one for each team, the incorrect one before the correct one.
+        // Later, in the test, we will flip the 'wrong-answer' to correct in
+        // order to produce a new first to solve.
         $submissionData = [
-            // team, submittime,            result]
-            [$team1, '2021-01-01 12:34:56', 'correct'],
-            [$team2, '2021-01-01 12:33:56', 'wrong-answer'],
+            // team, submittime,                     result]
+            [$team2, $contest->getStarttime() + 300, 'wrong-answer'],
+            [$team1, $contest->getStarttime() + 400, 'correct'],
         ];
 
-        $contest = $manager->getRepository(Contest::class)->findOneBy(['shortname' => 'demo']);
         $language = $manager->getRepository(Language::class)->find('cpp');
         $problem = $contest->getProblems()->filter(fn(ContestProblem $problem) => $problem->getShortname() === 'A')->first();
 
@@ -39,11 +42,11 @@ public function load(ObjectManager $manager): void
                 ->setContestProblem($problem)
                 ->setLanguage($language)
                 ->setValid(true)
-                ->setSubmittime(Utils::toEpochFloat($submissionItem[1]));
+                ->setSubmittime($submissionItem[1]);
             $judging = (new Judging())
                 ->setContest($contest)
-                ->setStarttime(Utils::toEpochFloat($submissionItem[1]))
-                ->setEndtime(Utils::toEpochFloat($submissionItem[1]) + 5)
+                ->setStarttime($submissionItem[1])
+                ->setEndtime($submissionItem[1] + 5)
                 ->setValid(true)
                 ->setResult($submissionItem[2]);
             $judging->setSubmission($submission);

webapp/src/Service/ScoreboardService.php

@@ -558,8 +558,8 @@ public function updateRankCache(Contest $contest, Team $team): void
         $scoreIsInSeconds = (bool)$this->config->get('score_in_seconds');
 
         // Now fetch the ScoreCache entries.
-        /** @var ScoreCache[] $scoreCacheRows */
-        $scoreCacheRows = $this->em->createQueryBuilder()
+        /** @var ScoreCache[] $scoreCacheCells */
+        $scoreCacheCells = $this->em->createQueryBuilder()
             ->from(ScoreCache::class, 's')
             ->select('s')
             ->andWhere('s.contest = :contest')
@@ -569,21 +569,21 @@ public function updateRankCache(Contest $contest, Team $team): void
             ->getQuery()
             ->getResult();
 
-        // Process all score cache rows.
-        foreach ($scoreCacheRows as $scoreCache) {
+        // Process all score cache cells.
+        foreach ($scoreCacheCells as $scoreCacheCell) {
             foreach ($variants as $variant => $isRestricted) {
-                $probId = $scoreCache->getProblem()->getProbid();
-                if (isset($contestProblems[$probId]) && $scoreCache->getIsCorrect($isRestricted)) {
-                    $penalty = Utils::calcPenaltyTime($scoreCache->getIsCorrect($isRestricted),
-                                                      $scoreCache->getSubmissions($isRestricted),
+                $probId = $scoreCacheCell->getProblem()->getProbid();
+                if (isset($contestProblems[$probId]) && $scoreCacheCell->getIsCorrect($isRestricted)) {
+                    $penalty = Utils::calcPenaltyTime($scoreCacheCell->getIsCorrect($isRestricted),
+                                                      $scoreCacheCell->getSubmissions($isRestricted),
                                                       $penaltyTime, $scoreIsInSeconds);
 
                     $numPoints[$variant] += $contestProblems[$probId]->getPoints();
                     $totalTime[$variant] += Utils::scoretime(
-                        (float)$scoreCache->getSolveTime($isRestricted),
+                        (float)$scoreCacheCell->getSolveTime($isRestricted),
                         $scoreIsInSeconds
                     ) + $penalty;
-                    $totalRuntime[$variant] += $scoreCache->getRuntime($isRestricted);
+                    $totalRuntime[$variant] += $scoreCacheCell->getRuntime($isRestricted);
                 }
             }
         }

webapp/templates/jury/analysis/problem.html.twig

@@ -16,11 +16,6 @@
 .card {
   height: 100%;
 }
-
-/* Don't show x-axis ticks/ticklines for max runtimes chart. */
-#maxruntime .nv-x.nv-axis .tick {
-  display: none;
-}
 </style>
 {% endblock %}
 
@@ -133,7 +128,10 @@ $(function(){
       chart.yAxis
         .tickFormat(d3.format('.3f'))
         .axisLabel('Runtime(in s)');
-      chart.xAxis.axisLabel("Judgings");
+      chart.xAxis
+        .ticks(0)
+        .tickValues([])
+        .axisLabel("Judgings");
       d3.select('#maxruntime svg')
           .datum(run_max_times)
           .call(chart);