Skip to content

Commit 679de7b

Browse files
committed
Consider remote causes in all remaining places
1 parent 32f72cc commit 679de7b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

app/assets/javascripts/exercise_graphs.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ $(document).on('turbolinks:load', function() {
2929
maximumValue = submission.score;
3030
}
3131

32-
if(submission.cause == "assess"){
32+
if(submission.cause === "assess" || submission.cause === "remoteAssess"){
3333
submissionsScoreAndTimeAssess.push(submissionArray);
34-
} else if(submission.cause == "submit"){
34+
} else if(submission.cause === "submit" || submission.cause === "remoteSubmit"){
3535
submissionsScoreAndTimeSubmits.push(submissionArray);
36-
} else if(submission.cause == "run"){
36+
} else if(submission.cause === "run"){
3737
submissionsScoreAndTimeRuns.push(submissionArray[1]);
38-
} else if(submission.cause == "autosave"){
38+
} else if(submission.cause === "autosave"){
3939
submissionsAutosaves.push(submissionArray[1]);
40-
} else if(submission.cause == "save"){
40+
} else if(submission.cause === "save"){
4141
submissionsSaves.push(submissionArray[1]);
4242
}
4343
}
@@ -120,10 +120,10 @@ $(document).on('turbolinks:load', function() {
120120
var largestSubmittedTimeStamp = submissions[submissions_length-1];
121121
var largestArrayForRange;
122122

123-
if(largestSubmittedTimeStamp.cause === "assess"){
123+
if(largestSubmittedTimeStamp.cause === "assess" || largestSubmittedTimeStamp.cause === "remoteAssess"){
124124
largestArrayForRange = submissionsScoreAndTimeAssess;
125125
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true);
126-
} else if(largestSubmittedTimeStamp.cause === "submit"){
126+
} else if(largestSubmittedTimeStamp.cause === "submit" || largestSubmittedTimeStamp.cause === "remoteSubmit"){
127127
largestArrayForRange = submissionsScoreAndTimeSubmits;
128128
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true);
129129
} else if(largestSubmittedTimeStamp.cause === "run"){

app/models/exercise.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Exercise < ApplicationRecord
5252
MAX_GROUP_EXERCISE_FEEDBACKS = 20
5353

5454
def average_percentage(base = submissions)
55-
if average_score(base) && (maximum_score.to_d != BigDecimal('0.0')) && base.exists?(cause: 'submit')
55+
if average_score(base) && (maximum_score.to_d != BigDecimal('0.0')) && base.exists?(cause: %w[submit assess remoteSubmit remoteAssess])
5656
(average_score(base) / maximum_score * 100).round(2)
5757
else
5858
0
@@ -84,7 +84,7 @@ def contributors
8484

8585
def time_maximum_score(contributor)
8686
submissions
87-
.where(contributor:, cause: %w[submit assess])
87+
.where(contributor:, cause: %w[submit assess remoteSubmit remoteAssess])
8888
.where.not(score: nil)
8989
.order(score: :desc, created_at: :asc)
9090
.first&.created_at || Time.zone.at(0)
@@ -528,7 +528,7 @@ def generate_token
528528
def maximum_score(contributor = nil)
529529
if contributor
530530
submissions
531-
.where(contributor:, cause: %w[submit assess])
531+
.where(contributor:, cause: %w[submit assess remoteSubmit remoteAssess])
532532
.where.not(score: nil)
533533
.order(score: :desc)
534534
.first&.score || 0

app/models/proxy_exercise.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def get_matching_exercise(user)
7878
end
7979

8080
def find_matching_exercise(user)
81-
exercises_user_has_accessed = user.submissions.where("cause IN ('submit','assess')").map(&:exercise).uniq.compact
81+
exercises_user_has_accessed = user.submissions.where(cause: %w[submit assess remoteSubmit remoteAssess]).map(&:exercise).uniq.compact
8282
tags_user_has_seen = exercises_user_has_accessed.map(&:tags).uniq.flatten
8383
Rails.logger.debug { "exercises_user_has_accessed #{exercises_user_has_accessed.map(&:id).join(',')}" }
8484

app/models/submission.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Submission < ApplicationRecord
3232
delegate :execution_environment, to: :exercise
3333

3434
scope :final, -> { where(cause: %w[submit remoteSubmit]) }
35-
scope :intermediate, -> { where.not(cause: 'submit') }
35+
scope :intermediate, -> { where.not(cause: %w[submit remoteSubmit]) }
3636

3737
scope :before_deadline, lambda {
3838
joins(:exercise).where('submissions.updated_at <= exercises.submission_deadline OR exercises.submission_deadline IS NULL')

0 commit comments

Comments
 (0)