Added Gedmo stuff, fix translations

.idea/inspectionProfiles/Project_Default.xml

@@ -73,6 +73,7 @@
     <inspection_tool class="PhpFullyQualifiedNameUsageInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="IGNORE_GLOBAL_NAMESPACE" value="true" />
     </inspection_tool>
+    <inspection_tool class="PhpPublicPropertyModifierCanBeOmittedInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="optionConfiguration">

config/packages/doctrine.yaml

@@ -22,6 +22,10 @@ doctrine:
         identity_generation_preferences:
             Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
         auto_mapping: true
+        filters:
+            softdeleteable:
+                class: Gedmo\SoftDeleteable\Filter\SoftDeleteableFilter
+                enabled: true
         mappings:
             Tvdt:
                 type: attribute

config/packages/stof_doctrine_extensions.yaml

@@ -5,3 +5,4 @@ stof_doctrine_extensions:
     orm:
         default:
             timestampable: true
+            softdeleteable: true

migrations/Version20260523095205.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260523095205 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add soft-delete support (deleted_at columns) and rename elimination.created to created_at';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE elimination ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE elimination RENAME COLUMN created TO created_at');
+        $this->addSql('ALTER TABLE given_answer ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE quiz_candidate ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE elimination DROP deleted_at');
+        $this->addSql('ALTER TABLE elimination RENAME COLUMN created_at TO created');
+        $this->addSql('ALTER TABLE given_answer DROP deleted_at');
+        $this->addSql('ALTER TABLE quiz_candidate DROP deleted_at');
+    }
+}

migrations/Version20260523095302.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260523095302 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add updated_at column to elimination table and set it to created_at';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE elimination ADD updated_at TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('UPDATE elimination SET updated_at = created_at');
+        $this->addSql('ALTER TABLE elimination ALTER updated_at SET NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE elimination DROP updated_at');
+        $this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITH TIME ZONE');
+    }
+}

src/Controller/EliminationController.php

@@ -55,7 +55,7 @@ final class EliminationController extends AbstractController
         $candidate = $this->candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
         if (!$candidate instanceof Candidate) {
             $this->addFlash(FlashType::Warning,
-                t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
+                t('Could not find candidate with name {name}', ['name' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
             );
 
             return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
@@ -64,7 +64,7 @@ final class EliminationController extends AbstractController
         $screenColour = $elimination->getScreenColour($candidate->name);
 
         if (null === $screenColour) {
-            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));
+            $this->addFlash(FlashType::Warning, $this->translator->trans('Could not find candidate with name {name} in elimination.', ['name' => $candidate->name]));
 
             return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
         }

src/Controller/LoginController.php

@@ -8,6 +8,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Enum\FlashType;

src/Entity/Elimination.php

@@ -7,15 +7,19 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
+use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\EliminationRepository;
 
+#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: EliminationRepository::class)]
-#[ORM\HasLifecycleCallbacks]
 class Elimination
 {
+    use SoftDeleteableEntity;
+    use TimestampableEntity;
     public const string SCREEN_GREEN = 'green';
 
     public const string SCREEN_RED = 'red';
@@ -30,10 +34,6 @@ class Elimination
     #[ORM\Column(type: Types::JSONB)]
     public array $data = [];
 
-    #[Gedmo\Timestampable(on: 'create')]
-    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
-    public private(set) \DateTimeImmutable $created;
-
     public function __construct(
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
         #[ORM\ManyToOne(inversedBy: 'eliminations')]

src/Entity/GivenAnswer.php

@@ -7,13 +7,17 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
+use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\GivenAnswerRepository;
 
+#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
 class GivenAnswer
 {
+    use SoftDeleteableEntity;
+
     #[ORM\Column(type: UuidType::NAME, unique: true)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]

src/Entity/Quiz.php

@@ -42,7 +42,7 @@ class Quiz
 
     /** @var Collection<int, Elimination> */
     #[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
-    #[ORM\OrderBy(['created' => 'DESC'])]
+    #[ORM\OrderBy(['createdAt' => 'DESC'])]
     public private(set) Collection $eliminations;
 
     public function __construct()

src/Entity/QuizCandidate.php

@@ -7,14 +7,17 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
+use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizCandidateRepository;
 
+#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
 #[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
 class QuizCandidate
 {
+    use SoftDeleteableEntity;
     #[ORM\Column(type: UuidType::NAME, unique: true)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]

src/Entity/User.php

@@ -89,13 +89,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this->password;
     }
 
-    /** @see UserInterface */
-    public function eraseCredentials(): void
-    {
-        // If you store any temporary, sensitive data on the user, clear it here
-        // $this->plainPassword = null;
-    }
-
     public function addSeason(Season $season): static
     {
         if (!$this->seasons->contains($season)) {

templates/backoffice/quiz/tab_overview.html.twig

@@ -1,5 +1,5 @@
 <div data-controller="bo--quiz">
-    <h4 class="mb-3">Quick actions</h4>
+    <h4 class="mb-3">{{ 'Quick actions'|trans }}</h4>
     <div class="mb-3 btn-group">
 
         {% if quiz is same as (season.activeQuiz) %}
@@ -28,7 +28,8 @@
                             data-bs-target="#question-{{ loop.index0 }}"
                             aria-controls="question-{{ loop.index0 }}">
                         {% set questionError = questionErrors[question.id.toString] ?? null %}
-                        <span class="badge rounded-pill me-2{% if questionError %} text-bg-danger{% else %} invisible{% endif %}"{% if questionError %} data-bs-toggle="tooltip" title="{{ questionError }}"{% endif %}>!</span>
+                        <span
+                            class="badge rounded-pill me-2{% if questionError %} text-bg-danger{% else %} invisible{% endif %}"{% if questionError %} data-bs-toggle="tooltip" title="{{ questionError }}"{% endif %}>!</span>
                         {{~ loop.index -}}. {{ question.question -}}
                     </button>
                 </h2>

templates/backoffice/quiz/tab_result.html.twig

@@ -1,77 +1,77 @@
 <h4 class="mb-3">{{ 'Score'|trans }}</h4>
-    <div class="btn-toolbar mb-3" role="toolbar">
-        <div class="btn-group me-2">
-            {# <a class="btn btn-primary">{{ 'Start Elimination'|trans }}</a> #}
-            <a href="{{ path('tvdt_prepare_elimination', {seasonCode: season.seasonCode, quiz: quiz.id}) }}"
-               class="btn btn-secondary">{{ 'Prepare Custom Elimination'|trans }}</a>
-            {%~ if not quiz.eliminations.empty %}
-                <button class="btn btn-secondary dropdown-toggle"
-                        data-bs-toggle="dropdown">{{ 'Load Prepared Elimination'|trans }}</button>
-                <ul class="dropdown-menu">
-                    {%~ for elimination in quiz.eliminations %}
-                        <li><a class="dropdown-item"
-                               href="{{ path('tvdt_prepare_elimination_view', {elimination: elimination.id}) }}">{{ elimination.created|format_datetime() }}</a>
-                        </li>
-                    {%~ endfor %}
-                </ul>
-            {% endif %}
-        </div>
+<div class="btn-toolbar mb-3" role="toolbar">
+    <div class="btn-group me-2">
+        {# <a class="btn btn-primary">{{ 'Start Elimination'|trans }}</a> #}
+        <a href="{{ path('tvdt_prepare_elimination', {seasonCode: season.seasonCode, quiz: quiz.id}) }}"
+           class="btn btn-secondary">{{ 'Prepare Custom Elimination'|trans }}</a>
+        {%~ if not quiz.eliminations.empty %}
+            <button class="btn btn-secondary dropdown-toggle"
+                    data-bs-toggle="dropdown">{{ 'Load Prepared Elimination'|trans }}</button>
+            <ul class="dropdown-menu">
+                {%~ for elimination in quiz.eliminations %}
+                    <li><a class="dropdown-item"
+                           href="{{ path('tvdt_prepare_elimination_view', {elimination: elimination.id}) }}">{{ elimination.createdAt|format_datetime() }}</a>
+                    </li>
+                {%~ endfor %}
+            </ul>
+        {% endif %}
     </div>
-    <p class="mb-3">{{ 'Number of dropouts:'|trans }}  {{ quiz.dropouts }} </p>
-    <table class="table table-hover mb-3">
-        <thead>
-        <tr>
-            <th scope="col">{{ 'Candidate'|trans }}</th>
-            <th style="width: 15%" scope="col">{{ 'Correct Answers'|trans }}</th>
-            <th style="width: 20%" scope="col">{{ 'Corrections'|trans }}</th>
-            <th style="width: 20%" scope="col">{{ 'Penalty'|trans }}</th>
-            <th style="width: 10%" scope="col">{{ 'Score'|trans }}</th>
-            <th style="width: 20%" scope="col">{{ 'Time'|trans }}</th>
+</div>
+<p class="mb-3">{{ 'Number of dropouts:'|trans }}  {{ quiz.dropouts }} </p>
+<table class="table table-hover mb-3">
+    <thead>
+    <tr>
+        <th scope="col">{{ 'Candidate'|trans }}</th>
+        <th style="width: 15%" scope="col">{{ 'Correct Answers'|trans }}</th>
+        <th style="width: 20%" scope="col">{{ 'Corrections'|trans }}</th>
+        <th style="width: 20%" scope="col">{{ 'Penalty'|trans }}</th>
+        <th style="width: 10%" scope="col">{{ 'Score'|trans }}</th>
+        <th style="width: 20%" scope="col">{{ 'Time'|trans }}</th>
+    </tr>
+    </thead>
+    <tbody>
+    {%~ for candidate in result ~%}
+        <tr class="table-{% if loop.revindex > quiz.dropouts %}success{% else %}danger{% endif %}">
+            <td>{{ candidate.name }}</td>
+            <td>{{ candidate.correct|default('0') }}</td>
+            <td>
+                <form method="post"
+                      action="{{ path('tvdt_backoffice_modify_correction', {quiz: quiz.id, candidate: candidate.id}) }}">
+                    <div class="row">
+                        <div class="col-8">
+                            <input class="form-control form-control-sm" type="number"
+                                   value="{{ candidate.corrections }}" step="0.5"
+                                   name="corrections">
+                        </div>
+                        <div class="col-2">
+                            <button class="btn btn-sm btn-primary" type="submit">{{ 'Save'|trans }}</button>
+                        </div>
+                    </div>
+                </form>
+            </td>
+            <td>
+                <form method="post"
+                      action="{{ path('tvdt_backoffice_modify_penalty', {quiz: quiz.id, candidate: candidate.id}) }}">
+                    <input type="hidden" name="_token" value="{{ csrf_token('candidate_answer') }}">
+                    <div class="row">
+                        <div class="col-8">
+                            <input class="form-control form-control-sm" type="number"
+                                   value="{{ candidate.penaltySeconds }}" step="1"
+                                   name="penalty">
+                        </div>
+                        <div class="col-2">
+                            <button class="btn btn-sm btn-primary" type="submit">{{ 'Save'|trans }}</button>
+                        </div>
+                    </div>
+                </form>
+            </td>
+            <td>{{ candidate.score|default('x') }}</td>
+            <td>{{ candidate.time.format('%i:%S') }}</td>
         </tr>
-        </thead>
-        <tbody>
-        {%~ for candidate in result ~%}
-            <tr class="table-{% if loop.revindex > quiz.dropouts %}success{% else %}danger{% endif %}">
-                <td>{{ candidate.name }}</td>
-                <td>{{ candidate.correct|default('0') }}</td>
-                <td>
-                    <form method="post"
-                          action="{{ path('tvdt_backoffice_modify_correction', {quiz: quiz.id, candidate: candidate.id}) }}">
-                        <div class="row">
-                            <div class="col-8">
-                                <input class="form-control form-control-sm" type="number"
-                                       value="{{ candidate.corrections }}" step="0.5"
-                                       name="corrections">
-                            </div>
-                            <div class="col-2">
-                                <button class="btn btn-sm btn-primary" type="submit">{{ 'Save'|trans }}</button>
-                            </div>
-                        </div>
-                    </form>
-                </td>
-                <td>
-                    <form method="post"
-                          action="{{ path('tvdt_backoffice_modify_penalty', {quiz: quiz.id, candidate: candidate.id}) }}">
-                        <input type="hidden" name="_token" value="{{ csrf_token('candidate_answer') }}">
-                        <div class="row">
-                            <div class="col-8">
-                                <input class="form-control form-control-sm" type="number"
-                                       value="{{ candidate.penaltySeconds }}" step="1"
-                                       name="penalty">
-                            </div>
-                            <div class="col-2">
-                                <button class="btn btn-sm btn-primary" type="submit">{{ 'Save'|trans }}</button>
-                            </div>
-                        </div>
-                    </form>
-                </td>
-                <td>{{ candidate.score|default('x') }}</td>
-                <td>{{ candidate.time.format('%i:%S') }}</td>
-            </tr>
-        {% else %}
-            <tr>
-                <td colspan="5">{{ 'No results'|trans }}</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+    {% else %}
+        <tr>
+            <td colspan="5">{{ 'No results'|trans }}</td>
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>

templates/backoffice/quiz_add.html.twig

@@ -13,7 +13,7 @@
 {% block body %}
     <div class="row">
         <div class="col-md-6 col-12">
-            <h2 class="mb-3">{{ t('Add a quiz to %name%', {'%name%': season.name})|trans }} </h2>
+            <h2 class="mb-3">{{ t('Add a quiz to {name}', {name: season.name})|trans }} </h2>
             {{ form_start(form) }}
             {{ form_row(form.name) }}
             {{ form_row(form.sheet) }}

templates/flashes.html.twig

@@ -4,7 +4,7 @@
         {% for label, messages in flashes %}
             {% for message in messages %}
                 <div class="alert alert-{{ label }} alert-dismissible " role="alert">
-                    {{ message }}
+                    {{ message|trans }}
                     <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
                 </div>
             {% endfor %}

translations/messages+intl-icu.nl.xliff

@@ -37,9 +37,9 @@
         <source>Add Quiz</source>
         <target>Test toevoegen</target>
       </trans-unit>
-      <trans-unit id="ehB6pAw" resname="Add a quiz to %name%">
-        <source>Add a quiz to %name%</source>
-        <target>Voeg een test toe aan %name%</target>
+      <trans-unit id="apgpM9w" resname="Add a quiz to {name}">
+        <source>Add a quiz to {name}</source>
+        <target>Voeg een test toe aan {name}</target>
       </trans-unit>
       <trans-unit id="qiXD5ve" resname="All Seasons">
         <source>All Seasons</source>
@@ -109,13 +109,13 @@
         <source>Corrections</source>
         <target>Jokers</target>
       </trans-unit>
-      <trans-unit id="Lu7u8U2" resname="Cound not find candidate with name %name%">
-        <source>Cound not find candidate with name %name%</source>
-        <target>Kon kandidaat met naam %name% niet vinden</target>
+      <trans-unit id="9JHLsoe" resname="Could not find candidate with name {name}">
+        <source>Could not find candidate with name {name}</source>
+        <target>Kon kandidaat met naam {name} niet vinden</target>
       </trans-unit>
-      <trans-unit id="YQUiB4T" resname="Cound not find candidate with name %name% in elimination.">
-        <source>Cound not find candidate with name %name% in elimination.</source>
-        <target>Kon geen kandidaat vinden met de naam %name% in de eliminatie</target>
+      <trans-unit id="h589jDz" resname="Could not find candidate with name {name} in elimination.">
+        <source>Could not find candidate with name {name} in elimination.</source>
+        <target>Kon geen kandidaat vinden met de naam {name} in de eliminatie</target>
       </trans-unit>
       <trans-unit id="0DvmToq" resname="Create a season">
         <source>Create a season</source>
@@ -301,6 +301,10 @@
         <source>Questions</source>
         <target>Vragen</target>
       </trans-unit>
+      <trans-unit id="1jiUI_8" resname="Quick actions">
+        <source>Quick actions</source>
+        <target>Snelle acties</target>
+      </trans-unit>
       <trans-unit id="0tv0gq." resname="Quiz">
         <source>Quiz</source>
         <target>Test</target>