Skip to content

Commit c447552

Browse files
authored
Contest leaderboard hiding (#826)
* Add contest leaderboard hiding * fix open leaderboard wrong condition
1 parent 02557b7 commit c447552

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

lib/cadet/assessments/assessments.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,8 +953,8 @@ defmodule Cadet.Assessments do
953953

954954
defp leaderboard_open?(assessment, voting_question) do
955955
Timex.before?(
956-
Timex.now(),
957-
Timex.shift(assessment.close_at, hours: voting_question.question["reveal_hours"])
956+
Timex.shift(assessment.close_at, hours: voting_question.question["reveal_hours"]),
957+
Timex.now()
958958
)
959959
end
960960

test/cadet_web/controllers/assessments_controller_test.exs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,15 @@ defmodule CadetWeb.AssessmentsControllerTest do
480480
role_crs: role_crs,
481481
assessments: assessments
482482
} do
483+
voting_assessment = assessments["practical"].assessment
484+
485+
voting_assessment
486+
|> Assessment.changeset(%{
487+
open_at: Timex.shift(Timex.now(), days: -30),
488+
close_at: Timex.shift(Timex.now(), days: -20)
489+
})
490+
|> Repo.update()
491+
483492
voting_question = assessments["practical"].voting_questions |> List.first()
484493
contest_assessment_number = voting_question.question.contest_number
485494

@@ -548,8 +557,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
548557

549558
voting_assessment
550559
|> Assessment.changeset(%{
551-
open_at: Timex.shift(Timex.now(), days: -30),
552-
close_at: Timex.shift(Timex.now(), days: -20)
560+
close_at: Timex.shift(Timex.now(), days: 20)
553561
})
554562
|> Repo.update()
555563

@@ -621,8 +629,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
621629

622630
voting_assessment
623631
|> Assessment.changeset(%{
624-
open_at: Timex.shift(Timex.now(), days: -30),
625-
close_at: Timex.shift(Timex.now(), days: -20)
632+
close_at: Timex.shift(Timex.now(), days: 20)
626633
})
627634
|> Repo.update()
628635

0 commit comments

Comments
 (0)