--- loncom/interface/lonparmset.pm	2005/06/03 14:25:49	1.203
+++ loncom/interface/lonparmset.pm	2005/06/04 15:26:13	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.203 2005/06/03 14:25:49 www Exp $
+# $Id: lonparmset.pm,v 1.207 2005/06/04 15:26:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -451,7 +451,7 @@ sub startpage {
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table Mode Parameter Setting');
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
@@ -463,9 +463,6 @@ sub startpage {
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
-    my $overallhelp=
-	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
-    my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
     my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
 $html
@@ -516,7 +513,6 @@ $selscript
 </head>
 $bodytag
 $breadcrumbs
-$overallhelp
 ENDHEAD
     my %sectionhash=();
     my $sections='';
@@ -639,11 +635,6 @@ sub print_row {
     if ($parmlev eq 'full') {
         my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                         '.'.$$name{$which},$$symbp{$rid});
-
-# this doesn't seem to work, and I don't think is correct
-#    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-#                                      '.'.$$name{$which}.'.type',$symbp{$rid});
-# this seems to work
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
@@ -943,10 +934,15 @@ sub assessparms {
 
 # ---------------------------------------------------------- Anything to store?
     if ($env{'form.pres_marker'}) {
-	$message.=&storeparm(split(/\&/,$env{'form.pres_marker'}),
-			     $env{'form.pres_value'},
-			     $env{'form.pres_type'},
-                             $uname,$udom,$csec);
+        my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
+        my @values=split(/\&\&\&/,$env{'form.pres_value'});
+        my @types=split(/\&\&\&/,$env{'form.pres_type'});
+	for (my $i=0;$i<=$#markers;$i++) {
+	    $message.=&storeparm(split(/\&/,$markers[$i]),
+				 $values[$i],
+				 $types[$i],
+				 $uname,$udom,$csec);
+	}
 # ---------------------------------------------------------------- Done storing
 	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }
@@ -970,10 +966,6 @@ sub assessparms {
 
     &startpage($r,$id,$udom,$csec,$uname,scalar(keys(%allkeys)));
 
-#    if ($env{'form.url'}) {
-#	$r->print('<input type="hidden" value="'.$env{'form.url'}.
-#		  '" name="url"><input type="hidden" name="command" value="set">');
-#    }
     $r->print('<input type="hidden" value="true" name="prevvisit">');
 
     foreach ('tolerance','date_default','date_start','date_end',
@@ -1813,7 +1805,8 @@ $output
 ENDenv
 }
 ##################################################
-
+# Overview mode
+##################################################
 my $tableopen;
 
 sub tablestart {
@@ -1835,6 +1828,35 @@ sub tableend {
     }
 }
 
+sub readdata {
+    my ($crs,$dom)=@_;
+# Read coursedata
+    my $resourcedata=&Apache::lonnet::get_courseresdata($crs,$dom);
+# Read userdata
+
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    foreach (keys %$classlist) {
+        # the following undefs are for 'domain', and 'username' respectively.
+        if ($_=~/^(\w+)\:(\w+)$/) {
+	    my ($tuname,$tudom)=($1,$2);
+	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys %{$useropt}) {
+		if ($userkey=~/^$env{'request.course.id'}/) {
+                    my $newkey=$userkey;
+		    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+		    $$resourcedata{$newkey}=$$useropt{$userkey};
+		}
+	    }
+	}
+    }
+    return $resourcedata;
+}
+
+sub extractuser {
+    my $key=shift;
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+}
+
 sub overview {
     my $r=shift;
     my $bodytag=&Apache::loncommon::bodytag(
@@ -1854,7 +1876,9 @@ $breadcrumbs
 <input type="hidden" name="overview" value="1" />
 ENDOVER
 # Setting
-    my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# Set userlevel immediately
+# Do an intermediate store of course level
+    my $olddata=&readdata($crs,$dom);
     my %newdata=();
     undef %newdata;
     my @deldata=();
@@ -1863,18 +1887,58 @@ ENDOVER
 	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
 	    my $cmd=$1;
 	    my $thiskey=$2;
+	    my ($tuname,$tudom)=&extractuser($thiskey);
+	    my $tkey=$thiskey;
+            if ($tuname) {
+		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+	    }
 	    if ($cmd eq 'set') {
 		my $data=$env{$_};
-		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		if ($$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+				      &Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data;
+                    } 
+		}
 	    } elsif ($cmd eq 'del') {
-		push (@deldata,$thiskey);
+		if ($tuname) {
+		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+		    } else {
+			$r->print('<h2><font color="red">'.
+				  &mt('Error deleting parameters').'</font></h2>');
+		    }
+		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		} else {
+		    push (@deldata,$thiskey);
+		}
 	    } elsif ($cmd eq 'datepointer') {
 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		if (defined($data) and $$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data; 
+		    }
+		}
 	    }
 	}
     }
-# Store
+# Store all course level
     my $delentries=$#deldata+1;
     my @newdatakeys=keys %newdata;
     my $putentries=$#newdatakeys+1;
@@ -1885,6 +1949,7 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error deleting parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
@@ -1893,25 +1958,36 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error storing parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
-# Read and display
-    my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# Start list output
+
     my $oldsection='';
     my $oldrealm='';
     my $oldpart='';
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %resourcedata) {
-	if ($resourcedata{$thiskey.'.type'}) {
-	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    foreach my $thiskey (sort keys %{$resourcedata}) {
+	if ($$resourcedata{$thiskey.'.type'}) {
+	    my ($middle,$part,$name)=
+		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my $section=&mt('All Students');
-	    if ($middle=~/^\[(.*)\]\./) {
-		$section=&mt('Group/Section').': '.$1;
-		$middle=~s/^\[(.*)\]\.//;
+	    if ($middle=~/^\[(.*)\]/) {
+		my $issection=$1;
+		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+		} else {
+		    $section=&mt('Group/Section').': '.$issection;
+		}
+		$middle=~s/^\[(.*)\]//;
 	    }
-	    $middle=~s/\.$//;
+	    $middle=~s/\.+$//;
+	    $middle=~s/^\.+//;
 	    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>';
@@ -1941,19 +2017,19 @@ ENDOVER
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
-	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+	    if ($$resourcedata{$thiskey.'.type'}=~/^date/) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
 			  &Apache::lonhtmlcommon::date_setter('overviewform',
 							      $jskey,
-						      $resourcedata{$thiskey}).
+						      $$resourcedata{$thiskey}).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
 			  );
 	    } else {
 		$r->print(
 			  '<input type="text" name="set_'.$thiskey.'" value="'.
-			  $resourcedata{$thiskey}.'">');
+			  $$resourcedata{$thiskey}.'">');
 	    }
 	    $r->print('</td></tr>');
 	}
@@ -2088,8 +2164,7 @@ ENDMAINFORMHEAD
     my @menu =
         (
           { text => 'Set Course Environment Parameters',
-            help => 'Course_Setting_Parameters',
-            action => 'crsenv',
+	    action => 'crsenv',
             permission => $parm_permission,
             },
           { text => 'Set/Modify Course Assessment Parameters - Helper Mode',
@@ -2103,6 +2178,7 @@ ENDMAINFORMHEAD
           { text => 'Set/Modify Course Assessment Parameters - Table Mode',
             action => 'settable',
             permission => $parm_permission,
+            help => 'Cascading_Parameters',
             },
 #          { text => 'Set Parameter Default Preferences',
 #            help => 'Course_View_Class_List',
@@ -2157,13 +2233,17 @@ sub handler {
 	return OK;
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['action','state']);
+					    ['action','state',
+                                             'pres_marker',
+                                             'pres_value',
+                                             'pres_type',
+                                             'udom','uname']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
 					    text=>"Parameter Manager",
-					    faq=>9,
+					    faq=>10,
 					    bug=>'Instructor Interface'});
 
 # ----------------------------------------------------- Needs to be in a course
@@ -2208,7 +2288,8 @@ sub handler {
 	    &overview($r);
         } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Table Mode"});
+						    text=>"Table Mode",
+						    help => 'Course_Setting_Parameters'});
 	    &assessparms($r);
         }