Fixed submissions loading for data wizard

UvA-FNWI · Sep 19, 2024 · 93005be · 93005be
1 parent a9fd8f1
commit 93005be
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 51 deletions.
diff --git a/IguideME.Web/Controllers/Apps/TileController.cs b/IguideME.Web/Controllers/Apps/TileController.cs
@@ -534,26 +534,26 @@ public ActionResult GetUserDiscussionEntries(string userID)
 		}
 
 
-		// [Authorize]
-		// [HttpGet]
-		// [Route("/tiles/{tileID}/submissions")]
-		// [ProducesResponseType(StatusCodes.Status204NoContent)]
-		// [ProducesResponseType(StatusCodes.Status400BadRequest)]
-		// [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-		// public ActionResult GetTileSubmissions(string tileID)
-		// {
-		//     // Only instructors may view submissions of other students
-		//     if (!this.IsAdministrator())
-		//         return Unauthorized();
+		[Authorize]
+		[HttpGet]
+		[Route("/tiles/{tileID}/submissions")]
+		[ProducesResponseType(StatusCodes.Status204NoContent)]
+		[ProducesResponseType(StatusCodes.Status400BadRequest)]
+		[ProducesResponseType(StatusCodes.Status401Unauthorized)]
+		public ActionResult GetTileSubmissions(string tileID)
+		{
+			// Only instructors may view submissions of other students
+			if (!this.IsAdministrator())
+				return Unauthorized();
 
-		//     bool success = int.TryParse(tileID, out int id);
+			if (int.TryParse(tileID, out int id))
+			{
+				return Ok(_databaseManager.GetTileSubmissions(this.GetCourseID(), id));
+			}
+
+			return BadRequest();
 
-		//     return success
-		//         ? Json(
-		//             _databaseManager.GetTileSubmissions(
-		//                 this.GetCourseID(), id))
-		//         : BadRequest();
-		// }
+		}
 
 		// [Authorize]
 		// [HttpGet]
@@ -759,26 +759,6 @@ public ActionResult UploadTileData(int tileID, JObject data)
 			return NoContent();
 		}
 
-		// [Authorize(Policy = "IsInstructor")]
-		// [HttpGet]
-		// // DBrefTODO: The entry Id should be changed into assignmentID
-		// // [Route("/entries/{entryID}/submissions")]
-		// [Route("/entries/{assignmentID}/submissions")]
-		// [ProducesResponseType(StatusCodes.Status204NoContent)]
-		// [ProducesResponseType(StatusCodes.Status400BadRequest)]
-		// [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-		// public ActionResult GetEntrySubmissions(string assignmentID)
-		// {
-		//     // TODO: check userID?
-		//     bool success = int.TryParse(assignmentID, out int entry_id);
-
-		//     return success
-		//         ? Json(
-		//             _databaseManager.GetAssignmentSubmissions(
-		//                 this.GetCourseID(), entry_id))
-		//         : BadRequest();
-		// }
-
 		// [Authorize]
 		// [HttpGet]
 		// [Route("/tiles/Grade-summary/{userID}")]

diff --git a/IguideME.Web/Frontend/src/api/tiles.ts b/IguideME.Web/Frontend/src/api/tiles.ts
@@ -78,16 +78,8 @@ export async function uploadData({
     .then((response) => response.data);
 }
 
-export async function getTileSubmissions({
-  tileId,
-  userID,
-}: {
-  tileId: number;
-  userID?: string;
-}): Promise<Submission[]> {
-  return await apiClient
-    .get(userID ? `tiles/${tileId}/submissions/${userID}` : `tiles/${tileId}/submissions`)
-    .then((response) => response.data);
+export async function getTileSubmissions({ tileId }: { tileId: number }): Promise<Submission[]> {
+  return await apiClient.get(`tiles/${tileId}/submissions`).then((response) => response.data);
 }
 
 export async function AddDataWizardTile({ tileId, groupId }: { tileId: number; groupId: number }): Promise<void> {

diff --git a/IguideME.Web/Services/Constants/DatabaseQueries.cs b/IguideME.Web/Services/Constants/DatabaseQueries.cs
@@ -1453,7 +1453,6 @@ INNER JOIN  `assignments`
         INNER JOIN  `tile_entries`
             ON      `submissions`.`assignment_id` = `tile_entries`.`content_id`
         WHERE       `tile_entries`.`tile_id`=@tileID
-        AND         `submissions`.`user_id`=@userID
         ;";
 
     public const string QUERY_ALL_USER_SUBMISSIONS_FOR_TILE =

diff --git a/IguideME.Web/Services/DatabaseManager.cs b/IguideME.Web/Services/DatabaseManager.cs
@@ -1906,6 +1906,37 @@ public List<AssignmentSubmission> GetTileSubmissionsForUser(
                 }
             }
 
+            return submissions;
+        }
+
+        public List<AssignmentSubmission> GetTileSubmissions(
+            int tileID,
+            long syncID = 0
+        )
+        {
+            List<AssignmentSubmission> submissions = new();
+
+            using (
+                SQLiteDataReader r1 = Query(
+                    DatabaseQueries.QUERY_TILE_SUBMISSIONS_FOR_STUDENT,
+                    new SQLiteParameter("tileID", tileID)
+                )
+            )
+            {
+                while (r1.Read())
+                {
+                    AssignmentSubmission submission =
+                        new(
+                            r1.GetInt32(0),
+                            r1.GetInt32(1),
+                            r1.GetValue(2).ToString(),
+                            r1.GetDouble(3),
+                            r1.GetInt32(4)
+                        );
+                    submissions.Add(submission);
+                }
+            }
+
             return submissions;
         }
 

diff --git a/charts/iguideme/Chart.yaml b/charts/iguideme/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: iguideme
 description: IguideME
 type: application
-version: 0.3.217
-appVersion: "0.3.217"
+version: 0.3.218
+appVersion: "0.3.218"