--- loncom/interface/lonparmset.pm 2006/04/18 02:13:49 1.292 +++ loncom/interface/lonparmset.pm 2006/04/18 20:35:47 1.294 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.292 2006/04/18 02:13:49 www Exp $ +# $Id: lonparmset.pm,v 1.294 2006/04/18 20:35:47 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -394,30 +394,8 @@ sub storeparm_by_symb { return ''; } -{ - my $logid; - sub log_parmset { - my ($storehash,$delflag,$uname,$udom)=@_; - my $logentry=join(',',map { - &Apache::lonnet::escape($_).'=>'.&Apache::lonnet::escape($$storehash{$_}); - } keys %$storehash); - $logid++; - my $id=time().'00000'.$$.'00000'.$logid; - &Apache::lonnet::put('nohist_parameterlog', - { - $id.'_exe_uname' => $env{'user.name'}, - $id.'_exe_udom' => $env{'user.domain'}, - $id.'_exe_time' => time(), - $id.'_exe_ip' => $ENV{'REMOTE_ADDR'}, - $id.'_delflag' => $delflag, - $id.'_logentry' => $logentry, - $id.'_uname' => $uname, - $id.'_udom' => $udom, - }, - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'} - ); - } +sub log_parmset { + return &Apache::lonnet::instructor_log('parameterlog',@_); } sub storeparm_by_symb_inner { @@ -2614,8 +2592,8 @@ sub listdata { # # Ready to print # - $r->print(&tablestart().''.$name. - ':'); $foundkeys++; if (&isdateparm($thistype)) { @@ -3355,6 +3333,7 @@ sub components { return ($realm,$section,$name,$part,$typeflag, $what,$middle,$uname,$udom,$issection); } + sub standard_parameter_names { my ($name)=@_; my %standard_parms=&Apache::lonlocal::texthash('duedate' => 'Due Date', @@ -3363,7 +3342,10 @@ sub standard_parameter_names { 'maxtries' => 'Max. Number of Tries', 'weight' => 'Weight', 'date_start' => 'Starting Date', - 'date_end' => 'Ending Date'); + 'date_end' => 'Ending Date', + 'int_pos' => 'Positive Integer', + 'int_zero_pos' => 'Positive Integer or Zero', + 'hinttries' => 'Number of Tries till Hints appear'); if ($standard_parms{$name}) { return $standard_parms{$name}; } else { @@ -3377,54 +3359,49 @@ sub parm_change_log { my %parmlog=&Apache::lonnet::dump('nohist_parameterlog', $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - my %exetime=(); - foreach my $key (keys(%parmlog)) { - if ($key=~/^(.+)\_exe\_time$/) { - $exetime{$1}=$parmlog{$key}; - } - } my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'}, $env{'course.'.$env{'request.course.id'}.'.domain'}); $r->print(''); - foreach my $id (sort { $exetime{$b}<=>$exetime{$a} } (keys(%exetime))) { - my @changes=split(/\,/,$parmlog{$id.'_logentry'}); + my $bgcolor='#EEEEEE'; + foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) { + if ($bgcolor eq '#EEEEEE') { $bgcolor='#FFFFCC'; } else { $bgcolor='#EEEEEE'; } + my @changes=keys(%{$parmlog{$id}{'logentry'}}); my $count=$#changes+1; my $time = - &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'}); + &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'}); my $plainname = - &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'}, - $parmlog{$id.'_exe_udom'}); + &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'}, + $parmlog{$id}{'exe_udom'}); my $about_me_link = &Apache::loncommon::aboutmewrapper($plainname, - $parmlog{$id.'_exe_uname'}, - $parmlog{$id.'_exe_udom'}); - - my $send_msg_link; - if ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'}) - || ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))) { - my $send_msg_link ='
'. + $parmlog{$id}{'exe_uname'}, + $parmlog{$id}{'exe_udom'}); + my $send_msg_link=''; + if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'}) + || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) { + $send_msg_link ='
'. &Apache::loncommon::messagewrapper(&mt('Send message'), - $parmlog{$id.'_exe_uname'}, - $parmlog{$id.'_exe_udom'}); + $parmlog{$id}{'exe_uname'}, + $parmlog{$id}{'exe_udom'}); } - $r->print(' + $r->print(''); my $makenewrow=0; my %istype=(); - foreach my $changed (sort @changes) { - my ($key,$value)=split(/\=\>/,&Apache::lonnet::unescape($changed)); + foreach my $changed (reverse(sort(@changes))) { + my $value=$parmlog{$id}{'logentry'}->{$changed}; my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)= - &components($key,$parmlog{$id.'_uname'},$parmlog{$id.'_udom'}); + &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'}); if ($typeflag) { $istype{$parmname}=$value; } - if ($makenewrow) { $r->print(''); } else { $makenewrow=1; } + if ($makenewrow) { $r->print(''); } else { $makenewrow=1; } $r->print('
'.$time.'
'.$time.' '.$about_me_link. - '
'.$parmlog{$id.'_exe_uname'}. - ':'.$parmlog{$id.'_exe_udom'}.''. + '
'.$parmlog{$id}{'exe_uname'}. + ':'.$parmlog{$id}{'exe_udom'}.''. $send_msg_link.'
'.$realm.''.$section.''. &standard_parameter_names($parmname).''. ($part?&mt('Part: [_1]',$part):&mt('All Parts')).''); my $stillactive=0; - if ($parmlog{$id.'_deleteflag'}) { + if ($parmlog{$id}{'deleteflag'}) { $r->print(&mt('Deleted')); } else { if ($typeflag) {