Add submission deadline to exercises and allow teachers to view their submissions
This commit is contained in:
@ -15,11 +15,22 @@ class Submission < ApplicationRecord
|
||||
has_many :structured_errors
|
||||
has_many :comments, through: :files
|
||||
|
||||
belongs_to :external_users, -> { where(submissions: {user_type: 'ExternalUser'}).includes(:submissions) }, foreign_key: :user_id, class_name: 'ExternalUser', optional: true
|
||||
belongs_to :internal_users, -> { where(submissions: {user_type: 'InternalUser'}).includes(:submissions) }, foreign_key: :user_id, class_name: 'InternalUser', optional: true
|
||||
|
||||
delegate :execution_environment, to: :exercise
|
||||
|
||||
scope :final, -> { where(cause: 'submit') }
|
||||
scope :intermediate, -> { where.not(cause: 'submit') }
|
||||
|
||||
scope :before_deadline, -> { joins(:exercise).where('submissions.updated_at <= exercises.submission_deadline OR exercises.submission_deadline IS NULL') }
|
||||
scope :within_grace_period, -> { joins(:exercise).where('(submissions.updated_at > exercises.submission_deadline) AND (submissions.updated_at <= exercises.late_submission_deadline OR exercises.late_submission_deadline IS NULL)') }
|
||||
scope :after_late_deadline, -> { joins(:exercise).where('submissions.updated_at > exercises.late_submission_deadline') }
|
||||
|
||||
scope :latest, -> { order(updated_at: :desc).limit(1) }
|
||||
|
||||
scope :in_study_group_of, ->(user) { where(study_group_id: user.study_groups) unless user.admin? }
|
||||
|
||||
validates :cause, inclusion: {in: CAUSES}
|
||||
validates :exercise_id, presence: true
|
||||
|
||||
@ -29,6 +40,7 @@ class Submission < ApplicationRecord
|
||||
def build_files_hash(files, attribute)
|
||||
files.map(&attribute.to_proc).zip(files).to_h
|
||||
end
|
||||
|
||||
private :build_files_hash
|
||||
|
||||
def collect_files
|
||||
@ -42,7 +54,7 @@ class Submission < ApplicationRecord
|
||||
end
|
||||
|
||||
def normalized_score
|
||||
::NewRelic::Agent.add_custom_attributes({ unnormalized_score: score })
|
||||
::NewRelic::Agent.add_custom_attributes({unnormalized_score: score})
|
||||
if !score.nil? && !exercise.maximum_score.nil? && (exercise.maximum_score > 0)
|
||||
score / exercise.maximum_score
|
||||
else
|
||||
@ -62,6 +74,32 @@ class Submission < ApplicationRecord
|
||||
Submission.model_name.human
|
||||
end
|
||||
|
||||
def before_deadline?
|
||||
if exercise.submission_deadline.present?
|
||||
updated_at <= exercise.submission_deadline
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
def within_grace_period?
|
||||
if exercise.submission_deadline.present? && exercise.late_submission_deadline.present?
|
||||
updated_at > exercise.submission_deadline && updated_at <= exercise.late_submission_deadline
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
def after_late_deadline?
|
||||
if exercise.late_submission_deadline.present?
|
||||
updated_at > exercise.late_submission_deadline
|
||||
elsif exercise.submission_deadline.present?
|
||||
updated_at > exercise.submission_deadline
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
def redirect_to_feedback?
|
||||
((user_id + exercise.created_at.to_i) % 10 == 1) && exercise.needs_more_feedback?
|
||||
end
|
||||
@ -71,6 +109,6 @@ class Submission < ApplicationRecord
|
||||
end
|
||||
|
||||
def unsolved_rfc
|
||||
RequestForComment.unsolved.where(exercise_id: exercise).where.not(question: nil).where(created_at: OLDEST_RFC_TO_SHOW.ago..Time.current).order("RANDOM()").find { | rfc_element |( (rfc_element.comments_count < MAX_COMMENTS_ON_RECOMMENDED_RFC) && (!rfc_element.question.empty?)) }
|
||||
RequestForComment.unsolved.where(exercise_id: exercise).where.not(question: nil).where(created_at: OLDEST_RFC_TO_SHOW.ago..Time.current).order("RANDOM()").find { |rfc_element| ((rfc_element.comments_count < MAX_COMMENTS_ON_RECOMMENDED_RFC) && (!rfc_element.question.empty?)) }
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user