add Paste code to submit feature #2720
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -201,6 +201,14 @@ | |
| - category: Display | ||
| description: Options related to the DOMjudge user interface. | ||
| items: | ||
| - name: default_submission_code_mode | ||
| type: int | ||
|
||
| default_value: 0 | ||
| public: true | ||
| description: Select the default submission method for the team | ||
|
||
| options: | ||
| 0: Paste | ||
| 1: Upload | ||
| - name: output_display_limit | ||
| type: int | ||
| default_value: 2000 | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| use App\Entity\Submission; | ||
| use App\Entity\Testcase; | ||
| use App\Form\Type\SubmitProblemType; | ||
| use App\Form\Type\SubmitProblemPasteType; | ||
| use App\Service\ConfigurationService; | ||
| use App\Service\DOMJudgeService; | ||
| use App\Service\EventLogService; | ||
|
|
@@ -60,47 +61,111 @@ public function createAction(Request $request, ?Problem $problem = null): Respon | |
| if ($problem !== null) { | ||
| $data['problem'] = $problem; | ||
| } | ||
| $formUpload = $this->formFactory | ||
| ->createBuilder(SubmitProblemType::class, $data) | ||
| ->setAction($this->generateUrl('team_submit')) | ||
| ->getForm(); | ||
|
|
||
| $formPaste = $this->formFactory | ||
| ->createBuilder(SubmitProblemPasteType::class, $data) | ||
| ->setAction($this->generateUrl('team_submit')) | ||
| ->getForm(); | ||
|
|
||
| $formUpload->handleRequest($request); | ||
| $formPaste->handleRequest($request); | ||
| if ($formUpload->isSubmitted() || $formPaste->isSubmitted()) { | ||
| if ($contest === null) { | ||
| $this->addFlash('danger', 'No active contest'); | ||
| } elseif (!$this->dj->checkrole('jury') && !$contest->getFreezeData()->started()) { | ||
| $this->addFlash('danger', 'Contest has not yet started'); | ||
| } else { | ||
| $problem = null; | ||
| $language = null; | ||
| $files = []; | ||
| $entryPoint = null; | ||
| $message = ''; | ||
|
|
||
| if ($formUpload->isSubmitted() && $formUpload->isValid()) { | ||
| $problem = $formUpload->get('problem')->getData(); | ||
| $language = $formUpload->get('language')->getData(); | ||
| $files = $formUpload->get('code')->getData(); | ||
| if (!is_array($files)) { | ||
| $files = [$files]; | ||
| } | ||
| $entryPoint = $formUpload->get('entry_point')->getData() ?: null; | ||
| } elseif ($formPaste->isSubmitted() && $formPaste->isValid()) { | ||
| $problem = $formPaste->get('problem')->getData(); | ||
| $language = $formPaste->get('language')->getData(); | ||
| $codeContent = $formPaste->get('code_content')->getData(); | ||
|
|
||
| if ($codeContent == null || empty(trim($codeContent))) { | ||
| $this->addFlash('danger', 'No code content provided.'); | ||
| return $this->redirectToRoute('team_index'); | ||
| } | ||
|
|
||
| $tempDir = sys_get_temp_dir(); | ||
| $tempFileName = sprintf( | ||
| 'submission_%s_%s_%s.%s', | ||
| $user->getUsername(), | ||
| $problem->getName(), | ||
| date('Y-m-d_H-i-s'), | ||
| $language->getExtensions()[0] | ||
| ); | ||
| $tempFileName = preg_replace('/[^a-zA-Z0-9_.-]/', '_', $tempFileName); | ||
| $tempFilePath = $tempDir . DIRECTORY_SEPARATOR . $tempFileName; | ||
| file_put_contents($tempFilePath, $codeContent); | ||
|
|
||
| $uploadedFile = new UploadedFile( | ||
| $tempFilePath, | ||
| $tempFileName, | ||
|
||
| 'application/octet-stream', | ||
| null, | ||
| true | ||
| ); | ||
|
|
||
| $files = [$uploadedFile]; | ||
| $entryPoint = $tempFileName; | ||
|
||
| } | ||
|
|
||
| if ($problem && $language && !empty($files)) { | ||
| $submission = $this->submissionService->submitSolution( | ||
| $team, | ||
| $this->dj->getUser(), | ||
| $problem->getProbid(), | ||
| $contest, | ||
| $language, | ||
| $files, | ||
| 'team page', | ||
| null, | ||
| null, | ||
| $entryPoint, | ||
| null, | ||
| null, | ||
| $message | ||
| ); | ||
|
|
||
| if ($submission) { | ||
| $this->addFlash('success', 'Submission done! Watch for the verdict in the list below.'); | ||
| } else { | ||
| $this->addFlash('danger', $message); | ||
| } | ||
|
|
||
| return $this->redirectToRoute('team_index'); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| $active_tab = (bool) $this->config->get('default_submission_code_mode') == 0 ? 'paste' : 'upload'; | ||
| if ($this->dj->getCookie('active_tab') != null) { | ||
| $active_tab = $this->dj->getCookie('active_tab'); | ||
| } | ||
|
|
||
| $data = [ | ||
| 'formupload' => $formUpload->createView(), | ||
| 'formpaste' => $formPaste->createView(), | ||
| 'active_tab' => $active_tab, | ||
| 'problem' => $problem, | ||
| ]; | ||
| $data['validFilenameRegex'] = SubmissionService::FILENAME_REGEX; | ||
|
|
||
| if ($request->isXmlHttpRequest()) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php declare(strict_types=1); | ||
|
|
||
| namespace App\Form\Type; | ||
|
|
||
| use App\Entity\Language; | ||
| use App\Entity\Problem; | ||
| use App\Service\ConfigurationService; | ||
| use App\Service\DOMJudgeService; | ||
| use Doctrine\ORM\EntityManagerInterface; | ||
| use Doctrine\ORM\EntityRepository; | ||
| use Doctrine\ORM\Query\Expr\Join; | ||
| use Symfony\Bridge\Doctrine\Form\Type\EntityType; | ||
| use Symfony\Component\Form\AbstractType; | ||
| use Symfony\Component\Form\Extension\Core\Type\TextareaType; | ||
| use Symfony\Component\Form\Extension\Core\Type\TextType; | ||
| use Symfony\Component\Form\Form; | ||
| use Symfony\Component\Form\FormBuilderInterface; | ||
| use Symfony\Component\Form\FormEvent; | ||
| use Symfony\Component\Form\FormEvents; | ||
| use Symfony\Component\Validator\Constraints\Callback; | ||
| use Symfony\Component\Validator\Context\ExecutionContextInterface; | ||
| use Symfony\Component\Form\Extension\Core\Type\HiddenType; | ||
|
|
||
| class SubmitProblemPasteType extends AbstractType | ||
| { | ||
| public function __construct( | ||
| protected readonly DOMJudgeService $dj, | ||
| protected readonly ConfigurationService $config, | ||
| protected readonly EntityManagerInterface $em | ||
| ) { | ||
| } | ||
|
|
||
| public function buildForm(FormBuilderInterface $builder, array $options): void | ||
| { | ||
| $user = $this->dj->getUser(); | ||
| $contest = $this->dj->getCurrentContest($user->getTeam()->getTeamid()); | ||
|
|
||
| $builder->add('code_content', HiddenType::class, [ | ||
| 'required' => true, | ||
| ]); | ||
| $problemConfig = [ | ||
| 'class' => Problem::class, | ||
| 'query_builder' => fn(EntityRepository $er) => $er->createQueryBuilder('p') | ||
| ->join('p.contest_problems', 'cp', Join::WITH, 'cp.contest = :contest') | ||
| ->select('p', 'cp') | ||
| ->andWhere('cp.allowSubmit = 1') | ||
| ->setParameter('contest', $contest) | ||
| ->addOrderBy('cp.shortname'), | ||
| 'choice_label' => fn(Problem $problem) => sprintf( | ||
| '%s - %s', | ||
| $problem->getContestProblems()->first()->getShortName(), | ||
| $problem->getName() | ||
| ), | ||
| 'placeholder' => 'Select a problem', | ||
| ]; | ||
| $builder->add('problem', EntityType::class, $problemConfig); | ||
|
|
||
| $builder->add('language', EntityType::class, [ | ||
| 'class' => Language::class, | ||
| 'query_builder' => fn(EntityRepository $er) => $er | ||
| ->createQueryBuilder('l') | ||
| ->andWhere('l.allowSubmit = 1'), | ||
| 'choice_label' => 'name', | ||
| 'placeholder' => 'Select a language', | ||
| ]); | ||
|
|
||
| $builder->add('entry_point', TextType::class, [ | ||
| 'label' => 'Entry point', | ||
| 'required' => false, | ||
| 'help' => 'The entry point for your code.', | ||
| 'row_attr' => ['data-entry-point' => ''] | ||
| ]); | ||
| $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($problemConfig) { | ||
| $data = $event->getData(); | ||
| if (isset($data['problem'])) { | ||
| $problemConfig += ['row_attr' => ['class' => 'd-none']]; | ||
| $event->getForm()->add('problem', EntityType::class, $problemConfig); | ||
| } | ||
| }); | ||
| } | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.