--- loncom/interface/lonnavmaps.pm	2025/05/26 19:55:09	1.574
+++ loncom/interface/lonnavmaps.pm	2025/06/28 17:34:00	1.577
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.574 2025/05/26 19:55:09 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.577 2025/06/28 17:34:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -425,6 +425,11 @@ Convenience function, so others can use
 Convenience function, so others can use it: Is there only one try remaining for the
 part, with more than one try to begin with, not due yet and still can be done?
 
+=item graceEndsUnder24Hours()
+
+Convenience function, so others can use it: Is the problem past-due with a grace period
+which ends in less than 24 hours, and still can be done?
+
 =item advancedUser()
 
 This puts a human-readable name on the env variable.
@@ -637,6 +642,7 @@ sub getDescription {
 
     my $open = $res->opendate($part);
     my $due = $res->duedate($part);
+    my $overdue = $res->overduedate($part);
     my $answer = $res->answerdate($part);
 
     if ($status == $res->NETWORK_FAILURE) { 
@@ -690,11 +696,20 @@ sub getDescription {
     }
     if ($status == $res->OPEN) {
         if ($due) {
-	    if ($res->is_practice()) {
-		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part)).$slotinfo;
-	    } else {
-		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)).$slotinfo;
-	    }
+            my $now = time;
+            if (($now >= $due) && ($overdue) && ($now < $overdue)) {
+                if ($res->is_practice()) {
+                    return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($overdue,'start'),$res->symb(),'duedate',$part)).$slotinfo;
+                } else {
+                    return &mt("Grace period ends [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($overdue,'end'),$res->symb(),'grace',$part)).$slotinfo;
+                }
+            } else {
+                if ($res->is_practice()) {
+                    return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part)).$slotinfo;
+                } else {
+                    return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)).$slotinfo;
+                }
+            }
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
         }
@@ -749,8 +764,14 @@ sub getDescription {
             }
         }
         if ($due) {
-            return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)) .
-                " $triesString";
+            my $now = time;
+            if (($now >= $due) && ($overdue) && ($now < $overdue)) {
+                return &mt("Grace period ends [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($overdue,'end'),$res->symb(),'grace',$part)).
+		       " $triesString";
+            } else {
+                return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)) .
+                       " $triesString";
+            }
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
         }
@@ -784,6 +805,19 @@ sub lastTry {
         $res->duedate($part) > time();
 }
 
+sub graceEndsUnder24Hours {
+    my $res = shift;
+    my $part = shift;
+    my $status = $res->status($part);
+    my $now = time();
+
+    return ($status == $res->OPEN() ||
+            $status == $res->TRIES_LEFT()) &&
+            $res->duedate($part) && $res->duedate($part) < $now &&
+            $res->overduedate($part) && $res->overduedate($part) < time()+(24*60*60) &&
+            $res->duedate($part) && $res->duedate($part) < $now+(24*60*60) &&
+            $res->overduedate($part) > $now;
+}
 
 sub advancedUser {
     return $env{'request.role.adv'};
@@ -1254,6 +1288,9 @@ sub render_long_status {
         if (dueInLessThan24Hours($resource, $part)) {
             $color = $hurryUpColor;
             $info = ' title="'.&mt('Due in less than 24 hours!').'"';
+        } elsif (graceEndsUnder24Hours($resource, $part)) {
+            $color = $hurryUpColor;
+            $info = ' title="'.&mt('Grace period ends in less than 24 hours!').'"';
         } elsif (lastTry($resource, $part)) {
             unless (($resource->problemstatus($part) eq 'no') ||
                     ($resource->problemstatus($part) eq 'no_feedback_ever')) {
@@ -1380,13 +1417,17 @@ sub cmp_title {
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
-    my $result = '';
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
         # no columns, no nav maps.
         return '';
     }
+    my $legend = '';
+    my $tools = '';
+    my $result = '';
+    my $tools_printed = 0;
+    my $tablestarted = 0;
     my $navmap;
     if (defined($args->{'navmap'})) {
         $navmap = $args->{'navmap'};
@@ -1604,15 +1645,15 @@ sub render {
     # Print key?
     if ($printKey) {
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonMisc");
-        $result .= '<div class="LC_navtools">'."\n".
-                   '<span class="LC_middle LC_right">'.&mt('Key').':</span>'.
-                   '<span class="LC_middle LC_center">&nbsp;&nbsp;'.
-                   '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Unread Discussion').
-                   '&nbsp;&nbsp;'.
-                   '<img src="'.$location.'/feedback.gif" alt="" /> '.
-                   &mt('New message (click to open)').
-                   '</span></div>'.
-                   '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+        $legend = '<div class="LC_navtools">'."\n".
+                  '<span class="LC_middle LC_right">'.&mt('Key').':</span>'.
+                  '<span class="LC_middle LC_center">&nbsp;&nbsp;'.
+                  '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Unread Discussion').
+                  '&nbsp;&nbsp;'.
+                  '<img src="'.$location.'/feedback.gif" alt="" /> '.
+                  &mt('New message (click to open)').
+                  '</span></div>'.
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
     }
 
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
@@ -1632,9 +1673,9 @@ sub render {
                               "location.href='$link'",$text);
             }
 	} else {
-	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
+	    $tools = '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
-        $result .= "\n";
+        $tools .= "\n";
     }
 
     # Check for any unread discussions in all resources.
@@ -1646,7 +1687,7 @@ sub render {
 	my $time=time;
         my $submit = &mt($markread);
         my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
-	$result .= (<<END);
+	$tools .= (<<END);
     <form name="clearbubbles" method="post" action="/adm/feedback" aria-hidden="true">
 	<input type="hidden" name="navurl" value="$querystr" />
 	<input type="hidden" name="navtime" value="$time" />
@@ -1663,12 +1704,12 @@ END
 	    }
 	    if ($totdisc > 0) {
 		$haveDisc =~ s/:$//;
-		$result .= (<<END);
+		$tools .= (<<END);
 	<input type="hidden" name="navmaps" value="$haveDisc" />
 END
             }
 	}
-	$result .= <<END;
+	$tools .= <<END;
         <input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
     </form>
 END
@@ -1693,31 +1734,15 @@ END
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
-        $result .= &show_linkitems_toolbar($args,$condition);
+        $tools .= &show_linkitems_toolbar($args,$condition);
     } elsif ($args->{'sort_html'}) { 
-        $result.=$args->{'sort_html'}; 
+        $tools .= $args->{'sort_html'}; 
     }
 
-    #$result .= "<br />\n";
-    if ($r) {
-        $r->print($result);
-        $r->rflush();
-        $result = "";
-    }
+    #$tools .= "<br />\n";
     # End parameter setting
-    
-    $result .= "<br />\n";
 
     # Data
-    if ($counter) {
-        $result.=&Apache::loncommon::start_data_table("LC_tableOfContent").
-                 &Apache::loncommon::start_data_table_header_row('LC_visually_hidden').
-                 '<th>'.&mt('Resource or Folder').'</th>'.
-                 '<th>'.&mt('Alerts').'</th>'.
-                 '<th>'.&mt('Status Icon').'</th>'.
-                 '<th>'.&mt('Date/Completion Status').'</th>'.
-                 &Apache::loncommon::end_data_table_row()."\n";
-    }
 
     my $res = "Apache::lonnavmaps::resource";
     my %condenseStatuses =
@@ -1956,6 +1981,16 @@ END
         }
 
         $args->{'counter'}++;
+        unless ($tablestarted) {
+            $result.=&Apache::loncommon::start_data_table("LC_tableOfContent").
+                     &Apache::loncommon::start_data_table_header_row('LC_visually_hidden').
+                     '<th>'.&mt('Resource or Folder').'</th>'.
+                     '<th>'.&mt('Alerts').'</th>'.
+                     '<th>'.&mt('Status Icon').'</th>'.
+                     '<th>'.&mt('Date/Completion Status').'</th>'.
+                     &Apache::loncommon::end_data_table_row()."\n";
+                     $tablestarted = 1;
+        }
 
         # Does it have multiple parts?
         $args->{'multipart'} = 0;
@@ -2106,6 +2141,12 @@ END
         }
 
         if ($r && $rownum % 20 == 0) {
+            unless ($tools_printed) {
+                $r->print($legend.$tools);
+                $legend = "";
+                $tools = "";
+                $tools_printed = 1;
+            }
             $r->print($result);
             $result = "";
             $r->rflush();
@@ -2121,8 +2162,8 @@ END
 	}
     }
 
-    if ($counter) {
-        $result.=&Apache::loncommon::end_data_table();
+    if ($tablestarted) {
+        $result .= &Apache::loncommon::end_data_table();
     }
     
     # Print out the part that jumps to #curloc if it exists
@@ -2141,12 +2182,23 @@ if (location.href.indexOf('#curloc')==-1
     }
 
     if ($r) {
+        unless ($tools_printed) {
+            if (($args->{'counter'}) || ($userCanSeeHidden) ||
+                (($args->{'caller'} eq 'navmapsdisplay') &&
+                 ($env{'form.showOnlyHomework'} ||
+                  $ENV{QUERY_STRING} =~ /^jumpToFirstHomework/))) {
+                $r->print($legend.$tools);
+            }
+            $legend = "";
+            $tools = "";
+            $tools_printed = 1;
+        }
         $r->print($result);
         $result = "";
         $r->rflush();
     }
         
-    return $result;
+    return $legend.$tools.$result;
 }
 
 sub add_linkitem {
@@ -5162,6 +5214,12 @@ sub awarded {
     if (!defined($part)) { $part = '0'; }
     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}->{'resource.'.$part.'.awarded'};
 }
+sub latefrac {
+    my $self = shift; my $part = shift;
+    $self->{NAV_MAP}->get_user_data();
+    if (!defined($part)) { $part = '0'; }
+    return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}->{'resource.'.$part.'.latefrac'};
+}
 sub taskversion {
     my $self = shift; my $part = shift;
     $self->{NAV_MAP}->get_user_data();
@@ -5251,6 +5309,71 @@ sub opendate {
     }
     return $opendate;
 }
+sub overduedate {
+    my ($self,$part) = @_;
+    my $duedate = $self->parmval("duedate", $part);
+    my $overduedate;
+    if ($duedate) {
+        my $grace = $self->parmval("grace", $part);
+        if ($grace) {
+            my $grace_end = (split(/,/,$grace))[-1];
+            my ($offset) = split(/:/,$grace_end,2);
+            if ($offset > 0) {
+                $overduedate = $offset + $duedate;
+            }
+        }
+    }
+    return $overduedate;
+}
+sub partial_credit_overdue {
+    my ($self,$part) = @_;
+    my $reduction;
+    my $duedate = $self->parmval("duedate", $part);
+    if ($duedate) {
+        my $grace = $self->parmval("grace",$part);
+        if ($grace) {
+            my $lateness = time - $duedate;
+            if ($lateness > 0) {
+                my ($start,$end,$startfrac,$endfrac,$usegrad);
+                $start = 0;
+                $startfrac = 1.0;
+                $usegrad = 0;
+                foreach my $item (split(/,/,$grace)) {
+                    my ($offset,$frac,$grad) = split(/:/,$item);
+                    if ($lateness > $offset) {
+                        $start = $offset;
+                        $startfrac = $frac;
+                        next;
+                    } elsif ($lateness <= $offset) {
+                        $end = $offset;
+                        $endfrac = $frac;
+                        $usegrad = $grad;
+                        last;
+                    }
+                }
+                if ($end) {
+                    if (($end == $start) || ($startfrac == $endfrac)) {
+                        $reduction = $endfrac;
+                    } elsif ($end - $start > 0) {
+                        if (($endfrac <= 1.0) && ($endfrac >= 0)) {
+                            $reduction = $endfrac;
+                            if ($usegrad) {
+                                my $decline = $startfrac - $endfrac;
+                                my $fraction = ($lateness - $start)/($end - $start);
+                                if (($fraction <= 1) && ($fraction >= 0)) {
+                                    my $value = $startfrac - ($decline*$fraction);
+                                    $reduction = sprintf("%.2f", $value);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return $reduction;
+}
+
 sub problemstatus {
     (my $self, my $part) = @_;
     my $problemstatus = $self->parmval("problemstatus", $part);
@@ -5829,6 +5952,7 @@ sub getDateStatus {
 
     my $open = $self->opendate($part);
     my $due = $self->duedate($part);
+    my $overdue = $self->overduedate($part);
     my $answer = $self->answerdate($part);
 
     if (!$open && !$due && !$answer) {
@@ -5838,6 +5962,7 @@ sub getDateStatus {
     }
     if (!$open || $now < $open) {return $self->OPEN_LATER}
     if (!$due || $now < $due) {return $self->OPEN}
+    if ($overdue && $now < $overdue) {return $self->OPEN}
     if ($answer && $now < $answer) {return $self->PAST_DUE_ANSWER_LATER}
     if ($answer) { return $self->ANSWER_OPEN; }
     return PAST_DUE_NO_ANSWER;
@@ -6106,6 +6231,7 @@ sub status {
     # If there's an answer date and we're past it, don't
     # suppress the feedback; student should know
     if ($self->duedate($part) && $self->duedate($part) < time() &&
+        (!$self->overduedate($part) || $self->overduedate($part) < time()) &&
 	$self->answerdate($part) && $self->answerdate($part) < time()) {
 	$suppressFeedback = 0;
     }