Fixed problem with ordering the columns in the results page (Fixes #467)

Author: NikolayIT

Open Judge System/Web/OJS.Web/Areas/Administration/Controllers/ContestsExportController.cs

@@ -48,14 +48,15 @@ public FileResult Results(int id, bool compete)
                                 {
                                     Id = problem.Id,
                                     ProblemName = problem.Name,
+                                    ProblemOrderBy = problem.OrderBy,
                                     ShowResult = problem.ShowResults,
                                     BestSubmission = problem.Submissions
                                                         .Where(z => z.ParticipantId == participant.Id)
                                                         .OrderByDescending(z => z.Points).ThenByDescending(z => z.Id)
                                                         .Select(z => new { Id = z.Id, Points = z.Points })
                                                         .FirstOrDefault()
                                 })
-                                .OrderBy(res => res.ProblemName),
+                                .OrderBy(res => res.ProblemOrderBy).ThenBy(res => res.ProblemName),
                     })
                     .ToList()
                     .Select(x => new { Data = x, Total = x.ProblemResults.Where(y => y.ShowResult).Sum(y => y.BestSubmission == null ? 0 : y.BestSubmission.Points) })

Open Judge System/Web/OJS.Web/Areas/Contests/Controllers/ResultsController.cs

@@ -117,14 +117,15 @@ public ActionResult Simple(int id, bool official, int? page)
                                 {
                                     Id = problem.Id,
                                     ProblemName = problem.Name,
+                                    ProblemOrderBy = problem.OrderBy,
                                     ShowResult = problem.ShowResults,
                                     BestSubmission = problem.Submissions
                                                         .Where(z => z.ParticipantId == participant.Id && !z.IsDeleted)
                                                         .OrderByDescending(z => z.Points).ThenByDescending(z => z.Id)
                                                         .Select(z => new BestSubmissionViewModel { Id = z.Id, Points = z.Points })
                                                         .FirstOrDefault()
                                 })
-                                .OrderBy(res => res.ProblemName)
+                                .OrderBy(res => res.ProblemOrderBy).ThenBy(res => res.ProblemName)
                     })
                     .ToList()
                     .OrderByDescending(x => x.Total)
@@ -164,7 +165,6 @@ public ActionResult Simple(int id, bool official, int? page)
             return this.View(contestModel);
         }
 
-        // TODO: Implement
         // TODO: Unit test
         [Authorize(Roles = GlobalConstants.AdministratorRoleName)]
         public ActionResult Full(int id, bool official)
@@ -193,14 +193,15 @@ public ActionResult Full(int id, bool official)
                                     {
                                         Id = problem.Id,
                                         ProblemName = problem.Name,
+                                        ProblemOrderBy = problem.OrderBy,
                                         MaximumPoints = problem.MaximumPoints,
                                         BestSubmission = problem.Submissions.AsQueryable()
                                                             .Where(submission => submission.ParticipantId == participant.Id && !submission.IsDeleted)
                                                             .OrderByDescending(z => z.Points).ThenByDescending(z => z.Id)
                                                             .Select(SubmissionFullResultsViewModel.FromSubmission)
                                                             .FirstOrDefault(),
                                     })
-                                    .OrderBy(res => res.ProblemName)
+                                    .OrderBy(res => res.ProblemOrderBy).ThenBy(res => res.ProblemName)
                         })
                         .ToList()
                         .OrderByDescending(x => x.Total).ThenBy(x => x.ParticipantName)

Open Judge System/Web/OJS.Web/Areas/Contests/ViewModels/Results/ProblemFullResultViewModel.cs

@@ -6,6 +6,8 @@ public class ProblemFullResultViewModel
 
         public string ProblemName { get; set; }
 
+        public int ProblemOrderBy { get; set; }
+
         public SubmissionFullResultsViewModel BestSubmission { get; set; }
 
         public int MaximumPoints { get; set; }

Open Judge System/Web/OJS.Web/Areas/Contests/ViewModels/Results/ProblemResultPairViewModel.cs

@@ -9,5 +9,7 @@ public class ProblemResultPairViewModel
         public BestSubmissionViewModel BestSubmission { get; set; }
 
         public string ProblemName { get; set; }
+
+        public int ProblemOrderBy { get; set; }
     }
 }