fix: don't filter application list by rejected status in repository
This commit is contained in:
@@ -21,7 +21,6 @@ class EditController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/admin/assignment/edit/{uuid}', name: 'app_admin_assignment_edit')]
|
#[Route('/admin/assignment/edit/{uuid}', name: 'app_admin_assignment_edit')]
|
||||||
#[IsGranted('ROLE_ADMINISTRATIVE')]
|
|
||||||
#[IsGranted('EDIT', subject: 'assignment')]
|
#[IsGranted('EDIT', subject: 'assignment')]
|
||||||
public function index(Assignment $assignment, Request $request): Response
|
public function index(Assignment $assignment, Request $request): Response
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -337,6 +337,13 @@ class Assignment implements BlameableEntityInterface, TimestampableEntityInterfa
|
|||||||
return $this->applications;
|
return $this->applications;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getValidApplications(): Collection
|
||||||
|
{
|
||||||
|
return $this->applications->filter(function (Application $application) {
|
||||||
|
return Application::STATUS_REJECTED !== $application->getStatus();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public function addApplication(Application $application): static
|
public function addApplication(Application $application): static
|
||||||
{
|
{
|
||||||
if (!$this->applications->contains($application)) {
|
if (!$this->applications->contains($application)) {
|
||||||
|
|||||||
@@ -37,9 +37,8 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('assignment.destination', 'destination')
|
->innerJoin('assignment.destination', 'destination')
|
||||||
->innerJoin('assignment.jobProfile', 'job_profile')
|
->innerJoin('assignment.jobProfile', 'job_profile')
|
||||||
->where($qb->expr()->isNull('assignment.deletedAt'))
|
->where($qb->expr()->isNull('assignment.deletedAt'))
|
||||||
->leftJoin('assignment.applications', 'application', Join::WITH, $qb->expr()->neq('application.status', ':status'))
|
->leftJoin('assignment.applications', 'application')
|
||||||
->leftJoin('assignment.dispositions', 'disposition')
|
->leftJoin('assignment.dispositions', 'disposition')
|
||||||
->setParameter('status', Application::STATUS_REJECTED)
|
|
||||||
;
|
;
|
||||||
|
|
||||||
$this->applyFilterSettings($filterDto, $qb);
|
$this->applyFilterSettings($filterDto, $qb);
|
||||||
|
|||||||
@@ -90,7 +90,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-2">
|
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-2">
|
||||||
<span>{{ assignment.applications|length }}/{{ assignment.availableDispositions - assignment.dispositions|length }}</span>
|
<span>{{ assignment.validApplications|length }}/{{ assignment.availableDispositions - assignment.dispositions|length }}</span>
|
||||||
{% if assignment.status == 'closed' %}
|
{% if assignment.status == 'closed' %}
|
||||||
{{ icon('locked', 'w-4 h-4 text-red-500') }}
|
{{ icon('locked', 'w-4 h-4 text-red-500') }}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|||||||
Reference in New Issue
Block a user