Merge pull request #1558 from SoftUni-Internal/v2-development

Merge dev into main. Integrate latest bugfixes and improvements.

Author: gogo4ds

Common/OJS.Common/Enumerations/ContestType.cs

@@ -6,5 +6,6 @@ public enum ContestType
         OnsitePracticalExam = 1,
         OnlinePracticalExam = 2,
         Lab = 3,
+        OnsitePracticalExamWithRandomTasks = 4,
     }
 }

Common/OJS.Common/Resources.cs

@@ -157,8 +157,8 @@ public static class ProblemGroupsControllers
     {
         public const string ActiveContestCannotAddProblemGroup = "The contest is аctive and you cannot add problem groups";
         public const string ActiveContestCannotDeleteProblemGroup = "The contest is аctive and you cannot delete problem groups";
-        public const string CanCreateOnlyInOnlineContest = "You can create problem groups only in a contest which is of type {0}";
-        public const string CanEditOrderbyOnlyInOnlineContest = "You can edit problem groups order only in a contest which is of type {0}.";
+        public const string CanCreateOnlyInContestWithRandomTasks = "You can create problem groups only in a contest with random tasks";
+        public const string CanEditOrderByOnlyInContestWithRandomTasks = "You can edit problem groups order only in a contest with random tasks.";
         public const string ContestDoesNotExist = "The selected contest does not exist";
         public const string ContestRequired = "Contest is required";
         public const string CopyAllProblemGroupsSuccessMessage = "Successfully copied all problem groups from the contest \"{0}\" into the contest \"{1}\"";

Data/OJS.Data.Models/Contests/Contest.cs

@@ -130,13 +130,13 @@ public bool ResultsArePubliclyVisible
         public bool HasPracticePassword => this.PracticePassword != null;
 
         [NotMapped]
-        public bool IsOnlineExam => this.Type == ContestType.OnlinePracticalExam;
+        public bool IsOnlineExam => this.Type is ContestType.OnlinePracticalExam;
 
         [NotMapped]
-        public bool IsOnsiteExam => this.Type == ContestType.OnsitePracticalExam;
+        public bool IsWithRandomTasks => this.Type is ContestType.OnlinePracticalExam or ContestType.OnsitePracticalExamWithRandomTasks;
 
         [NotMapped]
-        public bool IsExam => this.IsOnlineExam || this.IsOnsiteExam;
+        public bool IsOnsiteExam => this.Type is ContestType.OnsitePracticalExam;
 
         public static IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {

Data/OJS.Data.Models/Submissions/Submission.cs

@@ -51,6 +51,8 @@ public class Submission : DeletableAuditInfoEntity<int>
         [StringLength(ConstraintConstants.Submission.WorkerNameMaxLength)]
         public string? WorkerName { get; set; }
 
+        public ExceptionType? ExceptionType { get; set; }
+
         [NotMapped]
         public bool IsBinaryFile => !string.IsNullOrWhiteSpace(this.FileExtension);