Skip to content

Commit 12fe269

Browse files
as6325400as6325400
committed
add Paste code to submit feature
1 parent 3324986 commit 12fe269

File tree

5 files changed

+286
-23
lines changed

5 files changed

+286
-23
lines changed

‎etc/db-config.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@
201201
- category: Display
202202
description: Options related to the DOMjudge user interface.
203203
items:
204+
- name: default_submission_code_mode
205+
type: int
206+
default_value: 0
207+
public: true
208+
description: Select the default submission method for the team
209+
options:
210+
0: Paste
211+
1: Upload
204212
- name: output_display_limit
205213
type: int
206214
default_value: 2000

‎webapp/src/Controller/Team/SubmissionController.php‎

Lines changed: 94 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use App\Entity\Submission;
1010
use App\Entity\Testcase;
1111
use App\Form\Type\SubmitProblemType;
12+
use App\Form\Type\SubmitProblemPasteType;
1213
use App\Service\ConfigurationService;
1314
use App\Service\DOMJudgeService;
1415
use App\Service\SubmissionService;
@@ -54,34 +55,111 @@ public function createAction(Request $request, ?Problem $problem = null): Respon
5455
if ($problem !== null) {
5556
$data['problem'] = $problem;
5657
}
57-
$form = $this->formFactory
58+
$formUpload = $this->formFactory
5859
->createBuilder(SubmitProblemType::class, $data)
5960
->setAction($this->generateUrl('team_submit'))
6061
->getForm();
6162

62-
$form->handleRequest($request);
63+
$formPaste = $this->formFactory
64+
->createBuilder(SubmitProblemPasteType::class, $data)
65+
->setAction($this->generateUrl('team_submit'))
66+
->getForm();
6367

64-
if ($form->isSubmitted() && $form->isValid()) {
68+
$formUpload->handleRequest($request);
69+
$formPaste->handleRequest($request);
70+
71+
if ($formUpload->isSubmitted() && $formUpload->isValid()) {
6572
if ($contest === null) {
6673
$this->addFlash('danger', 'No active contest');
6774
} elseif (!$this->dj->checkrole('jury') && !$contest->getFreezeData()->started()) {
6875
$this->addFlash('danger', 'Contest has not yet started');
6976
} else {
7077
/** @var Problem $problem */
71-
$problem = $form->get('problem')->getData();
78+
$problem = $formUpload->get('problem')->getData();
7279
/** @var Language $language */
73-
$language = $form->get('language')->getData();
80+
$language = $formUpload->get('language')->getData();
7481
/** @var UploadedFile[] $files */
75-
$files = $form->get('code')->getData();
82+
$files = $formUpload->get('code')->getData();
7683
if (!is_array($files)) {
7784
$files = [$files];
7885
}
79-
$entryPoint = $form->get('entry_point')->getData() ?: null;
86+
$entryPoint = $formUpload->get('entry_point')->getData() ?: null;
8087
$submission = $this->submissionService->submitSolution(
81-
$team, $this->dj->getUser(), $problem->getProbid(), $contest, $language, $files, 'team page', null,
82-
null, $entryPoint, null, null, $message
88+
$team,
89+
$this->dj->getUser(),
90+
$problem->getProbid(),
91+
$contest,
92+
$language,
93+
$files,
94+
'team page',
95+
null,
96+
null,
97+
$entryPoint,
98+
null,
99+
null,
100+
$message
101+
);
102+
103+
if ($submission) {
104+
$this->addFlash(
105+
'success',
106+
'Submission done! Watch for the verdict in the list below.'
107+
);
108+
} else {
109+
$this->addFlash('danger', $message);
110+
}
111+
return $this->redirectToRoute('team_index');
112+
}
113+
} elseif ($formPaste->isSubmitted() && $formPaste->isValid()) {
114+
if ($contest === null) {
115+
$this->addFlash('danger', 'No active contest');
116+
} elseif (!$this->dj->checkrole('jury') && !$contest->getFreezeData()->started()) {
117+
$this->addFlash('danger', 'Contest has not yet started');
118+
} else {
119+
$problem = $formPaste->get('problem')->getData();
120+
$language = $formPaste->get('language')->getData();
121+
$codeContent = $formPaste->get('code_content')->getData();
122+
if($codeContent == null || empty(trim($codeContent))) {
123+
$this->addFlash('danger','No code content provided.');
124+
return $this->redirectToRoute('team_index');
125+
}
126+
$tempDir = sys_get_temp_dir();
127+
$tempFileName = sprintf(
128+
'submission_%s_%s_%s.%s',
129+
$user->getUsername(),
130+
$problem->getName(),
131+
date('Y-m-d_H-i-s'),
132+
$language->getExtensions()[0]
83133
);
134+
$tempFileName = preg_replace('/[^a-zA-Z0-9_.-]/', '_', $tempFileName);
135+
$tempFilePath = $tempDir . DIRECTORY_SEPARATOR . $tempFileName;
136+
file_put_contents($tempFilePath, $codeContent);
84137

138+
$uploadedFile = new UploadedFile(
139+
$tempFilePath,
140+
$tempFileName,
141+
'application/octet-stream',
142+
null,
143+
true
144+
);
145+
146+
$files = [$uploadedFile];
147+
$entryPoint = $formPaste->get('entry_point')->getData() ?: null;
148+
$submission = $this->submissionService->submitSolution(
149+
$team,
150+
$this->dj->getUser(),
151+
$problem,
152+
$contest,
153+
$language,
154+
$files,
155+
'team page',
156+
null,
157+
null,
158+
$entryPoint,
159+
null,
160+
null,
161+
$message
162+
);
85163
if ($submission) {
86164
$this->addFlash(
87165
'success',
@@ -90,11 +168,17 @@ public function createAction(Request $request, ?Problem $problem = null): Respon
90168
} else {
91169
$this->addFlash('danger', $message);
92170
}
171+
93172
return $this->redirectToRoute('team_index');
94173
}
95174
}
96175

97-
$data = ['form' => $form->createView(), 'problem' => $problem];
176+
$data = [
177+
'formupload' => $formUpload->createView(),
178+
'formpaste' => $formPaste->createView(),
179+
'problem' => $problem,
180+
'defaultSubmissionCodeMode' => (bool) $this->config->get('default_submission_code_mode'),
181+
];
98182
$data['validFilenameRegex'] = SubmissionService::FILENAME_REGEX;
99183

100184
if ($request->isXmlHttpRequest()) {

‎webapp/src/Form/Type/SubmitProblemPasteType.php‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace App\Form\Type;
4+
5+
use App\Entity\Language;
6+
use App\Entity\Problem;
7+
use App\Service\ConfigurationService;
8+
use App\Service\DOMJudgeService;
9+
use Doctrine\ORM\EntityManagerInterface;
10+
use Doctrine\ORM\EntityRepository;
11+
use Doctrine\ORM\Query\Expr\Join;
12+
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
13+
use Symfony\Component\Form\AbstractType;
14+
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
15+
use Symfony\Component\Form\Extension\Core\Type\TextType;
16+
use Symfony\Component\Form\Form;
17+
use Symfony\Component\Form\FormBuilderInterface;
18+
use Symfony\Component\Form\FormEvent;
19+
use Symfony\Component\Form\FormEvents;
20+
use Symfony\Component\Validator\Constraints\Callback;
21+
use Symfony\Component\Validator\Context\ExecutionContextInterface;
22+
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
23+
24+
class SubmitProblemPasteType extends AbstractType
25+
{
26+
public function __construct(
27+
protected readonly DOMJudgeService $dj,
28+
protected readonly ConfigurationService $config,
29+
protected readonly EntityManagerInterface $em
30+
) {
31+
}
32+
33+
public function buildForm(FormBuilderInterface $builder, array $options): void
34+
{
35+
$user = $this->dj->getUser();
36+
$contest = $this->dj->getCurrentContest($user->getTeam()->getTeamid());
37+
38+
$builder->add('code_content', HiddenType::class, [
39+
'required' => true,
40+
]);
41+
$problemConfig = [
42+
'class' => Problem::class,
43+
'query_builder' => fn(EntityRepository $er) => $er->createQueryBuilder('p')
44+
->join('p.contest_problems', 'cp', Join::WITH, 'cp.contest = :contest')
45+
->select('p', 'cp')
46+
->andWhere('cp.allowSubmit = 1')
47+
->setParameter('contest', $contest)
48+
->addOrderBy('cp.shortname'),
49+
'choice_label' => fn(Problem $problem) => sprintf(
50+
'%s - %s',
51+
$problem->getContestProblems()->first()->getShortName(),
52+
$problem->getName()
53+
),
54+
'placeholder' => 'Select a problem',
55+
];
56+
$builder->add('problem', EntityType::class, $problemConfig);
57+
58+
$builder->add('language', EntityType::class, [
59+
'class' => Language::class,
60+
'query_builder' => fn(EntityRepository $er) => $er
61+
->createQueryBuilder('l')
62+
->andWhere('l.allowSubmit = 1'),
63+
'choice_label' => 'name',
64+
'placeholder' => 'Select a language',
65+
]);
66+
67+
$builder->add('entry_point', TextType::class, [
68+
'label' => 'Entry point',
69+
'required' => false,
70+
'help' => 'The entry point for your code.',
71+
'row_attr' => ['data-entry-point' => ''],
72+
'constraints' => [
73+
new Callback(function ($value, ExecutionContextInterface $context) {
74+
/** @var Form $form */
75+
$form = $context->getRoot();
76+
/** @var Language $language */
77+
$language = $form->get('language')->getData();
78+
if ($language && $language->getRequireEntryPoint() && empty($value)) {
79+
$message = sprintf(
80+
'%s required, but not specified',
81+
$language->getEntryPointDescription() ?: 'Entry point'
82+
);
83+
$context
84+
->buildViolation($message)
85+
->atPath('entry_point')
86+
->addViolation();
87+
}
88+
}),
89+
]
90+
]);
91+
$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($problemConfig) {
92+
$data = $event->getData();
93+
if (isset($data['problem'])) {
94+
$problemConfig += ['row_attr' => ['class' => 'd-none']];
95+
$event->getForm()->add('problem', EntityType::class, $problemConfig);
96+
}
97+
});
98+
}
99+
}

‎webapp/templates/base.html.twig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<script src="{{ asset("js/bootstrap.bundle.min.js") }}"></script>
1515

1616
<script src="{{ asset("js/domjudge.js") }}"></script>
17+
<script src="{{ asset('js/ace/ace.js') }}"></script>
18+
1719
{% for file in customAssetFiles('js') %}
1820
<script src="{{ asset('js/custom/' ~ file) }}"></script>
1921
{% endfor %}

‎webapp/templates/team/submit_modal.html.twig‎

Lines changed: 83 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,64 @@
1919
{% include 'partials/alert.html.twig' with {'type': 'danger', 'message': 'Submissions (temporarily) disabled.'} %}
2020
</div>
2121
{% else %}
22-
{{ form_start(form) }}
22+
{% set active_tab = defaultSubmissionCodeMode == 0 ? 'paste' : 'upload' %}
23+
24+
<!-- Bootstrap Nav Tabs for Switching -->
2325
<div class="modal-body">
24-
{{ form_row(form.code) }}
25-
<div class="alert d-none" id="files_selected"></div>
26-
{{ form_row(form.problem) }}
27-
{{ form_row(form.language) }}
28-
{{ form_row(form.entry_point) }}
29-
</div>
30-
<div class="modal-footer">
31-
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
32-
<button type="submit" class="btn-success btn">
33-
<i class="fas fa-cloud-upload-alt"></i> Submit
34-
</button>
26+
<ul class="nav nav-tabs container text-center" id="submissionTabs" role="tablist" style="width: 100%">
27+
<li class="nav-item" role="presentation">
28+
<a class="nav-link {% if active_tab == 'upload' %}active{% endif %}" id="upload-tab" data-bs-toggle="tab" href="#upload" role="tab" aria-controls="upload" aria-selected="{% if active_tab == 'upload' %}true{% else %}false{% endif %}">Upload File</a>
29+
</li>
30+
<li class="nav-item text-center" role="presentation">
31+
<a class="nav-link {% if active_tab == 'paste' %}active{% endif %}" id="paste-tab" data-bs-toggle="tab" href="#paste" role="tab" aria-controls="paste" aria-selected="{% if active_tab == 'paste' %}true{% else %}false{% endif %}">Paste Code</a>
32+
</li>
33+
</ul>
34+
<div class="tab-content" id="submissionTabsContent" style="margin-top: 20px;">
35+
<!-- File Upload Tab -->
36+
<div class="tab-pane fade {% if active_tab == 'upload' %}show active{% endif %}" id="upload" role="tabpanel" aria-labelledby="upload-tab">
37+
{{ form_start(formupload) }}
38+
{{ form_row(formupload.code) }}
39+
<div class="alert d-none" id="files_selected"></div>
40+
{{ form_row(formupload.problem) }}
41+
{{ form_row(formupload.language) }}
42+
{{ form_row(formupload.entry_point) }}
43+
<div class="modal-footer">
44+
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
45+
<button type="submit" class="btn btn-success">
46+
<i class="fas fa-cloud-upload-alt"></i> Submit Upload
47+
</button>
48+
</div>
49+
{{ form_end(formupload) }}
50+
</div>
51+
52+
<!-- Paste Code Tab -->
53+
<div class="tab-pane fade {% if active_tab == 'paste' %}show active{% endif %}" id="paste" role="tabpanel" aria-labelledby="paste-tab">
54+
{{ form_start(formpaste) }}
55+
{{ form_widget(formpaste.code_content) }}
56+
<label for="codeInput">Paste your code here:</label>
57+
<div class="editor-container">
58+
{{ "" | codeEditor(
59+
"_team_submission_code",
60+
"c_cpp",
61+
true,
62+
formpaste.code_content.vars.id,
63+
null,
64+
formpaste.language.vars.value
65+
) }}
66+
</div>
67+
{{ form_row(formpaste.problem) }}
68+
{{ form_row(formpaste.language) }}
69+
{{ form_row(formpaste.entry_point) }}
70+
<div class="modal-footer">
71+
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
72+
<button type="submit" class="btn btn-primary">
73+
<i class="fas fa-paste"></i> Submit Paste
74+
</button>
75+
</div>
76+
{{ form_end(formpaste) }}
77+
</div>
78+
</div>
3579
</div>
36-
{{ form_end(form) }}
3780
{% endif %}
3881
</div>
3982
</div>
@@ -80,4 +123,31 @@
80123
filesSelected.removeClass('d-none');
81124
});
82125
</script>
126+
<style>
127+
.container {
128+
display: grid;
129+
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
130+
gap: 10px;
131+
}
132+
133+
.text-center {
134+
text-align: center;
135+
}
136+
137+
.editor-container {
138+
border: 1px solid #ddd;
139+
border-radius: 4px;
140+
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
141+
padding: 10px;
142+
margin-top: 10px;
143+
margin-bottom: 10px;
144+
background-color: #fafafa;
145+
max-height: 400px;
146+
overflow: auto;
147+
}
148+
149+
.editor-container:hover {
150+
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
151+
}
152+
</style>
83153
</div>

0 commit comments

Comments
 (0)