Skip to content

Fix clarifications for unlinked problems #3117

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

Merged
merged 2 commits into from
Oct 5, 2025
+11 −4
Merged

Fix clarifications for unlinked problems #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b245227
Fix clarifications for unlinked problems
meisterT Oct 5, 2025
b394952
Only display clarifications about Problems when the ContestProblem is…
vmcj Sep 24, 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
2 changes: 2 additions & 0 deletions webapp/src/Controller/API/ClarificationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,10 @@ protected function getQueryBuilder(Request $request): QueryBuilder
->leftJoin('clar.sender', 's')
->leftJoin('clar.recipient', 'r')
->leftJoin('clar.problem', 'p')
->innerJoin('c.problems', 'cp')
->select('clar, c, r, reply, p')
->andWhere('clar.contest = :cid')
->andWhere('clar.problem IS NULL OR clar.problem = cp.problem')
->setParameter('cid', $this->getContestId($request))
->orderBy('clar.clarid');

Expand Down
7 changes: 6 additions & 1 deletion webapp/src/Controller/Jury/ClarificationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,12 @@ public function viewAction(Request $request, int $id): Response
$clarcontest = $contest->getShortname();
$data['subjectlink'] = null;
if ($clar->getProblem()) {
$concernssubject = $contest->getCid() . "-" . $clar->getProblem()->getProbid();
if ($clar->getContestProblem()) {
$concernssubject = $contest->getCid() . "-" . $clar->getProblem()->getProbid();
} else {
// Very special case, this problem is unlinked.
$concernssubject = "";
}
$data['subjectlink'] = $this->generateUrl('jury_problem', ['probId' => $clar->getProblem()->getProbid()]);
} elseif ($clar->getCategory()) {
$concernssubject = $contest->getCid() . "-" . $clar->getCategory();
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/Twig/TwigExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,9 +1179,9 @@ public function fileTypeIcon(string $type): string
return 'fas fa-file-' . $iconName;
}

public function problemBadge(ContestProblem $problem, bool $grayedOut = false): string
public function problemBadge(?ContestProblem $problem, bool $grayedOut = false): string
{
$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');
$rgb = Utils::convertToHex($problem?->getColor() ?? '#ffffff');
if ($grayedOut || empty($rgb)) {
$rgb = Utils::convertToHex('whitesmoke');
}
Expand All @@ -1197,7 +1197,7 @@ public function problemBadge(ContestProblem $problem, bool $grayedOut = false):
$rgb,
$border,
$foreground,
$problem->getShortname()
$problem?->getShortname() ?? '?'
);
}

Expand Down
Loading