From 784e24d83b3ee7db0b5954266f17a1f934bfa52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 9 Jan 2025 13:05:28 +0100 Subject: [PATCH 1/3] fix: don't show matching assignments that are already staffed --- src/Repository/AssignmentRepository.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Repository/AssignmentRepository.php b/src/Repository/AssignmentRepository.php index 4951af4..e3bb112 100644 --- a/src/Repository/AssignmentRepository.php +++ b/src/Repository/AssignmentRepository.php @@ -244,6 +244,7 @@ class AssignmentRepository extends ServiceEntityRepository ->leftJoin('assignment.dispositions', 'disposition', Join::WITH, $qb->expr()->eq('disposition.teamer', ':teamer')) ->where($qb->expr()->andX( $qb->expr()->eq('assignment.status', ':status'), + $qb->expr()->neq('assignment.staffingStatus', ':staffingStatus'), $qb->expr()->in('assignment.jobProfile', ':jobProfiles'), $qb->expr()->isNull('application'), $qb->expr()->isNull('disposition'), @@ -253,6 +254,7 @@ class AssignmentRepository extends ServiceEntityRepository ) )) ->setParameter('status', Assignment::STATUS_PUBLISHED) + ->setParameter('staffingStatus', Assignment::STATUS_STAFFED) ->setParameter('jobProfiles', $teamer->getJobProfiles()) ->setParameter('teamer', $teamer) ->setParameter('dateFrom', new \DateTimeImmutable()) From 24dac73303a2925d806e62613990b0af7e9a8feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 9 Jan 2025 13:05:44 +0100 Subject: [PATCH 2/3] fix: hide empty pickup select fields --- src/Form/TeamerApplicationType.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Form/TeamerApplicationType.php b/src/Form/TeamerApplicationType.php index ce7d09f..7964b42 100644 --- a/src/Form/TeamerApplicationType.php +++ b/src/Form/TeamerApplicationType.php @@ -35,11 +35,17 @@ class TeamerApplicationType extends AbstractType } $assignment = $application->getAssignment(); + $pickups = $assignment->getDestination()->getPickups(); + + if (0 === count($pickups)) { + return; + } + $teamer = $application->getTeamer(); if (0 === (int) $assignment->getPickup()) { $pickupChoices = []; - foreach ($assignment->getDestination()->getPickups() as $pickup) { + foreach ($pickups as $pickup) { $pickupChoices[$pickup['city']] = $pickup['busProId']; } ksort($pickupChoices); From 5f52801d35dd87bd8621ed84230bacaa44e920da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 9 Jan 2025 13:05:54 +0100 Subject: [PATCH 3/3] feat: improve htmx config --- assets/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/app.js b/assets/app.js index 9c189e3..114ed3f 100644 --- a/assets/app.js +++ b/assets/app.js @@ -1,4 +1,8 @@ -import 'htmx.org'; +import htmx from 'htmx.org' +htmx.config.includeIndicatorStyles = false +htmx.config.historyCacheSize = 0 +htmx.config.allowScriptTags = false + import './bootstrap.js'; /* * Welcome to your app's main JavaScript file!