Skip to content

Commit eb0a205

Browse files
committed
Apply suggested changes from drgrice1 in PR review.
1 parent ea3e2f0 commit eb0a205

File tree

12 files changed

+47
-34
lines changed

12 files changed

+47
-34
lines changed

lib/WeBWorK/AchievementItems.pm

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ sub UserItems ($c, $userName, $set, $records) {
105105
$achievementItem->{count}--;
106106
$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
107107
$db->putGlobalUserAchievement($globalUserAchievement);
108-
$c->addgoodmessage($c->maketext('[_1] succesffuly used. [_2]', $achievementItem->name, $message));
108+
$c->addgoodmessage($c->maketext('[_1] successfuly used. [_2]', $achievementItem->name, $message));
109109
}
110110
}
111111

@@ -154,13 +154,19 @@ sub form_popup_menu_row ($c, %options) {
154154
$params{label_attr}{class} //= 'col-form-label';
155155
$params{menu_attr}{class} //= 'form-select';
156156

157-
unshift(@{ $params{values} }, [ $params{first_item} => '' ]) if $params{first_item};
157+
unshift(@{ $params{values} }, [ $params{first_item} => '', disabled => undef, selected => undef ])
158+
if $params{first_item};
158159

159160
my $row_contents = $c->tag(
160161
'div',
161162
class => 'form-floating',
162163
$c->c(
163-
$c->select_field($params{id} => $params{values}, %{ $params{menu_attr} }),
164+
$c->select_field(
165+
$params{id} => $params{values},
166+
id => $params{id},
167+
required => undef,
168+
%{ $params{menu_attr} }
169+
),
164170
$c->label_for($params{id} => $params{label_text}, %{ $params{label_attr} })
165171
)->join('')
166172
);

lib/WeBWorK/AchievementItems/ExtendDueDate.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ sub use_item ($self, $set, $records, $c) {
8383
$db->putUserSet($userSet);
8484

8585
return $c->maketext(
86-
'Closing date of this assignment extended by 24 hours to [_1].',
86+
'Close date of this assignment extended by 24 hours to [_1].',
8787
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
8888
);
8989
}

lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ sub use_item ($self, $set, $records, $c) {
7777
# $db->putSetVersion($set);
7878
#}
7979

80-
return $c->maketext('Close date of this test change to [_1].',
80+
return $c->maketext('Close date of this test extended by 24 hours to [_1].',
8181
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
8282
}
8383

lib/WeBWorK/AchievementItems/ExtendReducedDate.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ sub use_item ($self, $set, $records, $c) {
7676
$db->putUserSet($userSet);
7777

7878
return $c->maketext(
79-
'Reduced scoring date of this assignment exted by 24 hours to [_1].',
79+
'Reduced scoring date of this assignment extended by 24 hours to [_1].',
8080
$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat})
8181
);
8282
}

lib/WeBWorK/AchievementItems/HalfCreditProb.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sub print_form ($self, $set, $records, $c) {
4242
return WeBWorK::AchievementItems::form_popup_menu_row(
4343
$c,
4444
id => 'half_cred_problem_id',
45-
label_text => $c->maketext('Problem number to give half credit'),
45+
label_text => $c->maketext('Problem number to increase grade by 50%'),
4646
first_item => $c->maketext('Choose problem to increase grade by 50%.'),
4747
values => [
4848
map { [

lib/WeBWorK/AchievementItems/NoReducedCred.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ sub print_form ($self, $set, $records, $c) {
5454
return $c->tag(
5555
'p',
5656
$c->maketext(
57-
'Remove the reduced scoring pentaly from this assignment. Problems submitted before '
57+
'Remove the reduced scoring penalty from this assignment. Problems submitted before '
5858
. 'the close date on [_1] will earn full credit. Any problems that have already been '
5959
. 'penalized will have to be resubmitted for full credit.',
6060
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
@@ -74,7 +74,7 @@ sub use_item ($self, $set, $records, $c) {
7474
$userSet->reduced_scoring_date($set->due_date);
7575
$db->putUserSet($userSet);
7676

77-
return $c->maketext('Reduced scoring pentaly removed.');
77+
return $c->maketext('Reduced scoring penalty removed.');
7878
}
7979

8080
1;

lib/WeBWorK/AchievementItems/ReducedCred.pm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sub print_form ($self, $set, $records, $c) {
5656
'p',
5757
$c->maketext(
5858
'Extend the close date of this assignment to [_1] (an additional 24 hours). Any submissions during '
59-
. 'this additional time will be reducend and are worth [_2]% of their full value. [_3]',
59+
. 'this additional time will be reduced and are worth [_2]% of their full value. [_3]',
6060
$c->formatDateTime($set->due_date + ONE_DAY, $ce->{studentDateDisplayFormat}),
6161
100 * $ce->{pg}{ansEvalDefaults}{reducedScoringValue},
6262
$randomization_statement
@@ -103,8 +103,10 @@ sub use_item ($self, $set, $records, $c) {
103103
}
104104
$db->putUserSet($userSet);
105105

106-
return $c->maketext('Close date changed by 24 hours to [_1].',
107-
$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}));
106+
return $c->maketext(
107+
'Close date of this assignment extended by 24 hours to [_1].',
108+
$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
109+
);
108110
}
109111

110112
1;

lib/WeBWorK/AchievementItems/ResurrectGW.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ sub use_item ($self, $set, $records, $c) {
6464
$userSet->answer_date($set->answer_date);
6565
$db->putUserSet($userSet);
6666

67-
return $c->maketext('Close date of this test extended 24 hours to [_1].',
67+
return $c->maketext('Close date of this test extended by 24 hours to [_1].',
6868
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
6969
}
7070

lib/WeBWorK/AchievementItems/ResurrectHW.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ sub use_item ($self, $set, $records, $c) {
7070
$db->putUserSet($userSet);
7171

7272
return $c->maketext(
73-
'Closing date of this assignment extended by 24 hours to [_1].',
73+
'Close date of this assignment extended by 24 hours to [_1].',
7474
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
7575
);
7676
}

lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ sub use_item ($self, $set, $records, $c) {
8383
$db->putUserSet($userSet);
8484

8585
return $c->maketext(
86-
'Closing date of this assignment extended by 48 hours too [_1].',
86+
'Close date of this assignment extended by 48 hours to [_1].',
8787
$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
8888
);
8989
}

0 commit comments

Comments
 (0)