Commit 96822c1

meisterTcubercsl

authored and

committed

Executable page: use badges for current contest.

(cherry picked from commit ac40ef6)

1 parent 5da9cb0 commit 96822c1Copy full SHA for 96822c1

File tree

2 files changed

+15

-3

lines changed

webapp
- src/Twig
  - TwigExtension.php
- templates/jury
  - executable.html.twig

2 files changed

+15

-3

lines changed

`‎webapp/src/Twig/TwigExtension.php‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use App\Entity\Judging;`
`11`	`11`	`use App\Entity\JudgingRun;`
`12`	`12`	`use App\Entity\Language;`
	`13`	`+use App\Entity\Problem;`
`13`	`14`	`use App\Entity\Submission;`
`14`	`15`	`use App\Entity\SubmissionFile;`
`15`	`16`	`use App\Entity\Testcase;`
`@@ -124,6 +125,7 @@ public function getFilters(): array`
`124`	`125`	`new TwigFilter('tsvField', [$this, 'toTsvField']),`
`125`	`126`	`new TwigFilter('fileTypeIcon', [$this, 'fileTypeIcon']),`
`126`	`127`	`new TwigFilter('problemBadge', [$this, 'problemBadge'], ['is_safe' => ['html']]),`
	`128`	`+ new TwigFilter('problemBadgeForProblemAndContest', [$this, 'problemBadgeForProblemAndContest'], ['is_safe' => ['html']]),`
`127`	`129`	`new TwigFilter('printMetadata', [$this, 'printMetadata'], ['is_safe' => ['html']]),`
`128`	`130`	`new TwigFilter('printWarningContent', [$this, 'printWarningContent'], ['is_safe' => ['html']]),`
`129`	`131`	`new TwigFilter('entityIdBadge', [$this, 'entityIdBadge'], ['is_safe' => ['html']]),`
`@@ -1106,6 +1108,16 @@ public function problemBadge(ContestProblem $problem): string`
`1106`	`1108`	`);`
`1107`	`1109`	`}`
`1108`	`1110`
	`1111`	`+ public function problemBadgeForProblemAndContest(Problem $problem, Contest $contest): string`
	`1112`	`+ {`
	`1113`	`+ foreach ($problem->getContestProblems() as $contestProblem) {`
	`1114`	`+ if ($contestProblem->getContest() === $contest) {`
	`1115`	`+ return $this->problemBadge($contestProblem);`
	`1116`	`+ }`
	`1117`	`+ }`
	`1118`	`+ return '';`
	`1119`	`+ }`
	`1120`	`+`
`1109`	`1121`	`public function printMetadata(?string $metadata): string`
`1110`	`1122`	`{`
`1111`	`1123`	`if ($metadata === null) {`

`‎webapp/templates/jury/executable.html.twig‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,21 +48,21 @@`
`48`	`48`	`{% if executable.type == 'compare' %}`
`49`	`49`	`{% for problem in executable.problemsCompare %}`
`50`	`50`	`<a href="{{ path('jury_problem', {'probId': problem.probid}) }}">`
`51`		`- p{{ problem.probid }}`
	`51`	`+ p{{ problem.probid }} {{ problem \| problemBadgeForProblemAndContest(current_contest) }}`
`52`	`52`	`</a>`
`53`	`53`	`{% set used = true %}`
`54`	`54`	`{% endfor %}`
`55`	`55`	`{% elseif executable.type == 'run' %}`
`56`	`56`	`{% for problem in executable.problemsRun %}`
`57`	`57`	`<a href="{{ path('jury_problem', {'probId': problem.probid}) }}">`
`58`		`- p{{ problem.probid }}`
	`58`	`+ p{{ problem.probid }} {{ problem \| problemBadgeForProblemAndContest(current_contest) }}`
`59`	`59`	`</a>`
`60`	`60`	`{% set used = true %}`
`61`	`61`	`{% endfor %}`
`62`	`62`	`{% elseif executable.type == 'compile' %}`
`63`	`63`	`{% for language in executable.languages %}`
`64`	`64`	`<a href="{{ path('jury_language', {'langId': language.langid}) }}">`
`65`		`- {{ language.langid }}`
	`65`	`+ {{ language \| entityIdBadge }}`
`66`	`66`	`</a>`
`67`	`67`	`{% set used = true %}`
`68`	`68`	`{% endfor %}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 96822c1

File tree

2 files changed

2 files changed

`‎webapp/src/Twig/TwigExtension.php‎`

`‎webapp/templates/jury/executable.html.twig‎`

0 commit comments