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

[raeburn]

raeburn		Tue Dec 10 04:55:03 2024 EDT

  Modified files:              
    /loncom/homework	grades.pm lonhomework.pm 
  Log:
  - Change in args for &get_lti_score() in lonhomework.pm.  Third arg is now 
    the section of the student for whom the score is being retrieved.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.801 loncom/homework/grades.pm:1.802
--- loncom/homework/grades.pm:1.801	Mon Dec  9 22:22:57 2024
+++ loncom/homework/grades.pm	Tue Dec 10 04:55:03 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.801 2024/12/09 22:22:57 raeburn Exp $
+# $Id: grades.pm,v 1.802 2024/12/10 04:55:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1726,7 +1726,7 @@
 }
 
 sub process_passbacks {
-    my ($context,$symbs,$cdom,$cnum,$udom,$uname,$weights,$awardeds,$excuseds,$needpb,
+    my ($context,$symbs,$cdom,$cnum,$udom,$uname,$usec,$weights,$awardeds,$excuseds,$needpb,
         $skip_passback,$pbsave,$pbids) = @_;
     if ((ref($needpb) eq 'HASH') && (ref($skip_passback) eq 'HASH') && (ref($pbsave) eq 'HASH')) {
         my (%weight,%awarded,%excused);
@@ -1827,6 +1827,7 @@
                                         'uname'      => $uname,
                                         'udom'       => $udom,
                                         'uhome'      => $uhome,
+                                        'usec'       => $usec,
                                         'pbid'       => $pbid,
                                         'pburl'      => $pburl,
                                         'pbtype'     => $pb{'type'},
@@ -4561,7 +4562,7 @@
     if (($sendupdate) && (!$submitter)) {
         if ((ref($needpb) eq 'HASH') &&
             (keys(%{$needpb}))) {
-            &process_passbacks('handgrade',[$symb],$cdom,$cnum,$domain,$stuname,\%weights,
+            &process_passbacks('handgrade',[$symb],$cdom,$cnum,$domain,$stuname,$usec,\%weights,
                                \%awardeds,\%excuseds,$needpb,$skip_passback,$pbsave);
         }
     }
@@ -5650,7 +5651,7 @@
 	    $updateCtr++;
             if (keys(%needpb)) {
                 $weights{$symb} = \%weight;
-                &process_passbacks('editgrades',[$symb],$cdom,$cnum,$udom,$uname,\%weights,
+                &process_passbacks('editgrades',[$symb],$cdom,$cnum,$udom,$uname,$usec,\%weights,
                                    \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
             }
 	} else {
@@ -6201,7 +6202,7 @@
                           $awardeds{$symb}{$part} = $record{"resource.$part.awarded"};
                       }
                   }
-                  &process_passbacks('csvupload',[$symb],$cdom,$cnum,$domain,$username,\%weights,
+                  &process_passbacks('csvupload',[$symb],$cdom,$cnum,$domain,$username,$usec,\%weights,
                                      \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave);
               }
            } else {
@@ -7009,7 +7010,7 @@
                 }
             }
             my @symbs = keys(%uniqsymbs);
-            &process_passbacks('updatebypage',\@symbs,$cdom,$cnum,$udom,$uname,\%weights,
+            &process_passbacks('updatebypage',\@symbs,$cdom,$cnum,$udom,$uname,$usec,\%weights,
                                \%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave,\%pbids);
             if (@Apache::grades::ltipassback) {
                 unless ($registered_cleanup) {
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.387 loncom/homework/lonhomework.pm:1.388
--- loncom/homework/lonhomework.pm:1.387	Mon Dec  9 22:22:57 2024
+++ loncom/homework/lonhomework.pm	Tue Dec 10 04:55:03 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.387 2024/12/09 22:22:57 raeburn Exp $
+# $Id: lonhomework.pm,v 1.388 2024/12/10 04:55:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2008,6 +2008,7 @@
             my $uname = $item->{'uname'};
             my $udom = $item->{'udom'};
             my $uhome = $item->{'uhome'};
+            my $usec = $item->{'usec'};
             my $keynum = $item->{'lti'}->{'cipher'};
             my $crsdef = $item->{'crsdef'};
             my $scoretype = $item->{'format'};
@@ -2041,12 +2042,12 @@
             if (($pbscope eq 'map') || ($pbscope eq 'nonrec')) {
                 if ((keys(%total_by_symb)) && (keys(%possible_by_symb))) {
                     ($total,$possible) =
-                    &get_lti_score($uname,$udom,$map,$pbscope,\%total_by_symb,\%possible_by_symb);
+                    &get_lti_score($uname,$udom,$usec,$map,$pbscope,\%total_by_symb,\%possible_by_symb);
                 } else {
-                   ($total,$possible) = &get_lti_score($uname,$udom,$map,$pbscope);
+                   ($total,$possible) = &get_lti_score($uname,$udom,$usec,$map,$pbscope);
                 }
             } elsif ($pbscope eq 'course') {
-                ($total,$possible) = &get_lti_score($uname,$udom);
+                ($total,$possible) = &get_lti_score($uname,$udom,$usec);
             }
             $item->{'total'} = $total;
             $item->{'possible'} = $possible;
@@ -2121,8 +2122,8 @@
 }
 
 sub get_lti_score {
-    my ($uname,$udom,$mapurl,$pbscope,$totals,$possibles) = @_;
-    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+    my ($uname,$udom,$usec,$mapurl,$pbscope,$totals,$possibles) = @_;
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
     if (ref($navmap)) {
         my $iterator;
         if ($mapurl ne '') {