--- loncom/homework/grades.pm	2005/09/23 15:19:05	1.288
+++ loncom/homework/grades.pm	2005/11/15 15:55:11	1.294
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.288 2005/09/23 15:19:05 albertel Exp $
+# $Id: grades.pm,v 1.294 2005/11/15 15:55:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -334,7 +334,16 @@ COMMONJSFUNCTIONS
 #--- section, ids and fullnames for each user.
 sub getclasslist {
     my ($getsec,$filterlist) = @_;
-    $getsec = $getsec eq '' ? 'all' : $getsec;
+    my @getsec;
+    if (!ref($getsec)) {
+	if ($getsec ne '' && $getsec ne 'all') {
+	    @getsec=($getsec);
+	}
+    } else {
+	@getsec=@{$getsec};
+    }
+    if (grep(/^all$/,@getsec)) { undef(@getsec); }
+
     my $classlist=&Apache::loncoursedata::get_classlist();
     # Bail out if we were unable to get the classlist
     return if (! defined($classlist));
@@ -363,7 +372,7 @@ sub getclasslist {
 	}
 	$section = ($section ne '' ? $section : 'none');
 	if (&canview($section)) {
-	    if ($getsec eq 'all' || $getsec eq $section) {
+	    if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
 		$sections{$section}++;
 		$fullnames{$student}=$fullname;
 	    } else {
@@ -536,7 +545,13 @@ sub verifyreceipt {
     if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($url,$symb); }
-    foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach (sort 
+	     {
+		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+		 }
+		 return $a cmp $b;
+	     } (keys(%$fullname))) {
 	my ($uname,$udom)=split(/\:/);
 	foreach my $part (@$parts) {
 	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
@@ -702,7 +717,14 @@ LISTJAVASCRIPT
     $gradeTable.='</tr>'."\n";
 
     my $ctr = 0;
-    foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach my $student (sort 
+			 {
+			     if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+				 return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+			     }
+			     return $a cmp $b;
+			 }
+			 (keys(%$fullname))) {
 	my ($uname,$udom) = split(/:/,$student);
 	my %status = ();
 	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
@@ -2064,7 +2086,13 @@ sub processHandGrade {
 
     my (@parsedlist,@nextlist);
     my ($nextflg) = 0;
-    foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach (sort 
+	     {
+		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+		 }
+		 return $a cmp $b;
+	     } (keys(%$fullname))) {
 	if ($nextflg == 1 && $button =~ /Next$/) {
 	    push @parsedlist,$_;
 	}
@@ -2394,6 +2422,7 @@ sub viewgrades_js {
 	}
 	for (i=0;i<document.classgrade.total.value;i++) {
 	    var user = document.classgrade["ctr"+i].value;
+	    user = user.replace(new RegExp(':', 'g'),"_");
 	    var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 	    var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
 	    var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
@@ -2421,6 +2450,7 @@ sub viewgrades_js {
 
 	    for (i=0;i<document.classgrade.total.value;i++) {
 		var user = document.classgrade["ctr"+i].value;
+		user = user.replace(new RegExp(':', 'g'),"_");
 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
@@ -2438,6 +2468,7 @@ sub viewgrades_js {
 	} else {
 	    for (i=0;i<document.classgrade.total.value;i++) {
 		var user = document.classgrade["ctr"+i].value;
+		user = user.replace(new RegExp(':', 'g'),"_");
 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
@@ -2496,6 +2527,7 @@ sub viewgrades_js {
 
 	    for (i=0;i<document.classgrade.total.value;i++) {
 		var user = document.classgrade["ctr"+i].value;
+		user = user.replace(new RegExp(':', 'g'),"_");
 		var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 		resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
 		var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
@@ -2638,7 +2670,13 @@ sub viewgrades {
     #list all the students - with points and grade status
     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     my $ctr = 0;
-    foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach (sort 
+	     {
+		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+		 }
+		 return $a cmp $b;
+	     } (keys(%$fullname))) {
 	$ctr++;
 	$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
 				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
@@ -2822,13 +2860,14 @@ sub editgrades {
 	    my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
 	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
 
+	    $newrecord{'resource.'.$_.'.regrader'}=
+		"$env{'user.name'}:$env{'user.domain'}";
 	    if ($dropMenu eq 'reset status' &&
 		$old_score ne '') { # ignore if no previous attempts => nothing to reset
 		$newrecord{'resource.'.$_.'.tries'} = 0;
 		$newrecord{'resource.'.$_.'.solved'} = '';
 		$newrecord{'resource.'.$_.'.award'} = '';
 		$newrecord{'resource.'.$_.'.awarded'} = 0;
-		$newrecord{'resource.'.$_.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
 		$updateflag = 1;
                 if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
                     my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
@@ -3162,7 +3201,6 @@ sub csvuploadoptions {
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <h3><font color="#339933">Uploading Class Grade Options</font></h3>
 <input type="hidden" name="command"    value="csvuploadassign" />
-<input type="submit" value="Assign Grades" /><br />
 <p>
 <label>
    <input type="checkbox" name="show_full_results" />
@@ -3190,7 +3228,8 @@ ENDPICK
     }
     # FIXME do a check for any duplicated user ids...
     # FIXME do a check for any invalid user ids?...
-    $request->print("<hr /></form>\n");
+    $request->print('<input type="submit" value="Assign Grades" /><br />
+<hr /></form>'."\n");
     $request->print(&show_grading_menu_form($symb,$url));
     return '';
 }
@@ -3395,7 +3434,13 @@ LISTJAVASCRIPT
  
     my (undef,undef,$fullname) = &getclasslist($getsec,'1');
     my $ptr = 1;
-    foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach my $student (sort 
+			 {
+			     if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+				 return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+			     }
+			     return $a cmp $b;
+			 } (keys(%$fullname))) {
 	my ($uname,$udom) = split(/:/,$student);
 	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
 	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
@@ -4027,7 +4072,7 @@ SCANTRONFORM
             </tr>
             <tr bgcolor="#ffffe6">
               <td colspan="2">
-                <input type="submit" value="Show List of Files" />
+                <input type="submit" value="Download: Show List of Associated Files" />
               </td>
             </tr>
           </table>