Skip to content

icon alert if a date has been overrided for a user on the Assignments… #3030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex-Jordan wants to merge 1 commit into
base: WeBWorK-2.21
Choose a base branch
from
+43 −10
Open

icon alert if a date has been overrided for a user on the Assignments… #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions lib/WeBWorK/ContentGenerator/ProblemSets.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,13 @@ sub getSetStatus ($c, $set) {
my $status = 'past-due';
my $other_messages = $c->c;
if ($c->submitTime < $set->open_date) {
$status = 'not-open';
$status_msg =
$c->maketext('Will open on [_1].', $c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat}));
$status = 'not-open';
$status_msg = {
msg => $c->maketext(
'Will open on [_1].', $c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
),
override => $set->open_date != $c->db->getGlobalSet($set->set_id)->open_date
};
push(@$other_messages, $restricted_msg) if $restricted_msg;
} elsif ($c->submitTime < $set->due_date) {
$status = 'open';
Expand All @@ -141,7 +145,10 @@ sub getSetStatus ($c, $set) {
my $beginReducedScoringPeriod = $c->formatDateTime($set->reduced_scoring_date, $ce->{studentDateDisplayFormat});

if ($enable_reduced_scoring && $c->submitTime < $set->reduced_scoring_date) {
$status_msg = $c->maketext('Open. Due [_1].', $beginReducedScoringPeriod);
$status_msg = {
msg => $c->maketext('Open. Due [_1].', $beginReducedScoringPeriod),
override => $set->reduced_scoring_date != $c->db->getGlobalSet($set->set_id)->reduced_scoring_date
};
push(
@$other_messages,
$c->maketext(
Expand All @@ -151,7 +158,10 @@ sub getSetStatus ($c, $set) {
);
} elsif ($enable_reduced_scoring && $set->reduced_scoring_date && $c->submitTime > $set->reduced_scoring_date) {
$status = 'reduced';
$status_msg = $c->maketext('Due date [_1] has passed.', $beginReducedScoringPeriod);
$status_msg = {
msg => $c->maketext('Due date [_1] has passed.', $beginReducedScoringPeriod),
override => $set->reduced_scoring_date != $c->db->getGlobalSet($set->set_id)->reduced_scoring_date
};
push(
@$other_messages,
$c->maketext(
Expand All @@ -160,16 +170,25 @@ sub getSetStatus ($c, $set) {
)
);
} else {
$status_msg =
$c->maketext('Open. Due [_1].', $c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}));
$status_msg = {
msg => $c->maketext(
'Open. Due [_1].', $c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
),
override => $set->due_date != $c->db->getGlobalSet($set->set_id)->due_date
};
}

if ($restricted_msg) {
push(@$other_messages, $restricted_msg);
}
} elsif ($c->submitTime < $set->answer_date) {
$status_msg = $c->maketext('Answers available for review on [_1].',
$c->formatDateTime($set->answer_date, $ce->{studentDateDisplayFormat}));
$status_msg = {
msg => $c->maketext(
'Answers available for review on [_1].',
$c->formatDateTime($set->answer_date, $ce->{studentDateDisplayFormat})
),
override => $set->answer_date != $c->db->getGlobalSet($set->set_id)->answer_date
};
} else {
$status_msg = $c->maketext('Answers available for review.');
}
Expand Down
16 changes: 15 additions & 1 deletion templates/ContentGenerator/ProblemSets/set_list_row.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,21 @@
</a>
% }
</div>
<div class="font-sm"><%= $status_msg %></div>
<div class="font-sm">
% if (ref $status_msg) {
<%= $status_msg->{msg} %>
% if ($status_msg->{override}) {
<a class="set-id-tooltip px-1" role="button" tabindex="0" data-bs-placement="right"
data-bs-toggle="tooltip" data-fallback-placements="top bottom"
data-bs-title="<%= maketext('This date overrides the assignment date.') =%>">
<i class="icon fas fa-calendar-plus" aria-hidden="true"></i>
<span class="visually-hidden"><%= maketext('Date override alert') =%></span>
</a>
% }
% } else {
<%= $status_msg %>
% }
</div>
% if (!$set->visible && $authz->hasPermissions(param('user'), 'view_unopened_sets')) {
<div class="font-sm"><em><%= maketext('(This set is hidden from students.)') %></em></div>
% }
Expand Down