Added information about file size limits and allowed file extensions (when binary files are submitted)

Author: NikolayIT

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

@@ -288,6 +288,11 @@ public ActionResult Submit(SubmissionModel participantSubmission, bool official)
         // TODO: Extract common logic between SubmitBinaryFile() and Submit()
         public ActionResult SubmitBinaryFile(BinarySubmissionModel participantSubmission, bool official)
         {
+            if (participantSubmission == null || participantSubmission.File == null)
+            {
+                throw new HttpException((int)HttpStatusCode.BadRequest, "Please upload file.");
+            }
+
             var problem = this.Data.Problems.All().FirstOrDefault(x => x.Id == participantSubmission.ProblemId);
             if (problem == null)
             {
@@ -460,6 +465,7 @@ public ActionResult GetAllowedSubmissionTypes(int id)
                                                         Value = x.Id.ToString(CultureInfo.InvariantCulture),
                                                         Selected = x.IsSelectedByDefault,
                                                         x.AllowBinaryFilesUpload,
+                                                        x.AllowedFileExtensions,
                                                     });
 
             return this.Json(submissionTypesSelectListItems, JsonRequestBehavior.AllowGet);

Open Judge System/Web/OJS.Web/Areas/Contests/ViewModels/Contests/ContestProblemViewModel.cs

@@ -13,6 +13,8 @@ public class ContestProblemViewModel
 
         private int timeLimitInMs;
 
+        private int? fileSizeLimitInBytes;
+
         public ContestProblemViewModel(Problem problem)
         {
             this.ProblemId = problem.Id;
@@ -25,6 +27,7 @@ public ContestProblemViewModel(Problem problem)
                                                 .Select(ContestProblemResourceViewModel.FromResource);
             this.TimeLimit = problem.TimeLimit;
             this.MemoryLimit = problem.MemoryLimit;
+            this.FileSizeLimit = problem.SourceCodeSizeLimit;
             this.CheckerName = problem.Checker.Name;
             this.CheckerDescription = problem.Checker.Description;
         }
@@ -34,6 +37,7 @@ public ContestProblemViewModel()
             this.Resources = new HashSet<ContestProblemResourceViewModel>();
         }
 
+        // TODO: Constructor and this static property have the same code. Refactor.
         public static Expression<Func<Problem, ContestProblemViewModel>> FromProblem
         {
             get
@@ -45,6 +49,7 @@ public static Expression<Func<Problem, ContestProblemViewModel>> FromProblem
                     ContestId = problem.ContestId,
                     MemoryLimit = problem.MemoryLimit,
                     TimeLimit = problem.TimeLimit,
+                    FileSizeLimit = problem.SourceCodeSizeLimit,
                     ShowResults = problem.ShowResults,
                     CheckerName = problem.Checker.Name,
                     CheckerDescription = problem.Checker.Description,
@@ -89,6 +94,24 @@ public double TimeLimit
                 this.timeLimitInMs = (int)value;
             }
         }
+        
+        public double? FileSizeLimit
+        {
+            get
+            {
+                if (!this.fileSizeLimitInBytes.HasValue)
+                {
+                    return null;
+                }
+
+                return (double)this.fileSizeLimitInBytes / 1024;
+            }
+
+            set
+            {
+                this.fileSizeLimitInBytes = (int?)value;
+            }
+        }
 
         public string CheckerName { get; set; }
 

Open Judge System/Web/OJS.Web/Areas/Contests/ViewModels/Submissions/SubmissionDetailsViewModel.cs

@@ -21,6 +21,7 @@ public static Expression<Func<Submission, SubmissionDetailsViewModel>> FromSubmi
                     UserName = submission.Participant.User.UserName,
                     CompilerComment = submission.CompilerComment,
                     Content = submission.Content,
+                    FileExtension = submission.FileExtension,
                     CreatedOn = submission.CreatedOn,
                     IsCompiledSuccessfully = submission.IsCompiledSuccessfully,
                     IsDeleted = submission.IsDeleted,
@@ -49,12 +50,27 @@ public static Expression<Func<Submission, SubmissionDetailsViewModel>> FromSubmi
 
         public string CompilerComment { get; set; }
 
+        public string FileExtension { get; set; }
+
         public byte[] Content { get; set; }
 
+        public bool IsBinaryFile
+        {
+            get
+            {
+                return !string.IsNullOrWhiteSpace(this.FileExtension);
+            }
+        }
+
         public string ContentAsString
         {
             get
             {
+                if (this.IsBinaryFile)
+                {
+                    return "Binary file.";
+                }
+
                 return this.Content.Decompress();
             }
         }

Open Judge System/Web/OJS.Web/Areas/Contests/Views/Shared/_ProblemPartial.cshtml

@@ -87,15 +87,26 @@
             {
                 @Html.HiddenFor(x => x.ProblemId)
                 <div id="submisionDataFields">
-                    <textarea class="code-for-problem" id="[email protected]" name="Content"></textarea>
-                    @(Html.Kendo().Upload().Name("File").Multiple(false).ShowFileList(true).HtmlAttributes(new { id = "file-problem-" + Model.ProblemId }))
+                    <div id="[email protected]">
+                        <textarea class="code-for-problem" id="[email protected]" name="Content"></textarea>
+                    </div>
+                    <div id="[email protected]">
+                        @(Html.Kendo().Upload().Name("File").Multiple(false).ShowFileList(true).HtmlAttributes(new { id = "file-problem-" + Model.ProblemId }))
+                        <div id="[email protected]"></div>
+                    </div>
                 </div>
                 <div class="col-md-12">
                     <div class="pull-left submit-container">
                         <strong>@Resource.Allowed_working_time:</strong> @string.Format("{0:0.00}", Model.TimeLimit) sec.
                         <br />
                         <strong>@Resource.Allowed_memory:</strong> @string.Format("{0:0.00}", Model.MemoryLimit) MB
                         <br />
+                        @if (Model.FileSizeLimit.HasValue)
+                        {
+                            <strong>Size limit:</strong> @(string.Format("{0:0.00}", Model.FileSizeLimit.Value)) @:KB
+                            <br />
+                        }
+                        
                         <strong>Checker:</strong> @Model.CheckerName <span class="glyphicon glyphicon-question-sign" id="checkers-tooltip"></span>
                         @if (!string.IsNullOrWhiteSpace(Model.CheckerDescription))
                         {
@@ -108,14 +119,16 @@
                                 var index = this.selectedIndex;
                                 var dataItem = this.dataItem(index);
                                 var form = $("#[email protected]");
-                                var fileUpload = $("#[email protected]").data("kendoUpload").wrapper;
-                                var codeArea = $($("#[email protected]").data('CodeMirrorInstance').getWrapperElement());
+                                var fileUpload = $("#[email protected]");
+                                var codeArea = $("#[email protected]");
+                                var fileExtensionsInfo = $("#[email protected]");
                                 
                                 if (dataItem.AllowBinaryFilesUpload) {
                                     form.attr("action", form.attr("action").replace("/Submit/", "/SubmitBinaryFile/"));
                                     form.attr("data-ajax", "false");
                                     fileUpload.show();
                                     codeArea.hide();
+                                    fileExtensionsInfo.html("<b>Allowed file extensions:</b> " + dataItem.AllowedFileExtensions);
                                 } else {
                                     form.attr("action", form.attr("action").replace("/SubmitBinaryFile/", "/Submit/"));
                                     form.attr("data-ajax", "true");