EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: drop status breakdown from applications-by-destination stats

Browse Source
This commit is contained in:
fromme
2026-09-01 09:46:01 +02:00
parent f6667dcfc7
commit 0d06bc4271
3 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Repository/ApplicationRepository.php
+5 -15
View File
@@ -253,12 +253,15 @@ class ApplicationRepository extends ServiceEntityRepository
}
/**
* The raw tally grouped by normalized hotel code, split by application status.
* The raw application tally grouped by normalized hotel code.
*
* Mirrors DispositionRepository::getFeedbackStatisticsByNormalizedHotelCodeQuery() - the
* "Bewerbungen pro Destination" screen sits next to "Feedback pro Destination" and means the
* same thing by a destination and a season, so the normalization and the date filter are the
* shared ones.
*
* Status is deliberately not broken out: an application's status moves over its lifetime, so a
* snapshot of the current status is not a meaningful figure for a past period.
*/
public function getApplicationsByDestinationQuery(
?\DateTimeImmutable $dateFrom = null,
@@ -272,16 +275,10 @@ class ApplicationRepository extends ServiceEntityRepository
$qb
->select(
$normalizedHotelCode.' AS hotelCode',
'SUM(CASE WHEN application.status = :statusNew THEN 1 ELSE 0 END) AS newCount',
'SUM(CASE WHEN application.status = :statusPending THEN 1 ELSE 0 END) AS pendingCount',
'SUM(CASE WHEN application.status = :statusRejected THEN 1 ELSE 0 END) AS rejectedCount',
'COUNT(application.id) AS totalCount'
)
->innerJoin('application.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->setParameter('statusNew', Application::STATUS_NEW)
->setParameter('statusPending', Application::STATUS_PENDING)
->setParameter('statusRejected', Application::STATUS_REJECTED)
->groupBy('hotelCode')
->orderBy('totalCount', 'DESC')
->addOrderBy('hotelCode', 'ASC')
@@ -293,14 +290,10 @@ class ApplicationRepository extends ServiceEntityRepository
}
/**
* Returns application counts grouped by normalized hotel code (base 3-char code),
* split into the three application statuses plus a total.
* Returns the application count grouped by normalized hotel code (base 3-char code).
*
* @return array<int, array{
* hotelCode: string,
* new: int,
* pending: int,
* rejected: int,
* total: int
* }>
*/
@@ -310,9 +303,6 @@ class ApplicationRepository extends ServiceEntityRepository
): array {
return array_map(static fn (array $row): array => [
'hotelCode' => $row['hotelCode'],
'new' => (int) $row['newCount'],
'pending' => (int) $row['pendingCount'],
'rejected' => (int) $row['rejectedCount'],
'total' => (int) $row['totalCount'],
], $this->getApplicationsByDestinationQuery($dateFrom, $dateTo)->getResult());
}
templates/administrative/statistics/applications_by_destination.html.twig
+2 -17
View File
@@ -41,39 +41,24 @@
<thead>
<tr class="bg-gray-50 border-b">
<th class="px-4 py-3 text-left font-semibold">Destination</th>
<th class="px-4 py-3 text-right font-semibold">Neu</th>
<th class="px-4 py-3 text-right font-semibold">In Prüfung</th>
<th class="px-4 py-3 text-right font-semibold">Abgelehnt</th>
<th class="px-4 py-3 text-right font-semibold">Gesamt</th>
<th class="px-4 py-3 text-right font-semibold">Bewerbungen</th>
</tr>
</thead>
<tbody>
{% for stat in statistics %}
<tr class="border-b hover:bg-gray-50">
<td class="px-4 py-3 font-medium">{{ stat.hotelCode }}</td>
<td class="px-4 py-3 text-right">{{ stat.new }}</td>
<td class="px-4 py-3 text-right">{{ stat.pending }}</td>
<td class="px-4 py-3 text-right">{{ stat.rejected }}</td>
<td class="px-4 py-3 text-right"><span class="font-medium">{{ stat.total }}</span></td>
<td class="px-4 py-3 text-right">{{ stat.total }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% set totalNew = 0 %}
{% set totalPending = 0 %}
{% set totalRejected = 0 %}
{% set totalAll = 0 %}
{% for stat in statistics %}
{% set totalNew = totalNew + stat.new %}
{% set totalPending = totalPending + stat.pending %}
{% set totalRejected = totalRejected + stat.rejected %}
{% set totalAll = totalAll + stat.total %}
{% endfor %}
<tr class="bg-gray-100 font-semibold">
<td class="px-4 py-3">Gesamt</td>
<td class="px-4 py-3 text-right">{{ totalNew }}</td>
<td class="px-4 py-3 text-right">{{ totalPending }}</td>
<td class="px-4 py-3 text-right">{{ totalRejected }}</td>
<td class="px-4 py-3 text-right">{{ totalAll }}</td>
</tr>
</tfoot>
tests/Repository/ApplicationRepositoryTest.php
+6 -4
View File
@@ -86,13 +86,15 @@ class ApplicationRepositoryTest extends KernelTestCase
$this->assertStringContainsString('INNER JOIN assignment.destination destination', $dql);
}
public function testApplicationsByDestinationBindsTheStatusBuckets(): void
public function testApplicationsByDestinationCountsEveryApplicationRegardlessOfStatus(): void
{
$query = $this->createApplicationsByDestinationQuery();
$dql = $query->getDQL();
$this->assertSame(Application::STATUS_NEW, $query->getParameter('statusNew')->getValue());
$this->assertSame(Application::STATUS_PENDING, $query->getParameter('statusPending')->getValue());
$this->assertSame(Application::STATUS_REJECTED, $query->getParameter('statusRejected')->getValue());
// status moves over an application's lifetime, so it is not broken out - a plain count
$this->assertStringContainsString('COUNT(application.id)', $dql);
$this->assertStringNotContainsStringIgnoringCase('application.status', $dql);
$this->assertNull($query->getParameter('statusNew'));
}
public function testApplicationsByDestinationAppliesTheSeasonBoundsOnlyWhenGiven(): void