Fix for problem orders in results page (#467)

Author: NikolayIT

Open Judge System/Web/OJS.Web/App_GlobalResources/Global.Designer.cs

@@ -121,6 +121,6 @@
     <value>Open Judge System (OJS)</value>
   </data>
   <data name="SystemVersion" xml:space="preserve">
-    <value>1.3.3396.20140303</value>
+    <value>1.3.3533.20140419</value>
   </data>
 </root>

Open Judge System/Web/OJS.Web/App_GlobalResources/Global.resx

@@ -30,9 +30,9 @@ public FileResult Results(int id, bool compete)
 
             var data = new
             {
-                Id = contest.Id,
-                Name = contest.Name,
-                Problems = contest.Problems.AsQueryable().OrderBy(x => x.Name),
+                contest.Id,
+                contest.Name,
+                Problems = contest.Problems.AsQueryable().OrderBy(x => x.OrderBy).ThenBy(x => x.Name),
                 Questions = contest.Questions.OrderBy(x => x.Id),
                 Results = this.Data.Participants.All()
                     .Where(participant => participant.ContestId == contest.Id && participant.IsOfficial == compete)
@@ -145,7 +145,7 @@ public FileResult Results(int id, bool compete)
         public ZipFileResult Solutions(int id, bool compete)
         {
             var contest = this.Data.Contests.GetById(id);
-            var problems = contest.Problems.OrderBy(x => x.Name).ToList();
+            var problems = contest.Problems.OrderBy(x => x.OrderBy).ThenBy(x => x.Name).ToList();
             var participants =
                 this.Data.Participants.All()
                     .Where(x => x.ContestId == id && x.IsOfficial == compete)

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

@@ -104,7 +104,7 @@ public ActionResult Simple(int id, bool official, int? page)
                 ContestCanBeCompeted = contest.CanBeCompeted,
                 ContestCanBePracticed = contest.CanBePracticed,
                 Problems = contest.Problems.AsQueryable().Where(x => !x.IsDeleted)
-                                        .Select(ContestProblemViewModel.FromProblem).OrderBy(x => x.Name),
+                                        .Select(ContestProblemViewModel.FromProblem).OrderBy(x => x.OrderBy).ThenBy(x => x.Name),
                 Results = this.Data.Participants.All()
                     .Where(participant => participant.ContestId == contest.Id && participant.IsOfficial == official)
                     .Select(participant => new ParticipantResultViewModel
@@ -180,7 +180,7 @@ public ActionResult Full(int id, bool official)
                 {
                     Id = contest.Id,
                     Name = contest.Name,
-                    Problems = contest.Problems.AsQueryable().Where(pr => !pr.IsDeleted).Select(ContestProblemViewModel.FromProblem).OrderBy(x => x.Name),
+                    Problems = contest.Problems.AsQueryable().Where(pr => !pr.IsDeleted).Select(ContestProblemViewModel.FromProblem).OrderBy(x => x.OrderBy).ThenBy(x => x.Name),
                     Results = this.Data.Participants.All()
                         .Where(participant => participant.ContestId == contest.Id && participant.IsOfficial == official)
                         .Select(participant => new ParticipantFullResultViewModel

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

@@ -19,6 +19,7 @@ public ContestProblemViewModel(Problem problem)
         {
             this.ProblemId = problem.Id;
             this.Name = problem.Name;
+            this.OrderBy = problem.OrderBy;
             this.ContestId = problem.ContestId;
             this.ShowResults = problem.ShowResults;
             this.Resources = problem.Resources.AsQueryable()
@@ -45,6 +46,7 @@ public static Expression<Func<Problem, ContestProblemViewModel>> FromProblem
                 return problem => new ContestProblemViewModel
                 {
                     Name = problem.Name,
+                    OrderBy = problem.OrderBy,
                     ProblemId = problem.Id,
                     ContestId = problem.ContestId,
                     MemoryLimit = problem.MemoryLimit,
@@ -67,6 +69,8 @@ public static Expression<Func<Problem, ContestProblemViewModel>> FromProblem
 
         public string Name { get; set; }
 
+        public int OrderBy { get; set; }
+
         public bool ShowResults { get; set; }
 
         public double MemoryLimit