improvements to Instructor Tools

lib/WeBWorK/ContentGenerator/Instructor/Index.pm

@@ -83,13 +83,6 @@ sub pre_header_initialize ($c) {
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $c->param('edit_sets')) {
-		if ($nsets == 1) {
-			$route = 'instructor_set_detail';
-			$args{setID} = $firstSetID;
-		} else {
-			push @error, E_ONE_SET;
-		}
 	} elsif (defined $c->param('prob_lib')) {
 		if ($nsets == 1) {
 			$route = 'instructor_set_maker';
@@ -153,10 +146,11 @@ sub pre_header_initialize ($c) {
 			$route               = 'instructor_set_detail';
 			$args{setID}         = $firstSetID;
 			$params{editForUser} = \@selectedUserIDs;
+		} elsif ($nsets == 1) {
+			$route = 'instructor_set_detail';
+			$args{setID} = $firstSetID;
 		} else {
-			push @error, E_MIN_ONE_USER unless $nusers >= 1;
-			push @error, E_ONE_SET      unless $nsets == 1;
-
+			push @error, E_ONE_SET unless $nsets == 1;
 		}
 	} elsif (defined $c->param('create_set')) {
 		my $setname = format_set_name_internal($c->param('new_set_name') // '');
@@ -174,6 +168,7 @@ sub pre_header_initialize ($c) {
 		}
 	} elsif (defined $c->param('add_users')) {
 		$route = 'instructor_add_users';
+		$params{number_of_students} = $c->param('number_of_students') // 1;
 	} elsif (defined $c->param('email_users')) {
 		$route = 'instructor_mail_merge';
 	} elsif (defined $c->param('transfer_files')) {
@@ -183,7 +178,7 @@ sub pre_header_initialize ($c) {
 	push @error, x('You are not allowed to act as a student.')
 		if (defined $c->param('act_as_user') && !$authz->hasPermissions($userID, 'become_student'));
 	push @error, x('You are not allowed to modify homework sets.')
-		if ((defined $c->param('edit_sets') || defined $c->param('edit_set_for_users'))
+		if (defined $c->param('edit_set_for_users')
 			&& !$authz->hasPermissions($userID, 'modify_problem_sets'));
 	push @error, x('You are not allowed to assign homework sets.')
 		if ((defined $c->param('sets_assigned_to_user') || defined $c->param('users_assigned_to_set'))

lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm

@@ -16,6 +16,8 @@
 package WeBWorK::ContentGenerator::Instructor::ProblemSetDetail;
 use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
+use Exporter qw(import);
+
 =head1 NAME
 
 WeBWorK::ContentGenerator::Instructor::ProblemSetDetail - Edit general set and
@@ -26,6 +28,8 @@ specific user/set information as well as problem information
 use WeBWorK::Utils qw(cryptPassword jitar_id_to_seq seq_to_jitar_id x format_set_name_internal format_set_name_display);
 use WeBWorK::Utils::Instructor qw(assignProblemToAllSetUsers addProblemToSet);
 
+our @EXPORT_OK = ('FIELD_PROPERTIES');
+
 # These constants determine which fields belong to what type of record.
 use constant SET_FIELDS => [
 	qw(set_header hardcopy_header open_date reduced_scoring_date due_date answer_date visible description

lib/WeBWorK/HTML/ScrollingRecordList.pm

@@ -56,6 +56,14 @@ sub scrollingRecordList ($options, @records) {
 
 		$sorts   = getSortsForClass($class, $options{default_sort});
 		$formats = getFormatsForClass($class, $options{default_format});
+		# Remove sorts that are irrelevant for our formats
+		my @format_keywords;
+		for my $format (@$formats) {
+			push(@format_keywords, (split /\W+/, $format->[0]));
+		}
+		my $format_keywords = join('|', @format_keywords);
+		@$sorts = grep { $_->[0] =~ /$format_keywords/ } @$sorts;
+
 		$filters = getFiltersForClass(@records);
 
 		my @selected_filters;

lib/WeBWorK/Utils/FilterRecords.pm

@@ -51,6 +51,7 @@ use warnings;
 use Carp;
 
 use WeBWorK::Utils qw(sortByName);
+use WeBWorK::ContentGenerator::Instructor::ProblemSetDetail qw/FIELD_PROPERTIES/;
 
 our @EXPORT_OK = qw(
 	getFiltersForClass
@@ -79,7 +80,7 @@ sub getFiltersForClass {
 	my (@records) = @_;
 
 	my @filters;
-	push @filters, [ 'Display all possible records' => 'all', selected => undef ];
+	push @filters, [ "\x{27E8}Display all possible records\x{27E9}" => 'all', selected => undef ];
 
 	if (ref $records[0] eq 'WeBWorK::DB::Record::User') {
 		my (%sections, %recitations);
@@ -91,14 +92,33 @@ sub getFiltersForClass {
 
 		if (keys %sections > 1) {
 			for my $sec (sortByName(undef, keys %sections)) {
-				push @filters, [ ($sec ne '' ? "Display section $sec" : 'Display section <blank>') => "section:$sec" ];
+				push @filters, [ ($sec ne '' ? "Section: $sec" : 'No Section') => "section:$sec" ];
 			}
 		}
 
 		if (keys %recitations > 1) {
 			for my $rec (sortByName(undef, keys %recitations)) {
-				push @filters,
-					[ ($rec ne '' ? "Display recitation $rec" : 'Display recitation <blank>') => "recitation:$rec" ];
+				push @filters, [ ($rec ne '' ? "Recitation: $rec" : 'No Recitation') => "recitation:$rec" ];
+			}
+		}
+	} elsif (ref $records[0] eq 'WeBWorK::DB::Record::Set') {
+		my (%assignment_types, %visibles);
+
+		for my $set (@records) {
+			++$assignment_types{ $set->assignment_type };
+			++$visibles{ $set->visible }
+				unless (defined $visibles{0} && $set->visible eq '' || defined $visibles{''} && $set->visible eq '0');
+		}
+
+		if (keys %assignment_types > 1) {
+			for my $type (sortByName(undef, keys %assignment_types)) {
+				push @filters, [ FIELD_PROPERTIES()->{assignment_type}{labels}{$type} => "assignment_type:$type" ];
+			}
+		}
+
+		if (keys %visibles > 1) {
+			for my $vis (sortByName(undef, keys %visibles)) {
+				push @filters, [ ($vis ? 'Visible' : "Not Visible") => "visible:$vis" ];
 			}
 		}
 	}

lib/WeBWorK/Utils/FormatRecords.pm

@@ -55,7 +55,8 @@ use warnings;
 
 use Carp;
 
-use WeBWorK::Utils qw/format_set_name_display/;
+use WeBWorK::Utils qw/format_set_name_display formatDateTime/;
+use WeBWorK::ContentGenerator::Instructor::ProblemSetDetail qw/FIELD_PROPERTIES/;
 
 our @EXPORT_OK = qw(
 	getFormatsForClass
@@ -65,16 +66,16 @@ our @EXPORT_OK = qw(
 use constant PRESET_FORMATS => {
 	'WeBWorK::DB::Record::User' => [
 		[
-			'uid_lnfn' => {
-				name          => 'user_id - last_name, first_name',
-				field_order   => [qw/user_id last_name first_name/],
-				format_string => '%s - %s, %s',
+			'lnfn_email' => {
+				name          => 'last_name, first_name (email_address)',
+				field_order   => [qw/last_name first_name email_address/],
+				format_string => '%s, %s (%s)',
 			}
 		],
 		[
-			'lnfn_uid' => {
-				name          => 'last_name, first_name (user_id)',
-				field_order   => [qw/last_name first_name user_id/],
+			'lnfn_recitation' => {
+				name          => 'last_name, first_name (recitation)',
+				field_order   => [qw/last_name first_name recitation/],
 				format_string => '%s, %s (%s)',
 			}
 		],
@@ -85,13 +86,6 @@ use constant PRESET_FORMATS => {
 				format_string => '%s, %s (%s)',
 			}
 		],
-		[
-			'lnfn_recitation' => {
-				name          => 'last_name, first_name (recitation)',
-				field_order   => [qw/last_name first_name recitation/],
-				format_string => '%s, %s (%s)',
-			}
-		],
 		[
 			'lnfn_secrec' => {
 				name          => 'last_name, first_name (section/recitation)',
@@ -100,14 +94,42 @@ use constant PRESET_FORMATS => {
 			}
 		],
 		[
-			'lnfn_email' => {
-				name          => 'last_name, first_name (email_address)',
-				field_order   => [qw/last_name first_name email_address/],
+			'lnfn_uid' => {
+				name          => 'last_name, first_name (user_id)',
+				field_order   => [qw/last_name first_name user_id/],
 				format_string => '%s, %s (%s)',
 			}
 		],
+		[
+			'uid_lnfn' => {
+				name          => 'user_id - last_name, first_name',
+				field_order   => [qw/user_id last_name first_name/],
+				format_string => '%s - %s, %s',
+			}
+		],
 	],
 	'WeBWorK::DB::Record::Set' => [
+		[
+			'type_sid_due' => {
+				name            => 'assignment_type: set_id, due_date',
+				field_order     => [qw/assignment_type set_id due_date/],
+				format_function => sub {
+					join('',
+						FIELD_PROPERTIES()->{assignment_type}{labels}{ $_[0] },
+						': ', format_set_name_display($_[1]),
+						', ', formatDateTime($_[2]));
+				}
+			}
+		],
+		[
+			'due_sid' => {
+				name            => 'due_date: set_id',
+				field_order     => [qw/due_date set_id/],
+				format_function => sub {
+					join('', formatDateTime($_[0]), ': ', format_set_name_display($_[1]));
+				}
+			}
+		],
 		[
 			'sid' => {
 				name            => 'set_id',

lib/WeBWorK/Utils/SortRecords.pm

@@ -57,7 +57,7 @@ use constant PRESET_SORTS => {
 	'WeBWorK::DB::Record::User' => [
 		[
 			'lnfn' => {
-				name   => 'last name, first name',
+				name   => 'last_name, first_name',
 				fields => [qw/last_name first_name/],
 			}
 		],
@@ -89,9 +89,9 @@ sub getSortsForClass {
 
 	my @class_presets = exists PRESET_SORTS->{$class} ? @{ PRESET_SORTS->{$class} } : ();
 
-	my @fields  = map { [ "Field: $_" => $_, $_ eq $default_sort ? (selected => undef) : () ] } $class->FIELDS;
-	my @presets = map { [ "Preset: $_->[1]{name}" => $_->[0], $_->[0] eq $default_sort ? (selected => undef) : () ] }
-		@class_presets;
+	my @fields = map { [ $_ => $_, $_ eq $default_sort ? (selected => undef) : () ] } $class->FIELDS;
+	my @presets =
+		map { [ $_->[1]{name} => $_->[0], $_->[0] eq $default_sort ? (selected => undef) : () ] } @class_presets;
 
 	return [ @fields, @presets ];
 }