[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm /interface lonnavmaps.pm

[raeburn]

raeburn		Wed Aug 13 00:12:12 2025 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Bug 6623. Grace Period parameter will not apply if interval (time-limit)
    parameter is in effect.
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.396 loncom/homework/lonhomework.pm:1.397
--- loncom/homework/lonhomework.pm:1.396	Mon Aug 11 23:33:41 2025
+++ loncom/homework/lonhomework.pm	Wed Aug 13 00:12:11 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.396 2025/08/11 23:33:41 raeburn Exp $
+# $Id: lonhomework.pm,v 1.397 2025/08/13 00:12:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -745,9 +745,10 @@
     my $duedate= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
                                        $udom,$uname);
     if ($duedate ne '') {
+        my @interval = &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
         my $grace = &Apache::lonnet::EXT("resource.$part_id.grace",$symb,
                                          $udom,$uname);
-        if ($grace) {
+        if (($grace) && ($interval[0] !~ /^\d+/)) {
             my $grace_end = (split(/,/,$grace))[-1];
             my ($offset) = split(/:/,$grace_end,2);
             if ($offset > 0) {
@@ -764,9 +765,10 @@
     my $duedate = &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
                                        $udom,$uname);
     if ($duedate) {
+        my @interval = &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
         my $grace = &Apache::lonnet::EXT("resource.$part_id.grace",$symb,
                                          $udom,$uname); 
-        if ($grace) {
+        if (($grace) && ($interval[0] !~ /^\d+/)) {
             my $lateness = time - $duedate;
             if ($lateness > 0) {
                 my ($start,$end,$startfrac,$endfrac,$usegrad);
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.579 loncom/interface/lonnavmaps.pm:1.580
--- loncom/interface/lonnavmaps.pm:1.579	Fri Aug  8 16:46:12 2025
+++ loncom/interface/lonnavmaps.pm	Wed Aug 13 00:12:12 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.579 2025/08/08 16:46:12 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.580 2025/08/13 00:12:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5315,8 +5315,9 @@
     my $duedate = $self->parmval("duedate", $part);
     my $overduedate;
     if ($duedate) {
+        my @interval = $self->parmval("interval", $part);
         my $grace = $self->parmval("grace", $part);
-        if ($grace) {
+        if (($grace) && ($interval[0] !~ /^\d+/)) {
             my $grace_end = (split(/,/,$grace))[-1];
             my ($offset) = split(/:/,$grace_end,2);
             if ($offset > 0) {
@@ -5331,8 +5332,9 @@
     my $reduction;
     my $duedate = $self->parmval("duedate", $part);
     if ($duedate) {
+        my @interval = $self->parmval("interval", $part);
         my $grace = $self->parmval("grace",$part);
-        if ($grace) {
+        if (($grace) && ($interval[0] !~ /^\d+/)) {
             my $lateness = time - $duedate;
             if ($lateness > 0) {
                 my ($start,$end,$startfrac,$endfrac,$usegrad);