baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-12-18 01:31:54 +00:00
Code Issues Actions Packages Releases Activity

Compare commits

base: baoshuo:513cf6c2902add7cf86df35dfdd8ec320c00b7aa
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0
...
compare: baoshuo:df7d1784d39a26826f59e750f0a974dc8cb59dbe
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0

2 Commits
513cf6c290 ... df7d1784d3

Author SHA1 Message Date
Baoshuo
df7d1784d3
feat(contest/submissions): problem title in chooser
All checks were successful
continuous-integration/drone/push Build is passing
Details
2023-02-23 11:25:39 +08:00
Baoshuo
571d5cddc3
feat(submission): display contest 2023-02-23 11:16:15 +08:00
4 changed files with 26 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
web/app/controllers/contest_inside.php
View File

@ -426,8 +426,11 @@ function echoMySubmissions() {
$options = []; $options = [];
$options[] = ['value' => 'all', 'text' => '所有题目']; $options[] = ['value' => 'all', 'text' => '所有题目'];
for ($i = 0; $i < count($problems); $i++) { for ($i = 0; $i < count($problems); $i++) {
$letter = chr(ord('A') + $i); $problem = UOJContestProblem::query($problems[$i]);
$options[] = ['value' => $letter, 'text' => "{$letter} 题"]; $options[] = [
'value' => $problem->getLetter(),
'text' => $problem->getTitle(['with' => 'letter', 'simplify' => true]),
];
} }
$chosen = UOJRequest::get('p'); $chosen = UOJRequest::get('p');
@ -455,7 +458,7 @@ function echoMySubmissions() {
'show_all_submissions_status' => Cookie::get('show_all_submissions') !== null, 'show_all_submissions_status' => Cookie::get('show_all_submissions') !== null,
'options' => $options, 'options' => $options,
'chosen' => $chosen, 'chosen' => $chosen,
'conds' => $conds 'conds' => $conds,
]); ]);
} }

6
web/app/controllers/submission.php
View File

@ -265,7 +265,11 @@ if (isset($hack_form)) {
<div class="row mt-3 submission-layout d-md-grid"> <div class="row mt-3 submission-layout d-md-grid">
<div class="submission-right-col"> <div class="submission-right-col">
<?php UOJSubmission::cur()->echoStatusCard(['show_actual_score' => $perm['score'], 'id_hidden' => true], Auth::user()) ?> <?php UOJSubmission::cur()->echoStatusCard([
'show_actual_score' => $perm['score'],
'contest_problem_letter' => true,
'id_hidden' => true,
], Auth::user()) ?>
</div> </div>
<div class="submission-left-col"> <div class="submission-left-col">

3
web/app/models/UOJSubmission.php
View File

@ -621,9 +621,10 @@ class UOJSubmission {
} }
$rows = [ $rows = [
'id' => 'ID',
'submitter' => UOJLocale::get('problems::submitter'), 'submitter' => UOJLocale::get('problems::submitter'),
'id' => 'ID',
'problem' => UOJLocale::get('problems::problem'), 'problem' => UOJLocale::get('problems::problem'),
'contest' => UOJLocale::get('contests::contest'),
'result' => UOJLocale::get('problems::result'), 'result' => UOJLocale::get('problems::result'),
'used_time' => UOJLocale::get('problems::used time'), 'used_time' => UOJLocale::get('problems::used time'),
'used_memory' => UOJLocale::get('problems::used memory'), 'used_memory' => UOJLocale::get('problems::used memory'),

14
web/app/models/UOJSubmissionLikeTrait.php
View File

@ -256,6 +256,8 @@ trait UOJSubmissionLikeTrait {
'time_format' => 'normal', 'time_format' => 'normal',
'time_font_size' => 'small', 'time_font_size' => 'small',
'unknown_char' => '/', 'unknown_char' => '/',
'contest_problem_letter' => false,
'problem_title' => [],
]; ];
switch ($name) { switch ($name) {
@ -264,11 +266,21 @@ trait UOJSubmissionLikeTrait {
break; break;
case 'problem': case 'problem':
if ($this->problem) { if ($this->problem) {
echo $this->problem->getLink(isset($cfg['problem_title']) ? $cfg['problem_title'] : []); if ($cfg['contest_problem_letter']) {
echo $this->problem->getLink($cfg['problem_title'] + ['with' => 'letter', 'simplify' => true]);
} else {
echo $this->problem->getLink($cfg['problem_title']);
}
} else { } else {
echo '<span class="text-danger">?</span>'; echo '<span class="text-danger">?</span>';
} }
break; break;
case 'contest':
if ($this->problem && $this->problem->contest) {
echo $this->problem->contest->getLink();
} else {
echo '<span class="text-danger">?</span>';
}
case 'submitter': case 'submitter':
case 'owner': case 'owner':
case 'hacker': case 'hacker':