Skip to content

Don't display clarification time from before/after contest #3192

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Don't display clarification time from before/after contest #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b214ae
Don't display contest time from before/after contest
vmcj Oct 26, 2025
86d1949
Handle @eldering his feedback
vmcj Nov 12, 2025
b08f9ef
Address @meisterT his feedback
vmcj Nov 12, 2025
a278786
And second remark
vmcj Nov 12, 2025
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
12 changes: 11 additions & 1 deletion webapp/src/Twig/TwigExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,24 @@ public function printelapsedminutes(float $start, float $end): string
/**
* Print a time formatted as specified. The format is according to date().
* @param Contest|null $contest If given, print time relative to that contest start.
Copy link
Member

@meisterT meisterT Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: update params

Copy link
Member Author

@vmcj vmcj Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I probably misunderstand you but for now I'll assume you meant because of the new parameter added.

I don't think we should add basic parameters but only use a @param in case we really need to explain that parameter which I would say is actually an anti-pattern or in case of arrays where we need to show the type of the array.

* @param bool $maskOutsideContest, When true and contest is given replace time with before/after.
*/
public function printtime(string|float|null $datetime, ?string $format = null, ?Contest $contest = null): string
public function printtime(string|float|null $datetime, ?string $format = null, ?Contest $contest = null, bool $maskOutsideContest = true): string
{
if ($datetime === null) {
$datetime = Utils::now();
}
if ($contest !== null && $this->config->get('show_relative_time')) {
$relativeTime = $contest->getContestTime((float)$datetime);
if ($maskOutsideContest) {
if ($relativeTime < 0) {
return "Before contest";
}
if ($relativeTime > $contest->getContestTime($contest->getEndtime())) {
// The case where it would be exactly at EndTime is important to display
return "After contest";
}
}
$sign = ($relativeTime < 0 ? -1 : 1);
$relativeTime *= $sign;
// We're not showing seconds, while the last minute before
Expand Down
2 changes: 1 addition & 1 deletion webapp/templates/partials/problem_list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
data-bs-html="true"
title="Between {{ stat.start.timestamp | printtime(null, contest) }} and {{ stat.end.timestamp | printtime(null, contest) }}:<br/>{{ label }}">
title="Between {{ stat.start.timestamp | printtime(null, contest, false) }} and {{ stat.end.timestamp | printtime(null, contest, false) }}:<br/>{{ label }}">
</div>
{% endfor %}
</div>
Expand Down
Loading