Diff for /loncom/homework/grades.pm between versions 1.596.2.12.2.41.2.1 and 1.596.2.12.2.41.2.2

version 1.596.2.12.2.41.2.1, 2017/11/01 03:27:19 version 1.596.2.12.2.41.2.2, 2018/04/29 15:29:05
Line 4177  sub editgrades { Line 4177  sub editgrades {
  $ctr++;   $ctr++;
     }      }
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);      my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
       my $totcolspan = 0;
     foreach my $partid (@partid) {      foreach my $partid (@partid) {
  $header .= '<th align="center">'.&mt('Old Score').'</th>'.   $header .= '<th align="center">'.&mt('Old Score').'</th>'.
     '<th align="center">'.&mt('New Score').'</th>';      '<th align="center">'.&mt('New Score').'</th>';
Line 4193  sub editgrades { Line 4194  sub editgrades {
  '<th align="center">'.&mt('New').' '.$display.'</th>';   '<th align="center">'.&mt('New').' '.$display.'</th>';
     $columns{$partid}+=2;      $columns{$partid}+=2;
  }   }
           $totcolspan += $columns{$partid};
     }      }
     foreach my $partid (@partid) {      foreach my $partid (@partid) {
  my $display_part=&get_display_part($partid,$symb);   my $display_part=&get_display_part($partid,$symb);
Line 4208  sub editgrades { Line 4210  sub editgrades {
     my @noupdate;      my @noupdate;
     my ($updateCtr,$noupdateCtr) = (1,1);      my ($updateCtr,$noupdateCtr) = (1,1);
     for ($i=0; $i<$env{'form.total'}; $i++) {      for ($i=0; $i<$env{'form.total'}; $i++) {
  my $line;  
  my $user = $env{'form.ctr'.$i};   my $user = $env{'form.ctr'.$i};
  my ($uname,$udom)=split(/:/,$user);   my ($uname,$udom)=split(/:/,$user);
  my %newrecord;   my %newrecord;
  my $updateflag = 0;   my $updateflag = 0;
  $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';  
  my $usec=$classlist->{"$uname:$udom"}[5];   my $usec=$classlist->{"$uname:$udom"}[5];
  if (!&canmodify($usec)) {          my $canmodify = &canmodify($usec);
     my $numcols=scalar(@partid)*4+2;          my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
     push(@noupdate,                     &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
  $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".          if (!$canmodify) {
  &mt('Not allowed to modify student')."</span></td></tr>");              push(@noupdate,
     next;                   $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
  }                   &mt('Not allowed to modify student')."</span></td>");
               next;
           }
         my %aggregate = ();          my %aggregate = ();
         my $aggregateflag = 0;          my $aggregateflag = 0;
  $user=~s/:/_/; # colon doen't work in javascript for names   $user=~s/:/_/; # colon doen't work in javascript for names
Line 4336  sub editgrades { Line 4338  sub editgrades {
         }          }
     }      }
     if (@noupdate) {      if (@noupdate) {
 # my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;          my $numcols=$totcolspan+2;
  my $numcols=scalar(@partid)*4+2;  
  $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').   $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
     '<td align="center" colspan="'.$numcols.'">'.      '<td align="center" colspan="'.$numcols.'">'.
     &mt('No Changes Occurred For the Students Below').      &mt('No Changes Occurred For the Students Below').

Removed from v.1.596.2.12.2.41.2.1  
changed lines
  Added in v.1.596.2.12.2.41.2.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>