--- loncom/interface/lonparmset.pm	2005/06/06 02:25:09	1.211
+++ loncom/interface/lonparmset.pm	2005/06/06 19:51:05	1.215
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.211 2005/06/06 02:25:09 www Exp $
+# $Id: lonparmset.pm,v 1.215 2005/06/06 19:51:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -403,7 +403,7 @@ sub valout {
 		$result.=$sec.' secs ';
             }
             $result=~s/\s+$//;
-        } elsif ($type=~/^date/) {
+        } elsif (&isdateparm($type)) {
             $result = localtime($value);
         } else {
             $result = $value;
@@ -434,7 +434,7 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-	if ($type=~/^date/) {
+	if (&isdateparm($type)) {
             $winvalue=$env{'form.recent_'.$type};
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
@@ -742,6 +742,11 @@ sub extractResourceInformation {
 ##################################################
 ##################################################
 
+sub isdateparm {
+    my $type=shift;
+    return (($type=~/^date/) && (!($type eq 'date_interval')));
+}
+
 sub parmmenu {
     my ($r,$allparms,$pscat,$keyorder)=@_;
     my $tempkey;
@@ -927,43 +932,25 @@ sub levelmenu {
 
 sub sectionmenu {
     my ($r,$selectedsections)=@_;
+    my %sectionhash=();
 
-    my ($classlist,$field_names) = 
-	&Apache::loncoursedata::get_classlist(
-		       $env{'request.course.id'},
-		       $env{'course.'.$env{'request.course.id'}.'.domain'},
-		       $env{'course.'.$env{'request.course.id'}.'.num'});
-    my %Sections=();
-    while (my ($student,$student_data) = each (%$classlist)) {
-	my $studenthash = ();
-        for (my $i=0; $i< scalar(@$field_names);$i++) {
-            my $field = $field_names->[$i];
-            # Store the data
-            $studenthash->{$field}=$student_data->[$i];
-        }
-	my $section = $studenthash->{'section'};
-        if (! defined($section) || $section =~/^\s*$/ || $section == -1) {
-            $studenthash->{'section'} = 'none';
-            $section = $studenthash->{'section'};
-        }
-        $Sections{$section}++;
-    }
-    my @Sections = sort {$a cmp $b} keys(%Sections);
-    unshift(@Sections,'all');
-
-    $r->print('<select name="Section" multiple="true" size="8" >');
-
-    foreach my $s (@Sections) {
-        $r->print('    <option value="'.$s.'"');
-        foreach (@{$selectedsections}) {
-            if ($s eq $_) {
-                $r->print(' selected');
-                last;
-            }
-        }
-        $r->print('>'.$s."</option>\n");
+    if (&Apache::loncommon::get_sections(
+                 $env{'course.'.$env{'request.course.id'}.'.domain'},
+                 $env{'course.'.$env{'request.course.id'}.'.num'},
+					 \%sectionhash)) {
+	$r->print('<select name="Section" multiple="true" size="8" >');
+	foreach my $s ('all',sort keys %sectionhash) {
+	    $r->print('    <option value="'.$s.'"');
+	    foreach (@{$selectedsections}) {
+		if ($s eq $_) {
+		    $r->print(' selected');
+		    last;
+		}
+	    }
+	    $r->print('>'.$s."</option>\n");
+	}
+	$r->print("</select>\n");
     }
-    $r->print("</select>\n");
 }
 
 sub keysplit {
@@ -985,6 +972,20 @@ sub keysindisplayorder {
     } (keys %{$name});
 }
 
+sub sortmenu {
+    my ($r,$sortorder)=@_;
+    $r->print('<br /><input type="radio" name="sortorder" value="realmstudent"');
+    if ($sortorder eq 'realmstudent') {
+       $r->print(' checked="on"');
+    }
+    $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
+    $r->print('<br /><input type="radio" name="sortorder" value="studentrealm"');
+    if ($sortorder eq 'studentrealm') {
+       $r->print(' checked="on"');
+    }
+    $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
+}
+
 sub standardkeyorder {
     return ('parameter_0_opendate' => 1,
 	    'parameter_0_duedate' => 2,
@@ -1061,7 +1062,7 @@ sub assessparms {
     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
 
     $alllevs{'Resource Level'}='full';
-    $alllevs{'Map Level'}='map';
+    $alllevs{'Map/Folder Level'}='map';
     $alllevs{'Course Level'}='general';
 
     my %allparms;
@@ -1212,7 +1213,7 @@ sub assessparms {
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print(&mt('Specific Resource').": ".$resource.
-                  '<input type="hidden" value="'.$pssymb.'" name="symb">');
+                  '<input type="hidden" value="'.$pssymb.'" name="symb"><br />');
     }
     &usermenu($r,$uname,$id,$udom,$csec);    
 
@@ -1967,9 +1968,12 @@ sub storedata {
 	    }
 	    if ($cmd eq 'set') {
 		my $data=$env{$_};
-		if ($$olddata{$thiskey} ne $data) { 
+                my $typeof=$env{'form.typeof_'.$thiskey};
+ 		if ($$olddata{$thiskey} ne $data) { 
 		    if ($tuname) {
-			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
+								 $tkey.'.type' => $typeof},
+						 $tudom,$tuname) eq 'ok') {
 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
 				      &Apache::loncommon::plainname($tuname,$tudom));
 			} else {
@@ -1979,7 +1983,8 @@ sub storedata {
 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
 		    } else {
 			$newdata{$thiskey}=$data;
-                    } 
+ 			$newdata{$thiskey.'.type'}=$typeof; 
+                   } 
 		}
 	    } elsif ($cmd eq 'del') {
 		if ($tuname) {
@@ -1995,9 +2000,12 @@ sub storedata {
 		}
 	    } elsif ($cmd eq 'datepointer') {
 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+                my $typeof=$env{'form.typeof_'.$thiskey};
 		if (defined($data) and $$olddata{$thiskey} ne $data) { 
 		    if ($tuname) {
-			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
+								 $tkey.'.type' => $typeof},
+						 $tudom,$tuname) eq 'ok') {
 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
 			} else {
 			    $r->print('<h2><font color="red">'.
@@ -2005,7 +2013,8 @@ sub storedata {
 			}
 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
 		    } else {
-			$newdata{$thiskey}=$data; 
+			$newdata{$thiskey}=$data;
+			$newdata{$thiskey.'.type'}=$typeof; 
 		    }
 		}
 	    }
@@ -2026,7 +2035,7 @@ sub storedata {
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
-	    $r->print('<h2>'.&mt('Stored [_1] parameter(s)</h2>',$putentries));
+	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
 	} else {
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error storing parameters').'</font></h2>');
@@ -2041,7 +2050,7 @@ sub extractuser {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder)=@_;
 # Start list output
 
     my $oldsection='';
@@ -2050,7 +2059,15 @@ sub listdata {
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %{$listdata}) {
+    foreach my $thiskey (sort {
+	if ($sortorder eq 'realmstudent') {
+	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+            ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+	} else {
+	    $a cmp $b;
+	}
+    } keys %{$listdata}) {
 	if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {
@@ -2077,19 +2094,32 @@ sub listdata {
 		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>';
 	    }
-	    if ($section ne $oldsection) {
-		$r->print(&tableend()."\n<hr /><h1>$section</h1>");
-		$oldsection=$section;
-		$oldrealm='';
-	    }
-	    if ($realm ne $oldrealm) {
-		$r->print(&tableend()."\n<h2>$realm</h2>");
-		$oldrealm=$realm;
-		$oldpart='';
+	    if ($sortorder eq 'realmstudent') {
+		if ($realm ne $oldrealm) {
+		    $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
+		    $oldrealm=$realm;
+		    $oldsection='';
+		}
+		if ($section ne $oldsection) {
+		    $r->print(&tableend()."\n<h2>$section</h2>");
+		    $oldsection=$section;
+		    $oldpart='';
+		}
+	    } else {
+		if ($section ne $oldsection) {
+		    $r->print(&tableend()."\n<hr /><h1>$section</h1>");
+		    $oldsection=$section;
+		    $oldrealm='';
+		}
+		if ($realm ne $oldrealm) {
+		    $r->print(&tableend()."\n<h2>$realm</h2>");
+		    $oldrealm=$realm;
+		    $oldpart='';
+		}
 	    }
 	    if ($part ne $oldpart) {
 		$r->print(&tableend().
-			  "\n<h3><font color='blue'>".&mt('Part').": $part</font></h3>");
+			  "\n<font color='blue'>".&mt('Part').": $part</font>");
 		$oldpart=$part;
 	    }
 #
@@ -2099,7 +2129,7 @@ sub listdata {
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
-	    if ($thistype=~/^date/) {
+	    if (&isdateparm($thistype)) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
@@ -2152,7 +2182,7 @@ ENDOVER
 
     my %alllevs=();
     $alllevs{'Resource Level'}='full';
-    $alllevs{'Map Level'}='map';
+    $alllevs{'Map/Folder Level'}='map';
     $alllevs{'Course Level'}='general';
 
     my $csec=$env{'form.csec'};
@@ -2201,8 +2231,14 @@ ENDOVER
     &partmenu($r,\%allparts,\@psprt);
     $r->print('</td><td>');
     &sectionmenu($r,\@selected_sections);
+
     $r->print('</td></tr></table>');
-    
+ 
+    my $sortorder=$env{'form.sortorder'};
+    unless ($sortorder) { $sortorder='realmstudent'; }
+    &sortmenu($r,$sortorder);
+
+    $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
 
 # Build the list data hash from the specified parms
 
@@ -2212,35 +2248,40 @@ ENDOVER
     foreach my $cat (@pscat) {
 	foreach my $section (@selected_sections) {
 	    foreach my $part (@psprt) {
-                my $newparmkey=$env{'request.course.id'};
+                my $rootparmkey=$env{'request.course.id'};
                 if (($section ne 'all') && ($section ne 'none') && ($section)) {
-		    $newparmkey.='.['.$section.']';
+		    $rootparmkey.='.['.$section.']';
 		}
 		if ($parmlev eq 'general') {
 # course-level parameter
+		    my $newparmkey=$rootparmkey.'.'.$part.'.'.$cat;
+		    $$listdata{$newparmkey}=1;
+		    $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
 		} elsif ($parmlev eq 'map') {
-		    foreach my $map (keys %allmaps) {
-			if (($pschp ne 'all') && ($pschp ne $map)) { next; }
-			$newparmkey.='.'.$allmaps{$map}.'.'.$part.'.'.$cat;
+# map-level parameter
+		    foreach my $mapid (keys %allmaps) {
+			if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
+			my $newparmkey=$rootparmkey.'.'.$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
                         $$listdata{$newparmkey}=1;
                         $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
 		    }
-# map-level parameter
 		} else {
 # resource-level parameter
-
+		    foreach my $rid (@ids) {
+			my ($map,$resid,$url)=&Apache::lonnet::decode_symb($symbp{$rid});
+			if (($pschp ne 'all') && ($allmaps{$pschp} ne $map)) { next; }
+			my $newparmkey=$rootparmkey.'.'.$symbp{$rid}.'.'.$part.'.'.$cat;
+                        $$listdata{$newparmkey}=1;
+                        $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
+		    }
 		}
 	    }
 	}
     }
 
+    if (($env{'form.store'}) || ($env{'form.dis'})) {
 
-
-    $r->print(join("\n<br />",keys %{$listdata}));
-
-    if ($env{'form.dis'}) {
-
-	&storedata($r,$crs,$dom);
+	if ($env{'form.store'}) { &storedata($r,$crs,$dom); }
 
 # Read modified data
 
@@ -2248,10 +2289,11 @@ ENDOVER
 
 # List data
 
-	&listdata($r,$resourcedata,$listdata);
+	&listdata($r,$resourcedata,$listdata,$sortorder);
     }
     $r->print(&tableend().
-	     '<p><input type="submit" name="dis" value="'.&mt('Submit').'" /></p></form></body></html>');
+	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></p>':'').
+	      '</form></body></html>');
 }
 
 sub overview {
@@ -2279,9 +2321,14 @@ ENDOVER
 
     my $resourcedata=&readdata($crs,$dom);
 
+
+    my $sortorder=$env{'form.sortorder'};
+    unless ($sortorder) { $sortorder='realmstudent'; }
+    &sortmenu($r,$sortorder);
+
 # List data
 
-    my $foundkeys=&listdata($r,$resourcedata,$resourcedata);
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
 
     $r->print(&tableend().'<p>'.
 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
@@ -2489,7 +2536,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname']);
+                                             'udom','uname','symb']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();