feat: keep questionnaires until submitted, remind teamers daily and take bus feedback per leg
This commit is contained in:
1 parent
abf9c1be0b
commit
e72616fdbf
37 files changed
+1119
-238
No files matched your search
@@ -133,7 +133,7 @@ class TestControllerTest extends WebTestCase
|
||||
$crawler = $this->client->request('GET', sprintf('/administrative/questionnaire/test/%s?bus_escort=1', $this->assignment->getUuid()));
|
||||
|
||||
$this->assertStringContainsString('Mit dem Bus-Feedback', $crawler->text());
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.bus_company"]'));
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.outbound.bus_company"]'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,7 +24,7 @@ use Symfony\Component\DomCrawler\Form;
|
||||
|
||||
/**
|
||||
* The teamer's page: one form, and as many responses as questionnaires apply - the teamer feedback
|
||||
* for every placement, the bus feedback as well after a bus escort.
|
||||
* for every placement, the bus feedback as well after a bus escort, once per ride escorted.
|
||||
*
|
||||
* Runs in a transaction that is rolled back; the client keeps its kernel so every request shares
|
||||
* that connection. The profile checks that would otherwise send the teamer elsewhere first are
|
||||
@@ -79,7 +79,9 @@ class EditControllerTest extends WebTestCase
|
||||
$this->assertStringContainsString('Reiseleitung', $crawler->filter('h1 + p')->text());
|
||||
$this->assertStringContainsString('Busbegleitung ab Stuttgart', $crawler->filter('h1 + p')->text());
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="teamer_feedback.office_briefing_rating"]'));
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.bus_company"]'));
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.legs"]'));
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.outbound.bus_company"]'));
|
||||
$this->assertCount(1, $crawler->filter('[data-question-key="bus_feedback.return.bus_company"]'));
|
||||
}
|
||||
|
||||
public function testAPlacementWithoutEscortGetsTheTeamerFeedbackOnly(): void
|
||||
@@ -95,18 +97,61 @@ class EditControllerTest extends WebTestCase
|
||||
{
|
||||
$disposition = $this->placement(busEscort: true);
|
||||
$form = $this->open($disposition)->selectButton('Entwurf speichern')->form();
|
||||
$form['questionnaire[bus_feedback][bus_team][driver_names]'] = 'Hans';
|
||||
$form['questionnaire[bus_feedback][legs]'] = 'outbound';
|
||||
$form['questionnaire[bus_feedback][outbound][bus_team][driver_names]'] = 'Hans';
|
||||
$this->client->submit($form);
|
||||
|
||||
$this->assertResponseRedirects(sprintf('/teamer/questionnaire/%s', $disposition->getUuid()));
|
||||
$this->assertSame([
|
||||
QuestionnaireCatalog::BUS_FEEDBACK => QuestionnaireResponseStatus::DRAFT,
|
||||
'bus_feedback.outbound' => QuestionnaireResponseStatus::DRAFT,
|
||||
QuestionnaireCatalog::TEAMER_FEEDBACK => QuestionnaireResponseStatus::DRAFT,
|
||||
], $this->statuses($disposition));
|
||||
|
||||
// reopened, the draft is back in the form
|
||||
// reopened, the draft is back in the form, the leg chosen included
|
||||
$crawler = $this->open($disposition);
|
||||
$this->assertSame('Hans', $crawler->filter('input[name="questionnaire[bus_feedback][bus_team][driver_names]"]')->attr('value'));
|
||||
$this->assertSame('Hans', $crawler->filter('input[name="questionnaire[bus_feedback][outbound][bus_team][driver_names]"]')->attr('value'));
|
||||
$this->assertSame('outbound', $crawler->filter('input[name="questionnaire[bus_feedback][legs]"][checked]')->attr('value'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Choosing one ride after having saved both drops the other ride's draft: it would otherwise
|
||||
* come back as chosen.
|
||||
*/
|
||||
public function testALegNoLongerChosenLosesItsDraft(): void
|
||||
{
|
||||
$disposition = $this->placement(busEscort: true);
|
||||
$form = $this->open($disposition)->selectButton('Entwurf speichern')->form();
|
||||
$form['questionnaire[bus_feedback][legs]'] = 'both';
|
||||
$this->client->submit($form);
|
||||
|
||||
$this->assertSame(['bus_feedback.outbound', 'bus_feedback.return', QuestionnaireCatalog::TEAMER_FEEDBACK], array_keys($this->statuses($disposition)));
|
||||
|
||||
$form = $this->open($disposition)->selectButton('Entwurf speichern')->form();
|
||||
$form['questionnaire[bus_feedback][legs]'] = 'return';
|
||||
$this->client->submit($form);
|
||||
|
||||
$this->assertSame(['bus_feedback.return', QuestionnaireCatalog::TEAMER_FEEDBACK], array_keys($this->statuses($disposition)));
|
||||
}
|
||||
|
||||
/**
|
||||
* An escort who rode both buses gives the bus feedback twice, each ride a response of its own.
|
||||
*/
|
||||
public function testBothRidesAreSubmittedAsTwoBusResponses(): void
|
||||
{
|
||||
$disposition = $this->placement(busEscort: true);
|
||||
$form = $this->open($disposition)->selectButton('Absenden')->form();
|
||||
$this->answerAll($form, [QuestionnaireCatalog::TEAMER_FEEDBACK, QuestionnaireCatalog::BUS_FEEDBACK], legs: 'both');
|
||||
$this->client->submit($form);
|
||||
|
||||
$this->assertSame([
|
||||
'bus_feedback.outbound' => QuestionnaireResponseStatus::SUBMITTED,
|
||||
'bus_feedback.return' => QuestionnaireResponseStatus::SUBMITTED,
|
||||
QuestionnaireCatalog::TEAMER_FEEDBACK => QuestionnaireResponseStatus::SUBMITTED,
|
||||
], $this->statuses($disposition));
|
||||
|
||||
$crawler = $this->client->followRedirect();
|
||||
$this->assertStringContainsString('Bus-Feedback: Hinfahrt', $crawler->text());
|
||||
$this->assertStringContainsString('Bus-Feedback: Rückfahrt', $crawler->text());
|
||||
}
|
||||
|
||||
public function testOneSubmitSubmitsBoth(): void
|
||||
@@ -118,7 +163,7 @@ class EditControllerTest extends WebTestCase
|
||||
|
||||
$this->assertResponseRedirects(sprintf('/teamer/questionnaire/%s/detail', $disposition->getUuid()));
|
||||
$this->assertSame([
|
||||
QuestionnaireCatalog::BUS_FEEDBACK => QuestionnaireResponseStatus::SUBMITTED,
|
||||
'bus_feedback.outbound' => QuestionnaireResponseStatus::SUBMITTED,
|
||||
QuestionnaireCatalog::TEAMER_FEEDBACK => QuestionnaireResponseStatus::SUBMITTED,
|
||||
], $this->statuses($disposition));
|
||||
|
||||
@@ -131,7 +176,7 @@ class EditControllerTest extends WebTestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Nothing is half-submitted: a bus question left open keeps both questionnaires unsubmitted.
|
||||
* Nothing is half-submitted: the rides left unsaid keep both questionnaires unsubmitted.
|
||||
*/
|
||||
public function testAnIncompleteBusFeedbackSubmitsNeither(): void
|
||||
{
|
||||
@@ -161,32 +206,43 @@ class EditControllerTest extends WebTestCase
|
||||
|
||||
/**
|
||||
* Answers every required question that is shown without a follow-up: first option, rating 5.
|
||||
* The bus feedback for the given rides.
|
||||
*
|
||||
* @param list<string> $questionnaires
|
||||
*/
|
||||
private function answerAll(Form $form, array $questionnaires): void
|
||||
private function answerAll(Form $form, array $questionnaires, string $legs = 'outbound'): void
|
||||
{
|
||||
$catalog = self::getContainer()->get(QuestionnaireCatalog::class);
|
||||
|
||||
foreach ($questionnaires as $key) {
|
||||
foreach ($catalog->get($key)->sections as $section) {
|
||||
foreach ($section->questions as $question) {
|
||||
if (!$question->required || null !== $question->showIf) {
|
||||
continue;
|
||||
}
|
||||
$definition = $catalog->get($key);
|
||||
$prefixes = [$key];
|
||||
|
||||
$form[sprintf('questionnaire[%s][%s][%s]', $key, $section->key, $question->key)] = match ($question->type) {
|
||||
QuestionType::CHOICE => $question->options[0]->key,
|
||||
QuestionType::RATING => '5',
|
||||
default => 'Antwort',
|
||||
};
|
||||
if ($definition->perBusLeg) {
|
||||
$form[sprintf('questionnaire[%s][legs]', $key)] = $legs;
|
||||
$prefixes = array_map(static fn (string $leg): string => $key.']['.$leg, 'both' === $legs ? ['outbound', 'return'] : [$legs]);
|
||||
}
|
||||
|
||||
foreach ($prefixes as $prefix) {
|
||||
foreach ($definition->sections as $section) {
|
||||
foreach ($section->questions as $question) {
|
||||
if (!$question->required || null !== $question->showIf) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$form[sprintf('questionnaire[%s][%s][%s]', $prefix, $section->key, $question->key)] = match ($question->type) {
|
||||
QuestionType::CHOICE => $question->options[0]->key,
|
||||
QuestionType::RATING => '5',
|
||||
default => 'Antwort',
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, QuestionnaireResponseStatus> keyed by questionnaire, sorted
|
||||
* @return array<string, QuestionnaireResponseStatus> keyed by questionnaire (and leg), sorted
|
||||
*/
|
||||
private function statuses(Disposition $disposition): array
|
||||
{
|
||||
@@ -194,7 +250,7 @@ class EditControllerTest extends WebTestCase
|
||||
$statuses = [];
|
||||
|
||||
foreach ($this->entityManager->getRepository(QuestionnaireResponse::class)->findBy(['disposition' => $disposition->getId()]) as $response) {
|
||||
$statuses[$response->getQuestionnaire()] = $response->getStatus();
|
||||
$statuses[$response->getQuestionnaire().(null === $response->getLeg() ? '' : '.'.$response->getLeg()->value)] = $response->getStatus();
|
||||
}
|
||||
|
||||
ksort($statuses);
|
||||
|
||||
Reference in new issue
Block a user