Add details

Author: vtm9

apps/codebattle/assets/js/widgets/pages/event/ParticipantDashboard.jsx

@@ -205,10 +205,15 @@ function ParticipantDashboard() {
                         <div className="d-block d-xl-none me-2 font-weight-bold">
                           {i18n.t("Score/Total")}:
                         </div>
-                        <span>
-                          {stage.winsCount}/{stage.gamesCount}
-                        </span>
-                        <span style={{ marginLeft: "0.75rem" }}>{stage.aiScore}</span>
+                        <div className="d-flex flex-column align-items-center">
+                          <span>
+                            {stage.winsCount}/{stage.gamesCount}
+                          </span>
+                          <span>
+                            {stage.aiScore}
+                            {stage.maxScore != null ? `/${stage.maxScore}` : ""}
+                          </span>
+                        </div>
                       </div>
                       <div
                         className={cn(
@@ -219,7 +224,10 @@ function ParticipantDashboard() {
                         <div className="d-block d-xl-none me-2 font-weight-bold">
                           {i18n.t("Time spent")}:
                         </div>
-                        {stage.timeSpent}
+                        <div className="d-flex flex-column align-items-center">
+                          <span>{stage.tournamentTimeSpent}</span>
+                          <span>{stage.groupTournamentTimeSpent}</span>
+                        </div>
                       </div>
                     </>
                   )}

apps/codebattle/assets/js/widgets/selectors/index.js

@@ -489,6 +489,9 @@ export const reportsSelector = createDraftSafeSelector(
 
 export const selectDefaultAvatarUrl = () => logoSvg;
 
+const formatDuration = (seconds) =>
+  seconds > 0 ? moment.utc(seconds * 1000).format("HH:mm:ss") : "-";
+
 // Participant data selector
 export const participantDataSelector = (state) => {
   const event = eventSelector(state);
@@ -507,9 +510,10 @@ export const participantDataSelector = (state) => {
       const gamesCount = userStage?.gamesCount ? userStage.gamesCount : "-";
       const zeroWinsCount = gamesCount === "-" ? "-" : "0";
       const winsCount = userStage?.winsCount ? userStage.winsCount : zeroWinsCount;
-      const totalSeconds =
-        (userStage?.timeSpentInSeconds || 0) + (userStage?.groupTournamentTimeSpentInSeconds || 0);
+      const tournamentSeconds = userStage?.timeSpentInSeconds || 0;
+      const groupTournamentSeconds = userStage?.groupTournamentTimeSpentInSeconds || 0;
       const aiScoreRaw = userStage?.groupTournamentScore;
+      const totalScoreRaw = userStage?.groupTournamentTotalScore;
 
       return {
         status: eventStage.status,
@@ -528,7 +532,10 @@ export const participantDataSelector = (state) => {
         gamesCount,
         winsCount,
         aiScore: typeof aiScoreRaw === "number" ? aiScoreRaw : "-",
-        timeSpent: totalSeconds > 0 ? moment.utc(totalSeconds * 1000).format("HH:mm:ss") : "-",
+        maxScore: typeof totalScoreRaw === "number" ? totalScoreRaw : null,
+        tournamentTimeSpent: formatDuration(tournamentSeconds),
+        groupTournamentTimeSpent: formatDuration(groupTournamentSeconds),
+        timeSpent: formatDuration(tournamentSeconds + groupTournamentSeconds),
         actionButtonText: eventStage.actionButtonText,
         confirmationText: eventStage.confirmationText,
         nextRoundText: eventStage.nextRoundText,

apps/codebattle/lib/codebattle/event/user_event_stage.ex

@@ -21,6 +21,7 @@ defmodule Codebattle.UserEvent.Stage do
              :place_in_total_rank,
              :place_in_category_rank,
              :group_tournament_score,
+             :group_tournament_total_score,
              :games_count,
              :score,
              :time_spent_in_seconds,
@@ -43,6 +44,7 @@ defmodule Codebattle.UserEvent.Stage do
     field(:place_in_total_rank, :integer)
     field(:place_in_category_rank, :integer)
     field(:group_tournament_score, :integer)
+    field(:group_tournament_total_score, :integer)
     field(:games_count, :integer)
     field(:score, :integer)
     field(:time_spent_in_seconds, :integer)
@@ -69,6 +71,7 @@ defmodule Codebattle.UserEvent.Stage do
       :games_count,
       :score,
       :group_tournament_score,
+      :group_tournament_total_score,
       :time_spent_in_seconds,
       :group_tournament_time_spent_in_seconds,
       :wins_count,

apps/codebattle/lib/codebattle/group_tournament/group_tournament.ex

@@ -41,7 +41,8 @@ defmodule Codebattle.GroupTournament do
              :template_id,
              :tournament_id,
              :slice_size,
-             :slice_strategy
+             :slice_strategy,
+             :max_score
            ]}
 
   schema "group_tournaments" do
@@ -66,6 +67,7 @@ defmodule Codebattle.GroupTournament do
     field(:template_id, :string)
     field(:slice_size, :integer, default: 16)
     field(:slice_strategy, :string, default: "random")
+    field(:max_score, :integer)
     field(:last_round_started_at, :naive_datetime)
     field(:last_round_ended_at, :naive_datetime)
     field(:meta, :map, default: %{})
@@ -104,7 +106,8 @@ defmodule Codebattle.GroupTournament do
       :slice_strategy,
       :last_round_started_at,
       :last_round_ended_at,
-      :meta
+      :meta,
+      :max_score
     ])
     |> validate_required([
       :group_task_id,

apps/codebattle/lib/codebattle/workers/save_group_tournament_results_worker.ex

@@ -27,6 +27,7 @@ defmodule Codebattle.Workers.SaveGroupTournamentResultsWorker do
   defp save_results(%GroupTournament{id: group_tournament_id} = group_tournament) do
     now = DateTime.truncate(DateTime.utc_now(), :second)
     duration = duration_seconds(group_tournament)
+    total_score = group_tournament.max_score
 
     stages =
       UserEventStage
@@ -36,29 +37,30 @@ defmodule Codebattle.Workers.SaveGroupTournamentResultsWorker do
 
     case stages do
       [] -> :ok
-      _ -> update_stages(stages, group_tournament_id, now, duration)
+      _ -> update_stages(stages, group_tournament_id, now, duration, total_score)
     end
   end
 
-  defp update_stages(stages, group_tournament_id, now, duration) do
+  defp update_stages(stages, group_tournament_id, now, duration, total_score) do
     scores_by_user_id = best_scores_for(group_tournament_id)
 
     Enum.each(stages, fn stage ->
       score = Map.get(scores_by_user_id, stage.user_event.user_id, 0)
-      update_stage(stage, group_tournament_id, now, duration, score)
+      update_stage(stage, group_tournament_id, now, duration, score, total_score)
     end)
 
     :ok
   end
 
-  defp update_stage(stage, group_tournament_id, now, duration, score) do
+  defp update_stage(stage, group_tournament_id, now, duration, score, total_score) do
     result =
       stage
       |> UserEventStage.changeset(%{
         status: :completed,
         finished_at: now,
         group_tournament_finished: true,
         group_tournament_score: score,
+        group_tournament_total_score: total_score,
         group_tournament_time_spent_in_seconds: duration
       })
       |> Repo.update()

apps/codebattle/lib/codebattle_web/controllers/api/v1/group_tournament_controller.ex

@@ -158,7 +158,8 @@ defmodule CodebattleWeb.Api.V1.GroupTournamentController do
       group_task_id: group_tournament.group_task_id,
       group_task_slug: group_tournament.group_task && group_tournament.group_task.slug,
       template_id: Map.get(group_tournament, :template_id),
-      meta: group_tournament.meta
+      meta: group_tournament.meta,
+      max_score: Map.get(group_tournament, :max_score)
     }
   end
 

apps/codebattle/lib/codebattle_web/controllers/group_tournament_controller.ex

@@ -43,8 +43,8 @@ defmodule CodebattleWeb.GroupTournamentController do
     end
   end
 
-  defp handle_my_tournament(%{group_tournament: %{state: "active", id: id}}, conn, _params) do
-    redirect(conn, to: Routes.group_tournament_path(conn, :show, id))
+  defp handle_my_tournament(%{group_tournament: %{state: "canceled"}}, conn, _params) do
+    redirect(conn, to: "/")
   end
 
   defp handle_my_tournament(%{group_tournament: %{state: "waiting_participants", id: id}} = record, conn, %{
@@ -58,7 +58,7 @@ defmodule CodebattleWeb.GroupTournamentController do
     redirect(conn, to: Routes.group_tournament_path(conn, :show, id))
   end
 
-  defp handle_my_tournament(%{group_tournament: %{state: "waiting_participants", id: id}}, conn, _params) do
+  defp handle_my_tournament(%{group_tournament: %{id: id}}, conn, _params) do
     redirect(conn, to: Routes.group_tournament_path(conn, :show, id))
   end
 

apps/codebattle/lib/codebattle_web/templates/admin/group_tournament/_form.html.heex

@@ -68,6 +68,15 @@
     {error_tag(f, :round_timeout_seconds)}
   </div>
 
+  <div class="form-group">
+    <div><span class="text-white">Max Score</span></div>
+    {number_input(f, :max_score,
+      class: "form-control form-control-lg cb-bg-panel cb-border-color text-white",
+      min: "1"
+    )}
+    {error_tag(f, :max_score)}
+  </div>
+
   <div class="form-group form-check mb-4">
     {checkbox(f, :include_bots, class: "form-check-input")}
     <label class="form-check-label text-white" for={input_id(f, :include_bots)}>

apps/codebattle/priv/repo/migrations/20260512120000_add_max_score_to_group_tournaments.exs

@@ -0,0 +1,10 @@
+defmodule Codebattle.Repo.Migrations.AddMaxScoreToGroupTournaments do
+  @moduledoc false
+  use Ecto.Migration
+
+  def change do
+    alter table(:group_tournaments) do
+      add(:max_score, :integer)
+    end
+  end
+end

apps/codebattle/priv/repo/migrations/20260512130000_add_group_tournament_total_score_to_user_event_stages.exs

@@ -0,0 +1,10 @@
+defmodule Codebattle.Repo.Migrations.AddGroupTournamentTotalScoreToUserEventStages do
+  @moduledoc false
+  use Ecto.Migration
+
+  def change do
+    alter table(:user_event_stages) do
+      add(:group_tournament_total_score, :integer)
+    end
+  end
+end