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

Merge branch 'master' into feature/multiple-hotelcodes

Browse Source
This commit is contained in:
Björn Fromme
2025-01-09 13:46:01 +01:00
parent 2b6a401bd8 5f52801d35
commit 4cad1331ae
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Form/TeamerApplicationType.php
+7 -1
View File
@@ -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);
src/Repository/AssignmentRepository.php
+2
View File
@@ -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())