Merge branch 'master' of github.com:InteIIigeNET/HwProj-2.0.1

DedSec256 · DedSec256 · commit a9a66ed17def · 2026-05-16T03:12:17.000+03:00
diff --git a/HwProj.Common/HwProj.Models/CoursesService/ViewModels/CriterionViewModel.cs b/HwProj.Common/HwProj.Models/CoursesService/ViewModels/CriterionViewModel.cs
@@ -4,7 +4,8 @@ namespace HwProj.Models.CoursesService.ViewModels
 {
     public enum CriterionType
     {
-        Free = 0
+        Free = 0,
+        Deadline = 1
     }
 
     public class CriterionViewModel
@@ -13,5 +14,6 @@ public class CriterionViewModel
         public CriterionType Type { get; set; }
         [Required] public string Name { get; set; } = null!;
         [Range(0, int.MaxValue)] public int MaxPoints { get; set; }
+        public string? Arguments { get; set; }
     }
 }
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs
@@ -64,7 +64,8 @@ public static HomeworkTaskViewModel ToHomeworkTaskViewModel(this HomeworkTask ta
                         Id = c.Id,
                         Type = (CriterionType)c.Type,
                         Name = c.Name,
-                        MaxPoints = c.MaxPoints
+                        MaxPoints = c.MaxPoints,
+                        Arguments = c.Arguments
                     })
                     .ToList(),
             };
@@ -120,7 +121,8 @@ public static CoursePreview ToCoursePreview(this Course course)
             Id = criterion.Id,
             Type = (Models.CriterionType)criterion.Type,
             Name = criterion.Name,
-            MaxPoints = criterion.MaxPoints
+            MaxPoints = criterion.MaxPoints,
+            Arguments = criterion.Arguments
         };
 
         public static HomeworkTask ToHomeworkTask(this PostTaskViewModel postTaskViewModel)
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/20260427093000_CriterionArguments.Designer.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/20260427093000_CriterionArguments.Designer.cs
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/20260427093000_CriterionArguments.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/20260427093000_CriterionArguments.cs
@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace HwProj.CoursesService.API.Migrations
+{
+    public partial class CriterionArguments : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Arguments",
+                table: "Criteria",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Arguments",
+                table: "Criteria");
+        }
+    }
+}
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/CourseContextModelSnapshot.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Migrations/CourseContextModelSnapshot.cs
@@ -128,6 +128,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("MaxPoints")
                         .HasColumnType("int");
 
+                    b.Property<string>("Arguments")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Name")
                         .HasColumnType("nvarchar(max)");
 
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Models/Criterion.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Models/Criterion.cs
@@ -5,7 +5,8 @@ namespace HwProj.CoursesService.API.Models
 {
     public enum CriterionType
     {
-        Free = 0
+        Free = 0,
+        Deadline = 1
     }
 
     public class Criterion : IEntity<long>
@@ -17,5 +18,6 @@ public class Criterion : IEntity<long>
         public CriterionType Type { get; set; }
         public string Name { get; set; }
         public int MaxPoints { get; set; }
+        public string? Arguments { get; set; }
     }
 }
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Repositories/TasksRepository.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Repositories/TasksRepository.cs
@@ -89,10 +89,11 @@ public bool Equals(Criterion? x, Criterion? y)
                        x.TaskId == y.TaskId &&
                        x.Type == y.Type &&
                        x.Name == y.Name &&
-                       x.MaxPoints == y.MaxPoints;
+                       x.MaxPoints == y.MaxPoints &&
+                       x.Arguments == y.Arguments;
             }
 
-            public int GetHashCode(Criterion obj) => HashCode.Combine(obj.Id, obj.TaskId, obj.Name);
+            public int GetHashCode(Criterion obj) => HashCode.Combine(obj.Id, obj.TaskId, obj.Name, obj.Arguments);
         }
     }
 }
diff --git a/README.md b/README.md
@@ -10,15 +10,15 @@ HwProj — это веб-сервис, созданный для автомат
 
 **Для преподавателей** в HwProj реализована лента непроверенных решений: здесь содержится информация о решениях со всех курсов преподавателя, отсортированных по времени выполнения заданий с возможностью фильтрации.
 
-<img width="600" height="400" alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/77d36bfe-13aa-415d-bd8b-c4c6550bb56a" />
+<img alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/77d36bfe-13aa-415d-bd8b-c4c6550bb56a" />
 
 **Для студентов** HwProj предоставляет ленту назначенных задач с информацией о дедлайнах.
 
-<img width="300" height="300" alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/dbb83a16-d3f7-4117-89fe-e4c2c676adea" />
+<img alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/dbb83a16-d3f7-4117-89fe-e4c2c676adea" />
 
 **Внешние эксперты** в сервисе могут просматривать, комментировать и оценивать решения студентов по просьбе преподавателей.
 
-<img width="350" height="350" alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/2d351109-5d45-4892-a075-829d700a7860" />
+<img  alt="image_2025-10-27_01-34-23" src="https://github.com/user-attachments/assets/2d351109-5d45-4892-a075-829d700a7860" />
 
 
 Чтобы узнать больше о возможностях сервиса, ознакомьтесь с [нашей документацией](Docs/documentation.pdf). Для начала работы с сервисом предлагаем воспользоваться [инструкцией](https://docs.google.com/document/d/18W-LAuG7Dq75V2p-imF2KWIWvq8MhLl2Zr3ucLQnKCY/edit?usp=sharing).
diff --git a/hwproj.front/src/api/api.ts b/hwproj.front/src/api/api.ts
@@ -655,7 +655,8 @@ export interface CreateHomeworkViewModel {
  * @enum {string}
  */
 export enum CriterionType {
-    NUMBER_0 = <any> 0
+    NUMBER_0 = <any> 0,
+    NUMBER_1 = <any> 1
 }
 /**
  *
@@ -687,6 +688,12 @@ export interface CriterionViewModel {
      * @memberof CriterionViewModel
      */
     maxPoints?: number;
+    /**
+     *
+     * @type {string}
+     * @memberof CriterionViewModel
+     */
+    arguments?: string;
 }
 /**
  *
diff --git a/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx b/hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx
@@ -43,6 +43,8 @@ import {FilesHandler} from "@/components/Files/FilesHandler";
 import GroupSelector from "../Common/GroupSelector";
 import GroupIcon from '@mui/icons-material/Group';
 import AssignmentIcon from '@mui/icons-material/Assignment';
+import ErrorsHandler from "@/components/Utils/ErrorsHandler";
+import {enqueueSnackbar} from "notistack";
 
 export interface HomeworkAndFilesInfo {
     homework: HomeworkViewModel & { isModified?: boolean },
@@ -243,43 +245,54 @@ const CourseHomeworkEditor: FC<{
         e.preventDefault()
         setHandleSubmitLoading(true)
 
-        const update = {
-            homeworkId: homeworkId,
-            title: title!,
-            description: description,
-            tags: tags,
-            hasDeadline: metadata.hasDeadline,
-            deadlineDate: metadata.deadlineDate,
-            isDeadlineStrict: metadata.isDeadlineStrict,
-            publicationDate: metadata.publicationDate,
-            groupId: selectedGroupId,
-            actionOptions: editOptions,
-            tasks: isNewHomework ? homework.tasks!.map(t => {
-                const task: PostTaskViewModel = {
-                    ...t,
-                    title: t.title!,
-                    maxRating: t.maxRating!
-                }
-                return task
-            }) : []
-        }
+        try {
+            const update = {
+                homeworkId: homeworkId,
+                title: title!,
+                description: description,
+                tags: tags,
+                hasDeadline: metadata.hasDeadline,
+                deadlineDate: metadata.deadlineDate,
+                isDeadlineStrict: metadata.isDeadlineStrict,
+                publicationDate: metadata.publicationDate,
+                groupId: selectedGroupId,
+                actionOptions: editOptions,
+                tasks: isNewHomework ? homework.tasks!.map(t => {
+                    const task: PostTaskViewModel = {
+                        ...t,
+                        title: t.title!,
+                        maxRating: t.maxRating!,
+                        criteria: t.criteria || []
+                    }
+                    return task
+                }) : []
+            }
 
-        const updatedHomework = isNewHomework
-            ? await ApiSingleton.homeworksApi.homeworksAddHomework(courseId!, update)
-            : await ApiSingleton.homeworksApi.homeworksUpdateHomework(+homeworkId!, update)
-
-        const updatedHomeworkId = updatedHomework.value!.id!
-        await handleFilesChange(
-            courseId, CourseUnitType.Homework, updatedHomeworkId,
-            props.onStartProcessing,
-            () => {
-                if (isNewHomework) props.onUpdate({
-                    homework: update,
-                    isDeleted: true
-                }) // remove fake homework
-                props.onUpdate({homework: updatedHomework.value!, isSaved: true});
-            },
-        );
+            const updatedHomework = isNewHomework
+                ? await ApiSingleton.homeworksApi.homeworksAddHomework(courseId!, update)
+                : await ApiSingleton.homeworksApi.homeworksUpdateHomework(+homeworkId!, update)
+
+            const updatedHomeworkId = updatedHomework.value!.id!
+            await handleFilesChange(
+                courseId, CourseUnitType.Homework, updatedHomeworkId,
+                props.onStartProcessing,
+                () => {
+                    if (isNewHomework) props.onUpdate({
+                        homework: update,
+                        isDeleted: true
+                    }) // remove fake homework
+                    props.onUpdate({homework: updatedHomework.value!, isSaved: true});
+                },
+            );
+        } catch (error) {
+            const errors = await ErrorsHandler.getErrorMessages(error as Response, "errors");
+            enqueueSnackbar(errors[0] || "Не удалось сохранить задание", {
+                variant: "error",
+                autoHideDuration: 4000,
+            });
+        } finally {
+            setHandleSubmitLoading(false)
+        }
     }
 
     const isDisabled = hasErrors || !isLoaded || taskHasErrors
@@ -569,4 +582,4 @@ const CourseHomeworkExperimental: FC<{
         }
     </CardContent>
 }
-export default CourseHomeworkExperimental;
+export default CourseHomeworkExperimental;
diff --git a/hwproj.front/src/components/Solutions/TaskSolutionComponent.tsx b/hwproj.front/src/components/Solutions/TaskSolutionComponent.tsx
diff --git a/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx b/hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx
diff --git a/hwproj.front/src/components/Tasks/TaskCriteria.tsx b/hwproj.front/src/components/Tasks/TaskCriteria.tsx

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ namespace HwProj.Models.CoursesService.ViewModels`
`4`	`4`	`{`
`5`	`5`	`public enum CriterionType`
`6`	`6`	`{`
`7`		`- Free = 0`
	`7`	`+ Free = 0,`
	`8`	`+ Deadline = 1`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`public class CriterionViewModel`
`@@ -13,5 +14,6 @@ public class CriterionViewModel`
`13`	`14`	`public CriterionType Type { get; set; }`
`14`	`15`	`[Required] public string Name { get; set; } = null!;`
`15`	`16`	`[Range(0, int.MaxValue)] public int MaxPoints { get; set; }`
	`17`	`+ public string? Arguments { get; set; }`
`16`	`18`	`}`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ namespace HwProj.CoursesService.API.Models`
`5`	`5`	`{`
`6`	`6`	`public enum CriterionType`
`7`	`7`	`{`
`8`		`- Free = 0`
	`8`	`+ Free = 0,`
	`9`	`+ Deadline = 1`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`public class Criterion : IEntity<long>`
`@@ -17,5 +18,6 @@ public class Criterion : IEntity<long>`
`17`	`18`	`public CriterionType Type { get; set; }`
`18`	`19`	`public string Name { get; set; }`
`19`	`20`	`public int MaxPoints { get; set; }`
	`21`	`+ public string? Arguments { get; set; }`
`20`	`22`	`}`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,11 @@ public bool Equals(Criterion? x, Criterion? y)`
`89`	`89`	`x.TaskId == y.TaskId &&`
`90`	`90`	`x.Type == y.Type &&`
`91`	`91`	`x.Name == y.Name &&`
`92`		`- x.MaxPoints == y.MaxPoints;`
	`92`	`+ x.MaxPoints == y.MaxPoints &&`
	`93`	`+ x.Arguments == y.Arguments;`
`93`	`94`	`}`
`94`	`95`
`95`		`- public int GetHashCode(Criterion obj) => HashCode.Combine(obj.Id, obj.TaskId, obj.Name);`
	`96`	`+ public int GetHashCode(Criterion obj) => HashCode.Combine(obj.Id, obj.TaskId, obj.Name, obj.Arguments);`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,8 @@ export interface CreateHomeworkViewModel {`
`655`	`655`	`* @enum {string}`
`656`	`656`	`*/`
`657`	`657`	`export enum CriterionType {`
`658`		`- NUMBER_0 = <any> 0`
	`658`	`+ NUMBER_0 = <any> 0,`
	`659`	`+ NUMBER_1 = <any> 1`
`659`	`660`	`}`
`660`	`661`	`/**`
`661`	`662`	`*`
`@@ -687,6 +688,12 @@ export interface CriterionViewModel {`
`687`	`688`	`* @memberof CriterionViewModel`
`688`	`689`	`*/`
`689`	`690`	`maxPoints?: number;`
	`691`	`+ /**`
	`692`	`+ *`
	`693`	`+ * @type {string}`
	`694`	`+ * @memberof CriterionViewModel`
	`695`	`+ */`
	`696`	`+ arguments?: string;`
`690`	`697`	`}`
`691`	`698`	`/**`
`692`	`699`	`*`