--- loncom/interface/lonparmset.pm	2006/04/13 21:32:23	1.285
+++ loncom/interface/lonparmset.pm	2006/04/18 18:10:55	1.293
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.285 2006/04/13 21:32:23 albertel Exp $
+# $Id: lonparmset.pm,v 1.293 2006/04/18 18:10:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -394,38 +394,13 @@ sub storeparm_by_symb {
     return '';
 }
 
-{
-    my $logid;
-    sub log_parmset {
-	my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-	$logid++;
-	my $id=time().'00000'.$$.'00000'.$logid;
-	&Apache::lonnet::put('parameterlog',
-			     {
-				 $id.'_exe_uname' => $env{'user.name'},
-				 $id.'_exe_udom'  => $env{'user.domain'},
-				 $id.'_exe_time'  => time(),
-				 $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
-				 $id.'_symb'      => $symb,
-				 $id.'_spnam'     => $spnam,
-				 $id.'_snum'      => $snum,
-				 $id.'_nval'      => $nval,
-				 $id.'_ntype'     => $ntype,
-				 $id.'_uname'     => $uname,
-				 $id.'_udom'      => $udom,
-				 $id.'_csec'      => $csec,
-				 $id.'_cgroup'    => $cgroup
-			     },
-			     $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 {
 # ---------------------------------------------------------- Get symb, map, etc
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-    &log_parmset(@_);
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
@@ -479,9 +454,11 @@ sub storeparm_by_symb_inner {
 	if ($delete) {
 	    $reply=&Apache::lonnet::del
 		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+            &log_parmset(\%storecontent,1);
 	} else {
 	    $reply=&Apache::lonnet::cput
 		('resourcedata',\%storecontent,$cdom,$cnum);
+	    &log_parmset(\%storecontent);
 	}
 	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
     } else {
@@ -502,9 +479,11 @@ sub storeparm_by_symb_inner {
 	if ($delete) {
 	    $reply=&Apache::lonnet::del
 		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	    &log_parmset(\%storecontent,1,$uname,$udom);
 	} else {
 	    $reply=&Apache::lonnet::cput
 		('resourcedata',\%storecontent,$udom,$uname);
+	    &log_parmset(\%storecontent,0,$uname,$udom);
 	}
 	&Apache::lonnet::devalidateuserresdata($uname,$udom);
     }
@@ -2421,6 +2400,7 @@ sub storedata {
 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
 								 $tkey.'.type' => $typeof},
 						 $tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
 				      &Apache::loncommon::plainname($tuname,$tudom));
 			} else {
@@ -2436,6 +2416,7 @@ sub storedata {
 	    } elsif ($cmd eq 'del') {
 		if ($tuname) {
 		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>''},1,$tuname,$tudom);
 			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
 		    } else {
 			$r->print('<h2><font color="red">'.
@@ -2453,6 +2434,7 @@ sub storedata {
 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
 								 $tkey.'.type' => $typeof},
 						 $tudom,$tuname) eq 'ok') {
+			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
 			} else {
 			    $r->print('<h2><font color="red">'.
@@ -2473,6 +2455,8 @@ sub storedata {
     my $putentries=$#newdatakeys+1;
     if ($delentries) {
 	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+	    my %loghash=map { $_ => '' } @deldata;
+	    &log_parmset(\%loghash,1);
 	    $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
 	} else {
 	    $r->print('<h2><font color="red">'.
@@ -2482,6 +2466,7 @@ sub storedata {
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
+			    &log_parmset(\%newdata,0);
 	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
 	} else {
 	    $r->print('<h2><font color="red">'.
@@ -2607,8 +2592,8 @@ sub listdata {
 #
 # Ready to print
 #
-	    $r->print(&tablestart().'<tr><td><b>'.$name.
-		      ':</b></td><td><input type="checkbox" name="del_'.
+	    $r->print(&tablestart().'<tr><td><b>'.&standard_parameter_names($name).
+		      '</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
 	    if (&isdateparm($thistype)) {
@@ -3046,7 +3031,7 @@ ENDMAINFORMHEAD
             action => 'setdefaults',
             permission => $parm_permission,
             },          
-	  { text => 'Parameter Change Log and Course Blog Posting',
+	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
             action => 'parameterchangelog',
             permission => $parm_permission,
             },
@@ -3316,9 +3301,146 @@ ENDYESNO
     return;
 }
 
+sub components {
+    my ($key,$uname,$udom,$exeuser,$exedomain)=@_;
+    my $typeflag=0;
+    if ($key=~/\.type$/) {
+	$key=~s/\.type$//;
+        $typeflag=1;
+    }
+    my $issection;
+    my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    my $section=&mt('All Students');
+    if ($middle=~/^\[(.*)\]/) {
+	$issection=$1;
+	$section=&mt('Group/Section').': '.$issection;
+	$middle=~s/^\[(.*)\]//;
+    }
+    $middle=~s/\.+$//;
+    $middle=~s/^\.+//;
+    if ($uname) {
+	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
+	$issection='';
+    }
+    my $realm='<font color="red">'.&mt('All Resources').'</font>';
+    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+	$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+    } elsif ($middle) {
+	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+	$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+    }
+    my $what=$part.'.'.$name;
+    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',
+						   'answerdate' => 'Answer Date',
+						   'opendate' => 'Open Date',
+						   'maxtries' => 'Max. Number of Tries',
+						   'weight' => 'Weight',
+						   'date_start' => 'Starting 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 { 
+	return $name; 
+    }
+}
+
 sub parm_change_log {
     my ($r)=@_;
     &startpage($r);
+    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('<table border="2">');
+    my $bgcolor='#EEEEEE';
+    foreach my $id (sort { $exetime{$b}<=>$exetime{$a} } (keys(%exetime))) {
+	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'});
+	my $plainname = 
+	    &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'}))) {
+	    $send_msg_link ='<br />'.
+		&Apache::loncommon::messagewrapper(&mt('Send message'),
+						   $parmlog{$id.'_exe_uname'},
+						   $parmlog{$id.'_exe_udom'});
+	}
+	$r->print('<tr bgcolor="'.$bgcolor.'"><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>');
+	my $makenewrow=0;
+	my %istype=();
+	foreach my $changed (reverse(sort(@changes))) {
+            my $value=$parmlog{$id.'_logentry'}->{$changed};
+            my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)=
+		&components($changed,$parmlog{$id.'_uname'},$parmlog{$id.'_udom'});
+	    if ($typeflag) { $istype{$parmname}=$value; }
+	    if ($makenewrow) { $r->print('<tr bgcolor="'.$bgcolor.'">'); } else { $makenewrow=1; }
+	    $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+		      &standard_parameter_names($parmname).'</td><td>'.
+		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>');
+	    my $stillactive=0;
+	    if ($parmlog{$id.'_deleteflag'}) {
+		$r->print(&mt('Deleted'));
+	    } else {
+		if ($typeflag) {
+		    $r->print(&mt('Type: [_1]',&standard_parameter_names($value)));
+		} else {
+		    my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
+						      $uname,$udom,$issection,$issection,$courseopt);
+		    if (&isdateparm($istype{$parmname})) {
+			$r->print(&Apache::lonlocal::locallocaltime($value));
+		    } else {
+			$r->print($value);
+		    }
+		    if ($value ne $all[$level]) {
+			$r->print('<br /><font color="red">'.&mt('Not active anymore').'</font>');
+		    } else {
+			$stillactive=1;
+		    }
+		}
+	    }
+	    $r->print('</td>');
+	    if ($stillactive) {
+		if (($uname) && ($udom)) {
+		    $r->print('<td>Notify Link</td>');
+		} else {
+		    $r->print('<td>Blog Link</td>');
+		}
+	    } else {
+		$r->print('<td>&nbsp;</td>');
+	    }
+	    $r->print('</tr>');
+	}
+    }
+    $r->print('</table>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3416,7 +3538,7 @@ sub handler {
 	    &assessparms($r);
         } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Parameter Change Log and Course Blog Posting"});
+						    text=>"Parameter Change Log"});
 	    &parm_change_log($r);
 	}       
     } else {