FIxes

Author: vtm9

services/app/apps/codebattle/assets/js/widgets/pages/game/TournamentRankingTable.jsx

@@ -28,7 +28,7 @@ const tableDataCellClassName = cn(
 
 const TournamentRankingTable = () => {
   const currentUserClanId = useSelector(currentUserClanIdSelector);
-  const { ranking } = useSelector(tournamentSelector);
+  const { ranking, currentRoundPosition, roundTaskIds } = useSelector(tournamentSelector);
 
   return (
     <div
@@ -109,6 +109,13 @@ const TournamentRankingTable = () => {
           </tbody>
         </table>
       </div>
+        {roundTaskIds?.length > 0 && (
+          <div className="d-flex justify-content-center align-items-center mt-2 mb-2">
+            <span className="font-weight-bold">
+              {i18next.t('Task')}: {currentRoundPosition + 1} / {roundTaskIds.length}
+            </span>
+          </div>
+        )}  
     </div>
   );
 };

services/app/apps/codebattle/lib/codebattle/game/engine.ex

@@ -388,7 +388,7 @@ defmodule Codebattle.Game.Engine do
   end
 
   def toggle_ban_player(%Game{} = game, player_id) do
-    {:ok, {_old_game_state, new_game}} = fire_transition(game.id, :toggle_ban_player, %{player_id: player_id})
+    {:ok, {_old_game_state, new_game}} = fire_transition(game.id, :toggle_ban_player, %{id: player_id})
     {:ok, new_game}
   end
 

services/app/apps/codebattle/lib/codebattle/game/fsm.ex

@@ -111,7 +111,7 @@ defmodule Codebattle.Game.Fsm do
     {:ok, Map.put(game, :locked, false)}
   end
 
-  def transition(:toggle_ban_player, game, %{player_id: player_id}) do
+  def transition(:toggle_ban_player, game, %{id: player_id}) do
     new_players =
       Enum.map(game.players, fn player ->
         if player.id == player_id do

services/app/apps/codebattle/lib/codebattle_web/channels/game_channel.ex

@@ -35,7 +35,7 @@ defmodule CodebattleWeb.GameChannel do
 
       ranking =
         tournament
-        |> Tournament.Ranking.get_first(6)
+        |> Tournament.Ranking.get_first(5)
         |> Enum.concat([Tournament.Ranking.get_by_player(tournament, current_player)])
         |> Enum.filter(& &1)
         |> Enum.uniq_by(& &1.id)
@@ -324,9 +324,12 @@ defmodule CodebattleWeb.GameChannel do
   def handle_info(%{event: "user:banned", payload: %{player: player}}, socket) do
     user_id = socket.assigns.current_user.id
 
-    if user_id == player.id do
-      socket = assign(socket, banned?: true)
-    end
+    socket =
+      if user_id == player.id do
+        assign(socket, banned?: true)
+      else
+        socket
+      end
 
     push(socket, "user:banned", %{user_id: player.id})
     {:noreply, socket}
@@ -335,9 +338,12 @@ defmodule CodebattleWeb.GameChannel do
   def handle_info(%{event: "user:unbanned", payload: %{player: player}}, socket) do
     user_id = socket.assigns.current_user.id
 
-    if user_id == player.id do
-      socket = assign(socket, banned?: false)
-    end
+    socket =
+      if user_id == player.id do
+        assign(socket, banned?: false)
+      else
+        socket
+      end
 
     push(socket, "user:unbanned", %{user_id: player.id})
     {:noreply, socket}