Skip to content

Manage submissions page shows progress for regrading selected submissions #2278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Manage submissions page shows progress for regrading selected submissions #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3943177
basic regrade stuff done
coder6583 Mar 10, 2025
89380f2
lint
coder6583 Mar 10, 2025
62b239f
lint
coder6583 Mar 10, 2025
f8d4764
made the feature always active
coder6583 Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/stylesheets/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ $autolab-selected-gray: #f5f5f5;
$autolab-border-gray: #f4f1f1;
$autolab-gray-text: #676464;
$autolab-highlight-comments: #008000;
$autolab-yellow: #f7e788;
10 changes: 10 additions & 0 deletions app/assets/stylesheets/style.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,4 +1717,14 @@ table.sub td, th {
margin-left: 5px;
margin-top: 5px;
color: $autolab-grey;
}

.regrade-refresh {
color: $autolab-gray-text;
background-color: rgba($autolab-yellow, 0.3);
border: 1px solid $autolab-yellow;
border-left: 5px solid $autolab-yellow;
padding: 10px;
border-radius: 3px;
font-weight: 500;
}
6 changes: 0 additions & 6 deletions app/controllers/assessment/autograde.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,6 @@ def regradeBatch
end
end

success_jobs = submissions.size - failure_jobs
if success_jobs > 0
link = "<a href=\"#{url_for(controller: 'jobs')}\">#{ActionController::Base.helpers.pluralize(success_jobs, "submission")}</a>"
flash[:success] = ("Regrading #{link}")
end

# For both :success and :error
flash[:html_safe] = true

Expand Down
20 changes: 20 additions & 0 deletions app/controllers/submissions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,32 @@ def index
.order("created_at DESC")
@autograded = @assessment.has_autograder?

grading_jobs = []
@grading_submissions = []

raw_live_jobs = []
begin
raw_live_jobs = TangoClient.jobs
rescue TangoClient::TangoException => e
flash.now[:error] = "Error while getting job list: #{e.message}"
end

raw_live_jobs.each do |job|
grading_jobs.push(job["id"])
end

@submissions_to_cud = {}
@submissions.each do |submission|
currSubId = submission.id
currCud = submission.course_user_datum_id
@submissions_to_cud[currSubId] = currCud
if grading_jobs.include?(submission.jobid)
@grading_submissions.push(submission.id)
end
end

@grading = !@grading_submissions.empty?

@submissions_to_cud = @submissions_to_cud.to_json
@excused_cids = []
excused_students = AssessmentUserDatum.where(
Expand Down
32 changes: 24 additions & 8 deletions app/views/submissions/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@
<%= javascript_include_tag "manage_submissions" %>
<% end %>

<% if @grading %>
<div class="regrade-refresh">
Currently grading <%= ActionController::Base.helpers.pluralize(@grading_submissions.count, "submission") %>.
View detailed progress
<%= link_to "here", url_for(controller: 'jobs') %>. To update scores,
<%= link_to "refresh", url_for([@course, @assessment, :submissions]) %>.
</div>
<% end %>

<h3>Manage Submissions</h3>
<hr>

Expand Down Expand Up @@ -194,15 +203,22 @@
<%# Score %>
<td class="submissions-td">
<div class="submissions-score-align">
<div class="score-num"><%= computed_score { submission.final_score(@cud) } %></div>
<div class="score-icon">
<a class="modal-trigger score-details"
data-email="<%= submission.course_user_datum.email %>"
data-cuid=" <%= submission.course_user_datum.id %>">
<i class="material-icons submissions-score-icon">zoom_in</i>
</a>
<% if @grading_submissions.include?(submission.id) then %>
<div class="score-icon">
<%= link_to "<i class='tiny material-icons'>access_time</i>".html_safe,
{ controller: "jobs", action: "getjob", id: submission.jobid } %>
</div>
</div>
<% else %>
<div class="score-num"><%= computed_score { submission.final_score(@cud) } %></div>
<div class="score-icon">
<a class="modal-trigger score-details"
data-email="<%= submission.course_user_datum.email %>"
data-cuid=" <%= submission.course_user_datum.id %>">
<i class="material-icons submissions-score-icon">zoom_in</i>
</a>
</div>
</div>
<% end %>
</td>

<%# Submission Date %>
Expand Down