From 88c40e4d20dc49d3f6e0382012306d90af069e2d Mon Sep 17 00:00:00 2001 From: Kester Date: Mon, 17 Feb 2025 19:12:53 -0500 Subject: [PATCH] Added link for score details and regrade flash error --- app/assets/javascripts/manage_submissions.js | 13 +++++++++---- app/controllers/assessment/autograde.rb | 9 +++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/manage_submissions.js b/app/assets/javascripts/manage_submissions.js index 04d8d36dd..70aee4672 100644 --- a/app/assets/javascripts/manage_submissions.js +++ b/app/assets/javascripts/manage_submissions.js @@ -158,9 +158,15 @@ $(document).ready(function() { ${submission.total} ${submission.problems. - map((problem) => - `${data.scores[submission.id]?.[problem.id]?.['score'] ?? "-"}` - ).join('')} + map((problem) => + ` + ${data.scores[submission.id]?.[problem.id]?.['score'] !== undefined + ? ` + ${data.scores[submission.id][problem.id]['score'].toFixed(1)} + ` + : "-"} + ` + ).join('')} ${submission.late_penalty} @@ -280,7 +286,6 @@ $(document).ready(function() { changeButtonStates(!selectedSubmissions.length); // update button states } - // SELECTED BUTTONS // create selected buttons inside datatable wrapper diff --git a/app/controllers/assessment/autograde.rb b/app/controllers/assessment/autograde.rb index b799ecd9c..5a00a5214 100644 --- a/app/controllers/assessment/autograde.rb +++ b/app/controllers/assessment/autograde.rb @@ -90,7 +90,9 @@ def regradeBatch # Now regrade only the most recent submissions. Keep track of # any handins that fail. - submissions = submission_ids.map {|sid| @assessment.submissions.find_by_id(sid)} + submissions = submission_ids.filter_map do |sid| + _is_i?(sid) ? @assessment.submissions.find_by_id(sid) : nil + end begin failed_list = sendJob_batch(@course, @assessment, submissions, @cud) @@ -114,7 +116,7 @@ def regradeBatch end end - success_jobs = submission_ids.size - failure_jobs + success_jobs = submissions.size - failure_jobs if success_jobs > 0 link = "#{ActionController::Base.helpers.pluralize(success_jobs, "submission")}" flash[:success] = ("Regrading #{link}") @@ -230,4 +232,7 @@ def sendJob_AddHTMLMessages(course, assessment, submissions) job end + def _is_i?(string) + !!(string =~ /\A[-+]?[0-9]+\z/) + end end