Add validation of the accomodation time factor.

Author: drgrice1

htdocs/js/ActionTabs/actiontabs.js

@@ -6,6 +6,7 @@
 		actionLink.addEventListener('show.bs.tab', () => {
 			if (takeAction) takeAction.value = actionLink.textContent;
 			if (currentAction) currentAction.value = actionLink.dataset.action;
+			takeAction.formNoValidate = actionLink.dataset.noValidate ? true : false;
 		});
 	});
 

htdocs/js/UserList/userlist.js

@@ -58,7 +58,7 @@
 					}
 				} else {
 					element?.classList.remove('is-invalid');
-					if (element.id in event_listeners) {
+					if (element && element.id in event_listeners) {
 						element?.removeEventListener('change', event_listeners[element.id]);
 						delete event_listeners[element.id];
 					}

lib/WeBWorK/ContentGenerator/Instructor/UserList.pm

@@ -98,21 +98,42 @@ use constant FIELDS => [
 	'recitation', 'comment',    'permission',                'password'
 ];
 
-# Note that only the editable fields need a type (i.e. all but user_id),
-# and only the text fields need a size.
+# Note that only the editable fields need a type (i.e. all but user_id).
+# The fields of type text or number may also include optional attributes for the HTML input.
+# Any field may also contain a perlValidate method that will be called to validate user input. If provided, it should be
+# a subroutine that takes the parameter value as its only argument, and returns a translatable error string if the
+# parameter value is not valid for the field, and 0 otherwise.
 use constant FIELD_PROPERTIES => {
 	user_id                   => { name => x('Login Name') },
-	first_name                => { name => x('First Name'),                type => 'text', size => 10 },
-	last_name                 => { name => x('Last Name'),                 type => 'text', size => 10 },
-	email_address             => { name => x('Email Address'),             type => 'text', size => 20 },
-	student_id                => { name => x('Student ID'),                type => 'text', size => 11 },
-	status                    => { name => x('Enrollment Status'),         type => 'status' },
-	accommodation_time_factor => { name => x('Accommodation Time Factor'), type => 'text', size => 5 },
-	section                   => { name => x('Section'),                   type => 'text', size => 3 },
-	recitation                => { name => x('Recitation'),                type => 'text', size => 3 },
-	comment                   => { name => x('Comment'),                   type => 'text', size => 20 },
-	permission                => { name => x('Permission Level'),          type => 'permission' },
-	password                  => { name => x('Password'),                  type => 'password' },
+	first_name                => { name => x('First Name'),        type => 'text', attributes => { size => 10 } },
+	last_name                 => { name => x('Last Name'),         type => 'text', attributes => { size => 10 } },
+	email_address             => { name => x('Email Address'),     type => 'text', attributes => { size => 20 } },
+	student_id                => { name => x('Student ID'),        type => 'text', attributes => { size => 11 } },
+	status                    => { name => x('Enrollment Status'), type => 'status' },
+	accommodation_time_factor => {
+		name       => x('Accommodation Time Factor'),
+		type       => 'number',
+		attributes => {
+			size  => 5,
+			min   => 1,
+			step  => 'any',
+			title => 'Enter a decimal number that is greater than or equal to 1.'
+		},
+		perlValidate => sub {
+			my $value = shift;
+			return $value !~ /^(\d+(\.\d*)?|\.\d+)$/ || $value <= 0
+				? (x(
+					'Accomodation time factor for [_1] unchanged. '
+					. 'A value was given that is not a decimal number or is not greater than or equal to 1.'
+				))[0]
+				: 0;
+		}
+	},
+	section    => { name => x('Section'),          type => 'text', attributes => { size => 3 } },
+	recitation => { name => x('Recitation'),       type => 'text', attributes => { size => 3 } },
+	comment    => { name => x('Comment'),          type => 'text', attributes => { size => 20 } },
+	permission => { name => x('Permission Level'), type => 'permission' },
+	password   => { name => x('Password'),         type => 'password' },
 };
 
 sub pre_header_initialize ($c) {
@@ -519,7 +540,14 @@ sub save_edit_handler ($c) {
 
 		for my $field ($User->NONKEYFIELDS()) {
 			my $newValue = $c->param("user.$userID.$field");
-			$User->$field($newValue) if defined $newValue;
+			next unless defined $newValue;
+			if (ref(FIELD_PROPERTIES()->{$field}{perlValidate}) eq 'CODE'
+				&& (my $error = FIELD_PROPERTIES()->{$field}{perlValidate}->($newValue)))
+			{
+				$c->addbadmessage($c->maketext($error, $userID));
+				next;
+			}
+			$User->$field($newValue);
 		}
 		$db->putUser($User);
 

templates/ContentGenerator/Instructor/UserList.html.ep

@@ -59,10 +59,15 @@
 				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
 					class            => "nav-link action-link$active$disabled",
 					id               => "$actionID-tab",
-					data             => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+					data             => {
+						action    => $actionID,
+						bs_toggle => 'tab',
+						bs_target => "#$actionID",
+						$actionID eq 'cancel_edit' ? (no_validate => 1) : ()
+					},
 					role             => 'tab',
 					'aria-controls'  => $actionID,
-					'aria-selected'  => $active ? 'true' : 'false' =%>
+					'aria-selected'  => $active ? 'true' : 'false', =%>
 			</li>
 		% end
 		% content_for 'tab-content' => begin

templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep

@@ -1,12 +1,13 @@
 % my $fieldName = 'user.' . $user->user_id . '.' . $field;
 % my $properties = $fieldProperties->{$field};
 %
-% if ($properties->{type} eq 'text') {
+% if ($properties->{type} eq 'text' || $properties->{type} eq 'number') {
 	% my $value = $user->$field;
 	% if ($c->{editMode}) {
-		<%= text_field $fieldName => $value, id => $fieldName . '_id', size => $properties->{size},
+		% my $field_method = "$properties->{type}_field";
+		<%= $c->$field_method($fieldName => $value, id => $fieldName . '_id', %{$properties->{attributes} // {}},
 			class => 'form-control form-control-sm d-inline w-auto',
-			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header') =%>
 	% } else {
 		% if ($field eq 'email_address') {
 			% if ($value =~ /\S/) {

templates/HelpFiles/InstructorUserList.html.ep

@@ -145,10 +145,11 @@
 	<dt><%= maketext('Give one student or several students additional time for all timed tests.') %></dt>
 	<dd>
 		<%= maketext('Click on the "Select" checkbox next to the names of the students that additional time is to be '
-			. 'assigned, click on the radio button for editing selected users and then click the "Edit" button .'
-			. 'Set the "Accesibility Time Factor" to the desired multiplier for each student selected. The time '
-			. 'that a student will have to complete a timed test will be the product of the "Test Time Limit" for the '
-			. 'test set in the "Sets Manager" and the "Accommodation Time Factor" set here.') =%>
+			. 'assigned, click on the radio button for editing selected users, and then click the "Edit" button. '
+			. 'Set the "Accommodation Time Factor" to the desired multiplier for each student selected (this must be a '
+			. 'decimal number that is greater than or equal to 1). The time that a student will have to complete a '
+			. 'timed test will be the product of the "Test Time Limit" for the test set in the "Sets Manager" and '
+			. 'the "Accommodation Time Factor" set here.') =%>
 	</dd>
 
 	<dt><%= maketext('Extend the number of attempts allowed a student on a given problem.') %></dt>