Skip to content

+ (LMS) Fixed on-time LMS activity submissions being incorrectly marked as late when a facilitator grades after the due date. (Fixes #6710) #6711

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
jonedmiston wants to merge 1 commit into
base: develop
Choose a base branch
from
+15 −4
Open

+ (LMS) Fixed on-time LMS activity submissions being incorrectly marked as late when a facilitator grades after the due date. (Fixes #6710) #6711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions Rock/Model/LMS/LearningClassActivityCompletion/LearningClassActivityCompletion.SaveHook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,22 @@ protected override void PreSave()
{
base.PreSave();

// Ensure the WasCompletedOnTime property stays current
// when changes are made to the DueDate of the Completion.
if ( Entity.IsStudentCompleted || Entity.IsFacilitatorCompleted )
// Only recalculate WasCompletedOnTime when the student first submits the activity
// (IsStudentCompleted transitions from false to true) or when the DueDate changes
// for an already-completed activity. This prevents facilitator grading or other
// saves that occur after the due date from incorrectly overwriting an on-time
// submission as late.
var originalIsStudentCompleted = ( this.Entry.OriginalValues?["IsStudentCompleted"] as bool? ).GetValueOrDefault();
var originalDueDate = ( DateTime? ) this.Entry.OriginalValues?["DueDate"];

var isStudentCompletingNow = !originalIsStudentCompleted && Entity.IsStudentCompleted;
var isDueDateChangedForCompletedActivity = Entity.IsStudentCompleted && Entity.DueDate != originalDueDate;

if ( isStudentCompletingNow || isDueDateChangedForCompletedActivity )
{
Entity.WasCompletedOnTime = Entity.DueDate >= RockDateTime.Now;
// Use date-only comparison since DueDate is stored without a time component.
// A submission on the due date should always be considered on time.
Entity.WasCompletedOnTime = !Entity.DueDate.HasValue || Entity.DueDate.Value.Date >= RockDateTime.Today.Date;
}

SetWasRegraded();
Expand Down