[BACK]Return to lonparmset.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.328 and 1.332

version 1.328, 2006/08/09 20:40:16 version 1.332, 2006/08/10 15:36:49
Line 3314  ENDYESNO Line 3314  ENDYESNO
 }  }
   
 sub components {  sub components {
     my ($key,$uname,$udom,$exeuser,$exedomain)=@_;      my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
     my $typeflag=0;  
     if ($key=~/\.type$/) {      if ($typeflag) {
  $key=~s/\.type$//;   $key=~s/\.type$//;
         $typeflag=1;  
     }      }
   
       my ($middle,$part,$name)=
    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     my $issection;      my $issection;
     my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);  
     my $section=&mt('All Students');      my $section=&mt('All Students');
     if ($middle=~/^\[(.*)\]/) {      if ($middle=~/^\[(.*)\]/) {
  $issection=$1;   $issection=$1;
Line 3345  sub components { Line 3347  sub components {
  $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);   $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
     }      }
     my $what=$part.'.'.$name;      my $what=$part.'.'.$name;
     return ($realm,$section,$name,$part,$typeflag,      return ($realm,$section,$name,$part,
     $what,$middle,$uname,$udom,$issection,$realmdescription);      $what,$middle,$uname,$udom,$issection,$realmdescription);
 }  }
   
Line 3423  sub parm_change_log { Line 3425  sub parm_change_log {
     my $shown=0;      my $shown=0;
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {      foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});          my @changes=keys(%{$parmlog{$id}{'logentry'}});
  my $count=$#changes+1;   my $count = 0;
  if (!$env{'form.includetypes'}) { $count=$count/2; }  
  my $time =   my $time =
     &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});      &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
  my $plainname =    my $plainname = 
Line 3443  sub parm_change_log { Line 3444  sub parm_change_log {
    $parmlog{$id}{'exe_udom'});     $parmlog{$id}{'exe_udom'});
  }   }
  my $row_start=&Apache::loncommon::start_data_table_row();   my $row_start=&Apache::loncommon::start_data_table_row();
  $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>   $r->print($row_start);
                        <td rowspan="'.$count.'">'.$about_me_link.  
   '<br /><tt>'.$parmlog{$id}{'exe_uname'}.  
           ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.  
   $send_msg_link.'</td>');  
  my $makenewrow=0;   my $makenewrow=0;
  my %istype=();   my %istype=();
    my $output;
  foreach my $changed (reverse(sort(@changes))) {   foreach my $changed (reverse(sort(@changes))) {
             my $value=$parmlog{$id}{'logentry'}->{$changed};              my $value=$parmlog{$id}{'logentry'}{$changed};
             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection,$realmdescription)=      my $typeflag = ($changed =~/\.type$/ &&
  &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});      !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
               my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
    &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
     if ($typeflag) {      if ($typeflag) {
  if (!$env{'form.includetypes'}) { next; }   
  $istype{$parmname}=$value;    $istype{$parmname}=$value; 
    if (!$env{'form.includetypes'}) { next; } 
     }      }
     if ($makenewrow) { $r->print($row_start); } else { $makenewrow=1; }      $count++;
     $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.      if ($makenewrow) {
    $output .= $row_start;
       } else {
    $makenewrow=1;
       }
       $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
       &standard_parameter_names($parmname).'</td><td>'.        &standard_parameter_names($parmname).'</td><td>'.
       ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>');        ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
     my $stillactive=0;      my $stillactive=0;
     if ($parmlog{$id}{'deleteflag'}) {      if ($parmlog{$id}{'delflag'}) {
  $r->print(&mt('Deleted'));   $output .= &mt('Deleted');
     } else {      } else {
  if ($typeflag) {   if ($typeflag) {
     $r->print(&mt('Type: [_1]',&standard_parameter_names($value)));      $output .= &mt('Type: [_1]',&standard_parameter_names($value));
  } else {   } else {
     my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),      my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
       $uname,$udom,$issection,$issection,$courseopt);        $uname,$udom,$issection,$issection,$courseopt);
     if (&isdateparm($istype{$parmname})) {      if (&isdateparm($istype{$parmname})) {
  $r->print(&Apache::lonlocal::locallocaltime($value));   $output .= &Apache::lonlocal::locallocaltime($value);
     } else {      } else {
  $r->print($value);   $output .= $value;
     }      }
     if ($value ne $all[$level]) {      if ($value ne $all[$level]) {
  $r->print('<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>');   $output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
     } else {      } else {
  $stillactive=1;   $stillactive=1;
     }      }
  }   }
     }      }
     $r->print('</td>');      $output .= '</td><td>';
     if ($stillactive) {      if ($stillactive) {
  my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));   my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,                  my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
     (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));      (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
  if (($uname) && ($udom)) {   if (($uname) && ($udom)) {
     $r->print('<td>'.      $output .= 
       &Apache::loncommon::messagewrapper('Notify User',$uname,$udom,$title,$description).   &Apache::loncommon::messagewrapper('Notify User',
       '</td>');     $uname,$udom,$title,
      $description);
  } else {   } else {
     $r->print('<td>'.      $output .= 
       &Apache::lonrss::course_blog_link($id,$title,$description).   &Apache::lonrss::course_blog_link($id,$title,
       '</td>');    $description);
  }   }
     } else {  
  $r->print('<td>&nbsp;</td>');  
     }      }
     $r->print(&Apache::loncommon::end_data_table_row());      $output .= '</td>'.&Apache::loncommon::end_data_table_row();
  }   }
    $r->print('<td rowspan="'.$count.'">'.$time.'</td>
                          <td rowspan="'.$count.'">'.$about_me_link.
     '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
             ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
     $send_msg_link.'</td>'.$output);
   
  $shown++;   $shown++;
  if (!($env{'form.show'} eq &mt('all')    if (!($env{'form.show'} eq &mt('all') 
       || $shown<=$env{'form.show'})) { last; }        || $shown<=$env{'form.show'})) { last; }
Removed from v.1.328  
changed lines
  Added in v.1.332

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