openwebwork-cvs

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Make all sorts case insensitive

Modified Files:
--------------
    webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor:
        StudentProgress.pm

Revision Data
-------------
Index: StudentProgress.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -Llib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm -u -r1.14 -r1.15
--- lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -291,9 +291,9 @@
 		return 	lc($a->{email_address}) cmp lc($b->{email_address}) if $sort_method_name eq 'email_address';
 		return $b->{score} <=> $a->{score} if $sort_method_name eq 'score';
 		return $b->{index} <=> $a->{index} if $sort_method_name eq 'index';
-		return $a->{section} cmp $b->{section} if $sort_method_name eq 'section';
-		return $a->{recitation} cmp $b->{recitation} if $sort_method_name eq 'recitation';
-		return $a->{user_id} cmp $b->{user_id} if $sort_method_name eq 'user_id';
+		return lc($a->{section}) cmp lc($b->{section}) if $sort_method_name eq 'section';
+		return lc($a->{recitation}) cmp lc($b->{recitation}) if $sort_method_name eq 'recitation';
+		return lc($a->{user_id}) cmp lc($b->{user_id}) if $sort_method_name eq 'user_id';
 		if ($sort_method_name =~/p(\d+)/) {
 		    my $left  =  $b->{problemData}->{$1} ||0;
 		    my $right =  $a->{problemData}->{$1} ||0;
@@ -412,7 +412,7 @@
 	        $correct_answers_for_problem{$probID}  = 0 unless defined($correct_answers_for_problem{$probID});
 		
 	        
-			my $probValue          = $problemRecord->value;
+			my $probValue          = $problemRecord->value;   ## This doesn't work - Fix it
 			# set default problem value here
 			$probValue             = 1 unless defined($probValue) and $probValue ne "";  # FIXME?? set defaults here?
 			
@@ -499,7 +499,7 @@
 			||
 		lc($a->{first_name}) cmp lc($b->{first_name})
 			||
-		$a->{user_id} cmp $b->{user_id}	
+		lc($a->{user_id}) cmp lc($b->{user_id})	
 		} 
 		@augmentedUserRecords;
 	
@@ -532,7 +532,7 @@
 		defined($ternary_sort_method_name) ?", then by $display_sort_method_name{$ternary_sort_method_name}":'',
 		defined($primary_sort_method_name) ?'.':'',
 	;
-	# calculate secondary and ternary sort methods parameters if appropiate
+	# calculate secondary and ternary sort methods parameters if appropriate
 	my %past_sort_methods = ();		
 	%past_sort_methods = (secondary_sort => "$primary_sort_method_name",) if defined($primary_sort_method_name);
 	%past_sort_methods = (%past_sort_methods, ternary_sort => "$secondary_sort_method_name",) if defined($secondary_sort_method_name);