feat: keep questionnaires until submitted, remind teamers daily and take bus feedback per leg

This commit is contained in:
fromme committed 2026-11-10 16:38:51 +01:00
1 parent abf9c1be0b
commit e72616fdbf
37 files changed
+1119 -238

No files matched your search

+26 -2
View File
@@ -4,6 +4,7 @@ namespace App\Entity;
use App\Entity\Traits\BlameableEntity;
use App\Entity\Traits\TimestampableEntity;
use App\Enum\BusLeg;
use App\Enum\QuestionnaireResponseStatus;
use App\Model\Questionnaire\Definition;
use App\Repository\QuestionnaireResponseRepository;
@@ -19,6 +20,9 @@ use Symfony\Component\Uid\Uuid;
* who, where, when and the escort pickup - so those questions are not asked and the response stays
* readable when the assignment is edited later.
*
* A per-bus-leg questionnaire (Definition::$perBusLeg) has one response per escorted leg, the
* others one per disposition.
*
* Its subject is a Disposition today. A questionnaire about something else gets a nullable foreign
* key of its own beside $disposition, not a generic subject column.
*
@@ -26,7 +30,7 @@ use Symfony\Component\Uid\Uuid;
*/
#[ORM\Entity(repositoryClass: QuestionnaireResponseRepository::class)]
#[ORM\HasLifecycleCallbacks]
#[ORM\UniqueConstraint(name: 'questionnaire_disposition', columns: ['questionnaire', 'disposition_id'])]
#[ORM\UniqueConstraint(name: 'questionnaire_disposition_leg', columns: ['questionnaire', 'disposition_id', 'leg'])]
class QuestionnaireResponse implements BlameableEntityInterface, TimestampableEntityInterface
{
use BlameableEntity;
@@ -68,6 +72,13 @@ class QuestionnaireResponse implements BlameableEntityInterface, TimestampableEn
#[ORM\JoinColumn(onDelete: 'CASCADE')]
private ?Disposition $disposition = null;
/**
* A BusLeg value, or '' for a questionnaire without legs rather than null: part of the unique
* key, and MariaDB lets NULLs repeat in one.
*/
#[ORM\Column(length: 16, options: ['default' => ''])]
private string $leg = '';
private function __construct(Definition $definition)
{
$this->uuid = Uuid::v4();
@@ -75,10 +86,18 @@ class QuestionnaireResponse implements BlameableEntityInterface, TimestampableEn
$this->version = $definition->version;
}
public static function forDisposition(Definition $definition, Disposition $disposition): static
/**
* @param BusLeg|null $leg required for a per-bus-leg questionnaire, refused for any other
*/
public static function forDisposition(Definition $definition, Disposition $disposition, ?BusLeg $leg = null): static
{
if ($definition->perBusLeg !== (null !== $leg)) {
throw new \LogicException(sprintf('Questionnaire "%s" %s a bus leg', $definition->key, $definition->perBusLeg ? 'needs' : 'takes no'));
}
$instance = new static($definition);
$instance->disposition = $disposition;
$instance->leg = $leg->value ?? '';
return $instance;
}
@@ -180,6 +199,11 @@ class QuestionnaireResponse implements BlameableEntityInterface, TimestampableEn
return $this->disposition;
}
public function getLeg(): ?BusLeg
{
return BusLeg::tryFrom($this->leg);
}
private function assertDraft(): void
{
if ($this->isSubmitted()) {