show pending submissions

competitions/app.py

@@ -148,15 +148,18 @@ async def my_submissions(request: Request, user: User):
     except AuthenticationError:
         return {
             "response": {
-                "submissions": "**Invalid token**",
+                "submissions": "",
                 "submission_text": SUBMISSION_TEXT.format(COMP_INFO.submission_limit),
+                "error": "**Invalid token**",
             }
         }
     subs = pd.concat([success_subs, failed_subs], axis=0)
     subs = subs.to_dict(orient="records")
+    error = ""
     if len(subs) == 0:
-        subs = "You have not made any submissions yet."
+        error = "**You have not made any submissions yet.**"
         failed_subs = ""
+        subs = ""
     submission_text = SUBMISSION_TEXT.format(COMP_INFO.submission_limit)
     submission_selection_text = SUBMISSION_SELECTION_TEXT.format(COMP_INFO.selection_limit)
 
@@ -164,6 +167,7 @@ async def my_submissions(request: Request, user: User):
         "response": {
             "submissions": subs,
             "submission_text": submission_text + submission_selection_text,
+            "error": error,
         }
     }
     return resp
@@ -174,8 +178,11 @@ async def new_submission(
     submission_file: UploadFile = File(None),
     hub_model: str = Form(...),
     token: str = Form(...),
-    submission_comment: str = Form(...),
+    submission_comment: str = Form(None),
 ):
+    if submission_comment is None:
+        submission_comment = ""
+
     sub = Submissions(
         end_date=COMP_INFO.end_date,
         submission_limit=COMP_INFO.submission_limit,

competitions/submissions.py

@@ -256,25 +256,30 @@ class Submissions:
             submissions_df = submissions_df[self.private_sub_columns]
         if not private:
             failed_submissions = submissions_df[
-                (submissions_df["status"].isin(["failed", "error"])) | (submissions_df["public_score"] == -1)
+                (submissions_df["status"].isin(["failed", "error", "pending", "processing"]))
+                | (submissions_df["public_score"] == -1)
             ]
             successful_submissions = submissions_df[
-                ~submissions_df["status"].isin(["failed", "error"]) & (submissions_df["public_score"] != -1)
+                ~submissions_df["status"].isin(["failed", "error", "pending", "processing"])
+                & (submissions_df["public_score"] != -1)
             ]
         else:
             failed_submissions = submissions_df[
-                (submissions_df["status"].isin(["failed", "error"]))
+                (submissions_df["status"].isin(["failed", "error", "pending", "processing"]))
                 | (submissions_df["private_score"] == -1)
                 | (submissions_df["public_score"] == -1)
             ]
             successful_submissions = submissions_df[
-                ~submissions_df["status"].isin(["failed", "error"])
+                ~submissions_df["status"].isin(["failed", "error", "pending", "processing"])
                 & (submissions_df["private_score"] != -1)
                 & (submissions_df["public_score"] != -1)
             ]
         failed_submissions = failed_submissions.reset_index(drop=True)
         successful_submissions = successful_submissions.reset_index(drop=True)
 
+        if len(successful_submissions) == 0:
+            return successful_submissions, failed_submissions
+
         if not private:
             first_submission = successful_submissions.iloc[0]
             if isinstance(first_submission["public_score"], dict):

competitions/templates/index.html

@@ -135,7 +135,7 @@
                         const contentDiv = document.getElementById('content');
                         // console.log(data.response.submissions);
                         // contentDiv.innerHTML = marked.parse(data.response.submission_text) + data.response.submissions;
-                        if (data.response.submissions && data.response.submissions.length > 0) {
+                        if (data.response.submissions && data.response.submissions.length > 0 && data.response.error.length == 0) {
                             // Start building the table HTML
                             let tableHTML = '<table border="1"><tr><th>Datetime</th><th>Submission ID</th><th>Public Score</th><th>Submission Comment</th><th>Selected</th><th>Status</th></tr>';
 
@@ -160,7 +160,7 @@
                             });
                         } else {
                             // Display message if there are no submissions
-                            contentDiv.innerHTML = marked.parse(data.response.submission_text) + 'You have not made any submissions yet.';
+                            contentDiv.innerHTML = marked.parse(data.response.submission_text) + marked.parse(data.response.error);
                         }
                         articleLoadingSpinner.classList.add('hidden');
                     })