fix: teamer dashboard crashing on isContractDue() without deadline
489aafed made isContractDue() and isInvoiceDue() take the deadline days,
but teamer/index.html.twig still called them as bare getters, throwing an
ArgumentCountError for every teamer with an upcoming disposition. The
controller now resolves which reason applies and hands it to the template.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
849da8d471
commit
c3cebae494
2 files changed
+19
-11
No files matched your search
@@ -78,19 +78,28 @@ class IndexController extends AbstractController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{disposition: Disposition, reason: 'contract_due'|'contract_rejected'|'invoice_due'}>
|
||||||
|
*/
|
||||||
private function processDocuments(array $upcomingDispositions): array
|
private function processDocuments(array $upcomingDispositions): array
|
||||||
{
|
{
|
||||||
$contractUploadDeadlineDays = (int) $this->getParameter('contract_upload_deadline_days');
|
$contractUploadDeadlineDays = (int) $this->getParameter('contract_upload_deadline_days');
|
||||||
$invoiceUploadDeadlineDays = (int) $this->getParameter('invoice_upload_deadline_days');
|
$invoiceUploadDeadlineDays = (int) $this->getParameter('invoice_upload_deadline_days');
|
||||||
$dispositions = [];
|
$dispositions = [];
|
||||||
|
|
||||||
|
// The due checks need the configured deadlines, which the template cannot pass, so the
|
||||||
|
// reason is resolved here. Order matters: the first matching reason is the one shown.
|
||||||
foreach ($upcomingDispositions as $disposition) {
|
foreach ($upcomingDispositions as $disposition) {
|
||||||
/** @var Disposition $disposition */
|
/** @var Disposition $disposition */
|
||||||
if ($disposition->isContractDue($contractUploadDeadlineDays)
|
$reason = match (true) {
|
||||||
|| $disposition->isContractRejected()
|
$disposition->isContractDue($contractUploadDeadlineDays) => 'contract_due',
|
||||||
|| $disposition->isInvoiceDue($invoiceUploadDeadlineDays)
|
$disposition->isContractRejected() => 'contract_rejected',
|
||||||
) {
|
$disposition->isInvoiceDue($invoiceUploadDeadlineDays) => 'invoice_due',
|
||||||
$dispositions[] = $disposition;
|
default => null,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (null !== $reason) {
|
||||||
|
$dispositions[] = ['disposition' => $disposition, 'reason' => $reason];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,9 +48,9 @@
|
|||||||
Meine Dokumente
|
Meine Dokumente
|
||||||
</h2>
|
</h2>
|
||||||
<ul class="divide-y divide-gray-200">
|
<ul class="divide-y divide-gray-200">
|
||||||
{% for disposition in dispositionDocuments %}
|
{% for document in dispositionDocuments %}
|
||||||
|
{% set disposition = document.disposition %}
|
||||||
{% set assignment = disposition.assignment %}
|
{% set assignment = disposition.assignment %}
|
||||||
{% if disposition.contractDue or disposition.invoiceDue or disposition.contractRejected %}
|
|
||||||
<li class="py-2 first:pt-0 last:pb-0">
|
<li class="py-2 first:pt-0 last:pb-0">
|
||||||
<a href="{{ path('app_teamer_disposition_detail', { 'uuid': disposition.uuid }) }}">
|
<a href="{{ path('app_teamer_disposition_detail', { 'uuid': disposition.uuid }) }}">
|
||||||
<div class="flex items-center space-x-1">
|
<div class="flex items-center space-x-1">
|
||||||
@@ -62,17 +62,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pl-5 whitespace-nowrap text-red-500">
|
<div class="pl-5 whitespace-nowrap text-red-500">
|
||||||
{%- if disposition.contractDue -%}
|
{%- if document.reason == 'contract_due' -%}
|
||||||
Honorarvertrag fällig
|
Honorarvertrag fällig
|
||||||
{%- elseif disposition.contractRejected %}
|
{%- elseif document.reason == 'contract_rejected' %}
|
||||||
Honorarvertrag muss erneut hochgeladen werden
|
Honorarvertrag muss erneut hochgeladen werden
|
||||||
{%- elseif disposition.invoiceDue -%}
|
{%- elseif document.reason == 'invoice_due' -%}
|
||||||
Honorarnote fällig
|
Honorarnote fällig
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<li class="py-2 first:pt-0 last:pb-0">
|
<li class="py-2 first:pt-0 last:pb-0">
|
||||||
-
|
-
|
||||||
|
|||||||
Reference in new issue
Block a user