From 0f856060bb0d6c751517da19303da8ac86b59e1b Mon Sep 17 00:00:00 2001
From: Timur <jungle8888@mail.ru>
Date: Tue, 4 Mar 2025 02:21:03 +0300
Subject: [PATCH 1/2] add position field to competition results

---
 services/backend/api/v1/task/schemas.py | 1 +
 services/backend/api/v1/task/views.py   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/services/backend/api/v1/task/schemas.py b/services/backend/api/v1/task/schemas.py
index 95f2fb4..ec8d80a 100644
--- a/services/backend/api/v1/task/schemas.py
+++ b/services/backend/api/v1/task/schemas.py
@@ -68,3 +68,4 @@ class TaskStatusSchema(Schema):
     task_name: str
     result: int
     max_points: int
+    position: int
diff --git a/services/backend/api/v1/task/views.py b/services/backend/api/v1/task/views.py
index a0ce64c..6cf535d 100644
--- a/services/backend/api/v1/task/views.py
+++ b/services/backend/api/v1/task/views.py
@@ -210,6 +210,7 @@ def get_competition_results(request, competition_id: UUID):
             task_name=task.title,
             result=result,
             max_points=task.points,
+            position=task.in_competition_positions
         ))
 
     return status.OK, data

From 82349859b546b32db30f2c3f7b025b2f7b527ef7 Mon Sep 17 00:00:00 2001
From: rngsurrounded <kircore970@gmail.com>
Date: Tue, 4 Mar 2025 08:22:06 +0900
Subject: [PATCH 2/2] minor fixes

---
 .../CompetitionResultModal/index.tsx          | 26 +++++++-------
 .../components/CodeSolution/index.tsx         | 34 +++++++++----------
 .../modules/TaskSolution/index.tsx            |  4 +--
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/services/frontend/src/pages/Competition/components/CompetitionResultModal/index.tsx b/services/frontend/src/pages/Competition/components/CompetitionResultModal/index.tsx
index b691e77..080d9d6 100644
--- a/services/frontend/src/pages/Competition/components/CompetitionResultModal/index.tsx
+++ b/services/frontend/src/pages/Competition/components/CompetitionResultModal/index.tsx
@@ -1,4 +1,3 @@
-// src/components/competition/CompetitionResultsModal.tsx
 import React from 'react';
 import {
   Dialog,
@@ -12,7 +11,8 @@ import { Loader2 } from 'lucide-react';
 export interface CompetitionResult {
   task_name: string;
   result: number;
-  max_points: number
+  max_points: number;
+  position: number;
 }
 
 interface CompetitionResultsModalProps {
@@ -111,17 +111,19 @@ export const CompetitionResultsModal: React.FC<CompetitionResultsModalProps> = (
               Произошла ошибка при загрузке результатов
             </div>
           ) : results && results.length > 0 ? (
-            results.map((result, index) => (
-              <div 
-                key={index} 
-                className="flex flex-col md:flex-row justify-between items-start md:items-center p-4 bg-gray-50 rounded-lg border"
-              >
-                <div className="font-medium mb-2 md:mb-0">{result.task_name}</div>
-                <div className="text-right">
-                  {renderResultValue(result.result, result.max_points)}
+            [...results]
+              .sort((a, b) => a.position - b.position)
+              .map((result, index) => (
+                <div 
+                  key={index} 
+                  className="flex flex-col md:flex-row justify-between items-start md:items-center p-4 bg-gray-50 rounded-lg border"
+                >
+                  <div className="font-medium mb-2 md:mb-0">{result.task_name}</div>
+                  <div className="text-right">
+                    {renderResultValue(result.result, result.max_points)}
+                  </div>
                 </div>
-              </div>
-            ))
+              ))
           ) : (
             <div className="text-center py-6 text-gray-500">
               Нет доступных результатов
diff --git a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/CodeSolution/index.tsx b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/CodeSolution/index.tsx
index 0b386d2..906d2ac 100644
--- a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/CodeSolution/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/CodeSolution/index.tsx
@@ -116,29 +116,29 @@ const CodeSolution: React.FC<CodeSolutionProps> = ({
               
               <div className="mt-4 space-y-6">
                 <div>
-                  <h3 className="text-lg font-semibold mb-3 text-indigo-700 border-b pb-2">Ограничения</h3>
+                  <h3 className="text-lg font-semibold mb-3 border-b pb-2">Ограничение ресурсов</h3>
                   <ul className="space-y-3 text-gray-700">
                     <li className="flex items-start">
-                      <div className="bg-indigo-100 p-1.5 rounded-full mr-3 mt-0.5">
-                        <div className="w-1.5 h-1.5 bg-indigo-500 rounded-full"></div>
+                      <div className="bg-yellow-100 p-1.5 rounded-full mr-3 mt-0.5">
+                        <div className="w-1.5 h-1.5 bg-yellow-500 rounded-full"></div>
                       </div>
                       Максимум 1 посылка в 10 секунд
                     </li>
                     <li className="flex items-start">
-                      <div className="bg-indigo-100 p-1.5 rounded-full mr-3 mt-0.5">
-                        <div className="w-1.5 h-1.5 bg-indigo-500 rounded-full"></div>
+                      <div className="bg-yellow-100 p-1.5 rounded-full mr-3 mt-0.5">
+                        <div className="w-1.5 h-1.5 bg-yellow-500 rounded-full"></div>
                       </div>
                       Максимальный размер решения 4MB
                     </li>
                     <li className="flex items-start">
-                      <div className="bg-indigo-100 p-1.5 rounded-full mr-3 mt-0.5">
-                        <div className="w-1.5 h-1.5 bg-indigo-500 rounded-full"></div>
+                      <div className="bg-yellow-100 p-1.5 rounded-full mr-3 mt-0.5">
+                        <div className="w-1.5 h-1.5 bg-yellow-500 rounded-full"></div>
                       </div>
                       Максимальное время работы программы 1 минута
                     </li>
                     <li className="flex items-start">
-                      <div className="bg-indigo-100 p-1.5 rounded-full mr-3 mt-0.5">
-                        <div className="w-1.5 h-1.5 bg-indigo-500 rounded-full"></div>
+                      <div className="bg-yellow-100 p-1.5 rounded-full mr-3 mt-0.5">
+                        <div className="w-1.5 h-1.5 bg-yellow-500 rounded-full"></div>
                       </div>
                       Выделяется 512MB на решение
                     </li>
@@ -146,35 +146,35 @@ const CodeSolution: React.FC<CodeSolutionProps> = ({
                 </div>
                 
                 <div>
-                  <h3 className="text-lg font-semibold mb-3 text-indigo-700 border-b pb-2">Доступные библиотеки</h3>
+                  <h3 className="text-lg font-semibold mb-3 border-b pb-2">Доступные библиотеки</h3>
                   <div className="bg-gray-50 p-4 rounded-md font-mono text-sm">
                     <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">pandas</span>
+                        <span className="text-yellow-600 font-semibold">pandas</span>
                         <span className="text-gray-500 ml-2">2.2.3</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">numpy</span>
+                        <span className="text-yellow-600 font-semibold">numpy</span>
                         <span className="text-gray-500 ml-2">2.2.3</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">matplotlib</span>
+                        <span className="text-yellow-600 font-semibold">matplotlib</span>
                         <span className="text-gray-500 ml-2">3.10.1</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">scipy</span>
+                        <span className="text-yellow-600 font-semibold">scipy</span>
                         <span className="text-gray-500 ml-2">1.15.2</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">scikit-learn</span>
+                        <span className="text-yellow-600 font-semibold">scikit-learn</span>
                         <span className="text-gray-500 ml-2">1.6.1</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">seaborn</span>
+                        <span className="text-yellow-600 font-semibold">seaborn</span>
                         <span className="text-gray-500 ml-2">0.13.2</span>
                       </div>
                       <div className="flex items-center">
-                        <span className="text-indigo-600 font-semibold">statsmodels</span>
+                        <span className="text-yellow-600 font-semibold">statsmodels</span>
                         <span className="text-gray-500 ml-2">0.14.4</span>
                       </div>
                     </div>
diff --git a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
index 946939f..919da36 100644
--- a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx
@@ -155,10 +155,10 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
           ? 'bg-blue-50 text-blue-700'
           : 'bg-red-50 text-red-700'}`}
       >
-        {hasSubmissionsLeft ? (
+        {maxAttempts === -1 || hasSubmissionsLeft ? (
           <>
             <span className="font-medium">
-              Осталось посылок: {submissionsLeft === Infinity ? '∞' : submissionsLeft}
+              Осталось посылок: {maxAttempts === -1 ? '∞' : submissionsLeft}
             </span>
             {maxAttempts !== -1 && (
               <span className="text-blue-500 ml-1">