chore: fix deprecations
This commit is contained in:
@@ -118,7 +118,7 @@ class AssignmentType extends AbstractType
|
|||||||
return $qb
|
return $qb
|
||||||
->where($qb->expr()->like('user.roles', ':role'))
|
->where($qb->expr()->like('user.roles', ':role'))
|
||||||
->setParameter('role', '%ROLE_MANAGER%')
|
->setParameter('role', '%ROLE_MANAGER%')
|
||||||
->orderBy('user.firstName', 'ASC')
|
->orderBy('user.firstName', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class JobProfileType extends AbstractType
|
|||||||
'expanded' => true,
|
'expanded' => true,
|
||||||
'query_builder' => function (EntityRepository $repository) {
|
'query_builder' => function (EntityRepository $repository) {
|
||||||
return $repository->createQueryBuilder('job_profile')
|
return $repository->createQueryBuilder('job_profile')
|
||||||
->orderBy('job_profile.name', 'ASC')
|
->orderBy('job_profile.name', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class TeamerFilterType extends AbstractType
|
|||||||
'empty_label' => 'nicht filtern',
|
'empty_label' => 'nicht filtern',
|
||||||
'query_builder' => function (EntityRepository $repository) {
|
'query_builder' => function (EntityRepository $repository) {
|
||||||
return $repository->createQueryBuilder('job_profile')
|
return $repository->createQueryBuilder('job_profile')
|
||||||
->orderBy('job_profile.name', 'ASC');
|
->orderBy('job_profile.name', \SortDirection::Ascending);
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
->add('noTrainings', CheckboxType::class, [
|
->add('noTrainings', CheckboxType::class, [
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ class ApplicationRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('application.teamer', 'teamer')
|
->innerJoin('application.teamer', 'teamer')
|
||||||
->innerJoin('teamer.user', 'user')
|
->innerJoin('teamer.user', 'user')
|
||||||
->where($qb->expr()->neq('application.status', ':status'))
|
->where($qb->expr()->neq('application.status', ':status'))
|
||||||
->orderBy('application.createdAt', 'DESC')
|
->orderBy('application.createdAt', \SortDirection::Descending)
|
||||||
->setParameter('status', Application::STATUS_REJECTED)
|
->setParameter('status', Application::STATUS_REJECTED)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
@@ -280,8 +280,8 @@ class ApplicationRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('application.assignment', 'assignment')
|
->innerJoin('application.assignment', 'assignment')
|
||||||
->innerJoin('assignment.destination', 'destination')
|
->innerJoin('assignment.destination', 'destination')
|
||||||
->groupBy('hotelCode')
|
->groupBy('hotelCode')
|
||||||
->orderBy('totalCount', 'DESC')
|
->orderBy('totalCount', \SortDirection::Descending)
|
||||||
->addOrderBy('hotelCode', 'ASC')
|
->addOrderBy('hotelCode', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
|
|
||||||
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 < count((array)$filterDto->getHotels())) {
|
if (0 < count((array) $filterDto->getHotels())) {
|
||||||
$constraints = [];
|
$constraints = [];
|
||||||
foreach ($filterDto->getHotels() as $index => $hotel) {
|
foreach ($filterDto->getHotels() as $index => $hotel) {
|
||||||
$constraints[] = $qb->expr()->like('destination.hotel', ':hotel'.$index);
|
$constraints[] = $qb->expr()->like('destination.hotel', ':hotel'.$index);
|
||||||
@@ -293,7 +293,7 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
$result = $qb
|
$result = $qb
|
||||||
->select('assignment', 'job_profile')
|
->select('assignment', 'job_profile')
|
||||||
->innerJoin('assignment.jobProfile', 'job_profile')
|
->innerJoin('assignment.jobProfile', 'job_profile')
|
||||||
->orderBy('job_profile.name', 'ASC')
|
->orderBy('job_profile.name', \SortDirection::Ascending)
|
||||||
->where($qb->expr()->isNull('assignment.deletedAt'))
|
->where($qb->expr()->isNull('assignment.deletedAt'))
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
@@ -314,7 +314,7 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('assignment.destination', 'destination')
|
->innerJoin('assignment.destination', 'destination')
|
||||||
->innerJoin('assignment.jobProfile', 'job_profile')
|
->innerJoin('assignment.jobProfile', 'job_profile')
|
||||||
->innerJoin('assignment.owner', 'owner')
|
->innerJoin('assignment.owner', 'owner')
|
||||||
->orderBy('assignment.createdAt', 'DESC')
|
->orderBy('assignment.createdAt', \SortDirection::Descending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
@@ -358,7 +358,7 @@ class AssignmentRepository extends ServiceEntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->orderBy('destination.dateFrom', 'ASC')
|
->orderBy('destination.dateFrom', \SortDirection::Ascending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class AvailabilityRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->gt('availability.dateFrom', ':today'),
|
$qb->expr()->gt('availability.dateFrom', ':today'),
|
||||||
$qb->expr()->isNull('availability.deletedAt')
|
$qb->expr()->isNull('availability.deletedAt')
|
||||||
))
|
))
|
||||||
->orderBy('availability.dateFrom', 'ASC')
|
->orderBy('availability.dateFrom', \SortDirection::Ascending)
|
||||||
->setParameter('today', new \DateTimeImmutable())
|
->setParameter('today', new \DateTimeImmutable())
|
||||||
;
|
;
|
||||||
|
|
||||||
@@ -116,7 +116,7 @@ class AvailabilityRepository extends ServiceEntityRepository
|
|||||||
),
|
),
|
||||||
$qb->expr()->isNull('availability.deletedAt')
|
$qb->expr()->isNull('availability.deletedAt')
|
||||||
))
|
))
|
||||||
->orderBy('availability.dateFrom', 'ASC')
|
->orderBy('availability.dateFrom', \SortDirection::Ascending)
|
||||||
->setParameter('teamer', $teamer)
|
->setParameter('teamer', $teamer)
|
||||||
->setParameter('availabilities', $teamer->getAvailabilities())
|
->setParameter('availabilities', $teamer->getAvailabilities())
|
||||||
->setParameter('today', new \DateTimeImmutable())
|
->setParameter('today', new \DateTimeImmutable())
|
||||||
@@ -131,7 +131,7 @@ class AvailabilityRepository extends ServiceEntityRepository
|
|||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->where($qb->expr()->isNotNull('availability.owner'))
|
->where($qb->expr()->isNotNull('availability.owner'))
|
||||||
->orderBy('availability.createdAt', 'DESC')
|
->orderBy('availability.createdAt', \SortDirection::Descending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class ContactRepository extends ServiceEntityRepository
|
|||||||
return $qb
|
return $qb
|
||||||
->leftJoin('contact.photo', 'photo')
|
->leftJoin('contact.photo', 'photo')
|
||||||
->where($qb->expr()->isNull('contact.destination'))
|
->where($qb->expr()->isNull('contact.destination'))
|
||||||
->orderBy('contact.name', 'ASC')
|
->orderBy('contact.name', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -41,8 +41,8 @@ class ContactRepository extends ServiceEntityRepository
|
|||||||
return $qb
|
return $qb
|
||||||
->leftJoin('contact.photo', 'photo')
|
->leftJoin('contact.photo', 'photo')
|
||||||
->where($qb->expr()->isNotNull('contact.destination'))
|
->where($qb->expr()->isNotNull('contact.destination'))
|
||||||
->orderBy('contact.name', 'ASC')
|
->orderBy('contact.name', \SortDirection::Ascending)
|
||||||
->addOrderBy('contact.destination', 'ASC')
|
->addOrderBy('contact.destination', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -89,8 +89,8 @@ class DestinationRepository extends ServiceEntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
$dates = $qb
|
$dates = $qb
|
||||||
->orderBy('destination.dateFrom', 'ASC')
|
->orderBy('destination.dateFrom', \SortDirection::Ascending)
|
||||||
->addOrderBy('destination.product', 'ASC')
|
->addOrderBy('destination.product', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -119,7 +119,7 @@ class DestinationRepository extends ServiceEntityRepository
|
|||||||
return $qb
|
return $qb
|
||||||
->select('destination.hotel', 'destination.hotelCode', 'destination.hotelBusProId')
|
->select('destination.hotel', 'destination.hotelCode', 'destination.hotelBusProId')
|
||||||
->groupBy('destination.hotelBusProId', 'destination.hotel', 'destination.hotelCode')
|
->groupBy('destination.hotelBusProId', 'destination.hotel', 'destination.hotelCode')
|
||||||
->orderBy('destination.hotel', 'ASC')
|
->orderBy('destination.hotel', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getArrayResult()
|
->getArrayResult()
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
->setParameter('teamer', $teamer)
|
->setParameter('teamer', $teamer)
|
||||||
->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF)
|
->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF)
|
||||||
->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF)
|
->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF)
|
||||||
->orderBy('destination.dateFrom', 'DESC')
|
->orderBy('destination.dateFrom', \SortDirection::Descending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
@@ -173,7 +173,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
Disposition::STATUS_NEW,
|
Disposition::STATUS_NEW,
|
||||||
Disposition::STATUS_CONFIRMED,
|
Disposition::STATUS_CONFIRMED,
|
||||||
])
|
])
|
||||||
->orderBy('destination.dateFrom', 'ASC')
|
->orderBy('destination.dateFrom', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -198,7 +198,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->gte('destination.dateTo', ':dateTo'),
|
$qb->expr()->gte('destination.dateTo', ':dateTo'),
|
||||||
$qb->expr()->eq('disposition.status', ':status')
|
$qb->expr()->eq('disposition.status', ':status')
|
||||||
))
|
))
|
||||||
->orderBy('destination.dateFrom', 'ASC')
|
->orderBy('destination.dateFrom', \SortDirection::Ascending)
|
||||||
->setParameter('hotelCodes', $hotelCodes)
|
->setParameter('hotelCodes', $hotelCodes)
|
||||||
->setParameter('dateTo', new \DateTimeImmutable())
|
->setParameter('dateTo', new \DateTimeImmutable())
|
||||||
->setParameter('status', Disposition::STATUS_CONFIRMED)
|
->setParameter('status', Disposition::STATUS_CONFIRMED)
|
||||||
@@ -300,7 +300,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('assignment.destination', 'destination')
|
->innerJoin('assignment.destination', 'destination')
|
||||||
->innerJoin('assignment.jobProfile', 'job_profile')
|
->innerJoin('assignment.jobProfile', 'job_profile')
|
||||||
->where($qb->expr()->gt('destination.dateFrom', ':dateFrom'))
|
->where($qb->expr()->gt('destination.dateFrom', ':dateFrom'))
|
||||||
->orderBy('disposition.createdAt', 'DESC')
|
->orderBy('disposition.createdAt', \SortDirection::Descending)
|
||||||
->setParameter('dateFrom', new \DateTimeImmutable())
|
->setParameter('dateFrom', new \DateTimeImmutable())
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
@@ -341,7 +341,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
Disposition::STATUS_COMPLETED,
|
Disposition::STATUS_COMPLETED,
|
||||||
])
|
])
|
||||||
->groupBy('destination.hotelCode', 'destination.hotel')
|
->groupBy('destination.hotelCode', 'destination.hotel')
|
||||||
->orderBy('destination.hotel', 'ASC')
|
->orderBy('destination.hotel', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
|
|
||||||
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
||||||
@@ -423,7 +423,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
Disposition::STATUS_COMPLETED,
|
Disposition::STATUS_COMPLETED,
|
||||||
])
|
])
|
||||||
->groupBy('hotelCode')
|
->groupBy('hotelCode')
|
||||||
->orderBy('hotelCode', 'ASC')
|
->orderBy('hotelCode', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
|
|
||||||
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo);
|
||||||
@@ -643,7 +643,7 @@ class DispositionRepository extends ServiceEntityRepository
|
|||||||
->setParameter('dueDate', $dueDate)
|
->setParameter('dueDate', $dueDate)
|
||||||
->setParameter('status', Disposition::STATUS_NEW)
|
->setParameter('status', Disposition::STATUS_NEW)
|
||||||
->setParameter('assignmentStatus', [Assignment::STATUS_CALLED_OFF, Assignment::STATUS_DELETED])
|
->setParameter('assignmentStatus', [Assignment::STATUS_CALLED_OFF, Assignment::STATUS_DELETED])
|
||||||
->orderBy('disposition.createdAt', 'ASC')
|
->orderBy('disposition.createdAt', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class FeeRepository extends ServiceEntityRepository
|
|||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->where($qb->expr()->isNull('fee.deletedAt'))
|
->where($qb->expr()->isNull('fee.deletedAt'))
|
||||||
->orderBy('fee.name', 'ASC')
|
->orderBy('fee.name', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -59,9 +59,9 @@ class FeedbackRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('feedback.feedbackSet', 'feedbackSet')
|
->innerJoin('feedback.feedbackSet', 'feedbackSet')
|
||||||
->andWhere($qb->expr()->eq('feedback.status', ':status'))
|
->andWhere($qb->expr()->eq('feedback.status', ':status'))
|
||||||
->setParameter('status', Feedback::STATUS_PUBLISHED)
|
->setParameter('status', Feedback::STATUS_PUBLISHED)
|
||||||
->orderBy('teamer.lastName', 'ASC')
|
->orderBy('teamer.lastName', \SortDirection::Ascending)
|
||||||
->addOrderBy('teamer.firstName', 'ASC')
|
->addOrderBy('teamer.firstName', \SortDirection::Ascending)
|
||||||
->addOrderBy('feedback.assignmentDateFrom', 'ASC')
|
->addOrderBy('feedback.assignmentDateFrom', \SortDirection::Ascending)
|
||||||
;
|
;
|
||||||
|
|
||||||
$this->applyFilterCriteria($qb, $filterDto);
|
$this->applyFilterCriteria($qb, $filterDto);
|
||||||
@@ -118,7 +118,7 @@ class FeedbackRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('teamer.user', 'user')
|
->innerJoin('teamer.user', 'user')
|
||||||
->where($qb->expr()->eq('feedback.status', ':status'))
|
->where($qb->expr()->eq('feedback.status', ':status'))
|
||||||
->setParameter('status', Feedback::STATUS_NEW)
|
->setParameter('status', Feedback::STATUS_NEW)
|
||||||
->orderBy('feedback.createdAt', 'DESC')
|
->orderBy('feedback.createdAt', \SortDirection::Descending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
@@ -149,7 +149,7 @@ class FeedbackRepository extends ServiceEntityRepository
|
|||||||
))
|
))
|
||||||
->setParameter('teamer', $teamer)
|
->setParameter('teamer', $teamer)
|
||||||
->setParameter('status', Feedback::STATUS_PUBLISHED)
|
->setParameter('status', Feedback::STATUS_PUBLISHED)
|
||||||
->orderBy('feedback.createdAt', 'DESC')
|
->orderBy('feedback.createdAt', \SortDirection::Descending)
|
||||||
->setMaxResults($limit)
|
->setMaxResults($limit)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class JobProfileRepository extends ServiceEntityRepository
|
|||||||
->select('job_profile', 'required_training')
|
->select('job_profile', 'required_training')
|
||||||
->leftJoin('job_profile.requiredTrainings', 'required_training')
|
->leftJoin('job_profile.requiredTrainings', 'required_training')
|
||||||
->where($qb->expr()->isNull('job_profile.deletedAt'))
|
->where($qb->expr()->isNull('job_profile.deletedAt'))
|
||||||
->orderBy('job_profile.name', 'ASC')
|
->orderBy('job_profile.name', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -41,7 +41,7 @@ class JobProfileRepository extends ServiceEntityRepository
|
|||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->where($qb->expr()->like('job_profile.requiredLicenses', ':licenseType'))
|
->where($qb->expr()->like('job_profile.requiredLicenses', ':licenseType'))
|
||||||
->orderBy('job_profile.name', 'ASC')
|
->orderBy('job_profile.name', \SortDirection::Ascending)
|
||||||
->setParameter('licenseType', '%'.$licenseType.'%')
|
->setParameter('licenseType', '%'.$licenseType.'%')
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ class NewsRepository extends ServiceEntityRepository
|
|||||||
|
|
||||||
return $qb
|
return $qb
|
||||||
->where($qb->expr()->neq('news.status', ':status'))
|
->where($qb->expr()->neq('news.status', ':status'))
|
||||||
->orderBy('news.status', 'DESC')
|
->orderBy('news.status', \SortDirection::Descending)
|
||||||
->addOrderBy('news.createdAt', 'DESC')
|
->addOrderBy('news.createdAt', \SortDirection::Descending)
|
||||||
->setParameter('status', News::STATUS_DEACTIVATED)
|
->setParameter('status', News::STATUS_DEACTIVATED)
|
||||||
->setMaxResults(1)
|
->setMaxResults(1)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ class StatisticsEventRepository extends ServiceEntityRepository
|
|||||||
->where($qb->expr()->eq('event.name', ':name'))
|
->where($qb->expr()->eq('event.name', ':name'))
|
||||||
->setParameter('name', $name->value)
|
->setParameter('name', $name->value)
|
||||||
->groupBy('value')
|
->groupBy('value')
|
||||||
->orderBy('total', 'DESC')
|
->orderBy('total', \SortDirection::Descending)
|
||||||
;
|
;
|
||||||
|
|
||||||
$filtered = null !== $dateFrom || null !== $dateTo;
|
$filtered = null !== $dateFrom || null !== $dateTo;
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ class TeamerRepository extends ServiceEntityRepository
|
|||||||
{
|
{
|
||||||
return $this
|
return $this
|
||||||
->createListQueryBuilder($filterDto)
|
->createListQueryBuilder($filterDto)
|
||||||
->addOrderBy('teamer.viewed', 'asc')
|
->addOrderBy('teamer.viewed', \SortDirection::Ascending)
|
||||||
->addOrderBy('teamer.lastName', 'asc')
|
->addOrderBy('teamer.lastName', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
@@ -67,7 +67,7 @@ class TeamerRepository extends ServiceEntityRepository
|
|||||||
)
|
)
|
||||||
// teamer.viewed says nothing about a mailing and a DISTINCT select cannot order
|
// teamer.viewed says nothing about a mailing and a DISTINCT select cannot order
|
||||||
// by a field it does not carry, so this list sorts by name alone
|
// by a field it does not carry, so this list sorts by name alone
|
||||||
->addOrderBy('teamer.lastName', 'asc')
|
->addOrderBy('teamer.lastName', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getArrayResult()
|
->getArrayResult()
|
||||||
;
|
;
|
||||||
@@ -177,8 +177,8 @@ class TeamerRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->like('teamer.firstName', ':search'),
|
$qb->expr()->like('teamer.firstName', ':search'),
|
||||||
))
|
))
|
||||||
->andWhere($qb->expr()->isNull('teamer.deletedAt'))
|
->andWhere($qb->expr()->isNull('teamer.deletedAt'))
|
||||||
->orderBy('teamer.lastName', 'ASC')
|
->orderBy('teamer.lastName', \SortDirection::Ascending)
|
||||||
->addOrderBy('teamer.firstName', 'ASC')
|
->addOrderBy('teamer.firstName', \SortDirection::Ascending)
|
||||||
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
|
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class TrainingRepository extends ServiceEntityRepository
|
|||||||
->select('training', 'training_attendance')
|
->select('training', 'training_attendance')
|
||||||
->leftJoin('training.trainingAttendances', 'training_attendance')
|
->leftJoin('training.trainingAttendances', 'training_attendance')
|
||||||
->where($qb->expr()->isNull('training.deletedAt'))
|
->where($qb->expr()->isNull('training.deletedAt'))
|
||||||
->orderBy('training.name', 'ASC')
|
->orderBy('training.name', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class UploadRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->like('upload.displayName', ':filename')
|
$qb->expr()->like('upload.displayName', ':filename')
|
||||||
))
|
))
|
||||||
->setParameter('filename', '%'.$this->escapeLikeWildcards($search).'%')
|
->setParameter('filename', '%'.$this->escapeLikeWildcards($search).'%')
|
||||||
->orderBy('upload.originalFilename', 'ASC')
|
->orderBy('upload.originalFilename', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -97,7 +97,7 @@ class UploadRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->eq('upload.status', ':status'),
|
$qb->expr()->eq('upload.status', ':status'),
|
||||||
$qb->expr()->isNull('upload.downloadedAt'),
|
$qb->expr()->isNull('upload.downloadedAt'),
|
||||||
))
|
))
|
||||||
->orderBy('upload.createdAt', 'DESC')
|
->orderBy('upload.createdAt', \SortDirection::Descending)
|
||||||
->setParameter('type', $type)
|
->setParameter('type', $type)
|
||||||
->setParameter('status', $status)
|
->setParameter('status', $status)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
@@ -126,7 +126,7 @@ class UploadRepository extends ServiceEntityRepository
|
|||||||
->innerJoin('assignment.destination', 'destination')
|
->innerJoin('assignment.destination', 'destination')
|
||||||
->innerJoin('disposition.teamer', 'teamer')
|
->innerJoin('disposition.teamer', 'teamer')
|
||||||
->innerJoin('teamer.user', 'user')
|
->innerJoin('teamer.user', 'user')
|
||||||
->addOrderBy('FIELD(upload.status, :checked, :new)', 'DESC')
|
->addOrderBy('FIELD(upload.status, :checked, :new)', \SortDirection::Descending)
|
||||||
->setParameter('new', Upload::STATUS_NEW)
|
->setParameter('new', Upload::STATUS_NEW)
|
||||||
->setParameter('checked', Upload::STATUS_CHECKED)
|
->setParameter('checked', Upload::STATUS_CHECKED)
|
||||||
;
|
;
|
||||||
@@ -207,7 +207,7 @@ class UploadRepository extends ServiceEntityRepository
|
|||||||
$qb->expr()->eq('upload.type', ':type'),
|
$qb->expr()->eq('upload.type', ':type'),
|
||||||
$qb->expr()->in('upload.status', ':status')
|
$qb->expr()->in('upload.status', ':status')
|
||||||
))
|
))
|
||||||
->orderBy('upload.createdAt', 'DESC')
|
->orderBy('upload.createdAt', \SortDirection::Descending)
|
||||||
->setParameter('type', $type)
|
->setParameter('type', $type)
|
||||||
->setParameter('status', [Upload::STATUS_NEW, Upload::STATUS_PENDING])
|
->setParameter('status', [Upload::STATUS_NEW, Upload::STATUS_PENDING])
|
||||||
->getQuery()
|
->getQuery()
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
// andWhere after a chain of orWhere yields "(... OR ...) AND ...", so this
|
// andWhere after a chain of orWhere yields "(... OR ...) AND ...", so this
|
||||||
// narrows the whole list rather than widening it by one more alternative
|
// narrows the whole list rather than widening it by one more alternative
|
||||||
->andWhere($qb->expr()->isNull('u.deletedAt'))
|
->andWhere($qb->expr()->isNull('u.deletedAt'))
|
||||||
->orderBy('u.lastName', 'ASC')
|
->orderBy('u.lastName', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -83,8 +83,8 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
->andWhere($roleMatches)
|
->andWhere($roleMatches)
|
||||||
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
||||||
->andWhere($qb->expr()->isNull('user.disabledAt'))
|
->andWhere($qb->expr()->isNull('user.disabledAt'))
|
||||||
->orderBy('user.lastName', 'ASC')
|
->orderBy('user.lastName', \SortDirection::Ascending)
|
||||||
->addOrderBy('user.firstName', 'ASC')
|
->addOrderBy('user.firstName', \SortDirection::Ascending)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
@@ -132,8 +132,8 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
))
|
))
|
||||||
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
|
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
|
||||||
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
||||||
->orderBy('user.lastName', 'ASC')
|
->orderBy('user.lastName', \SortDirection::Ascending)
|
||||||
->addOrderBy('user.firstName', 'ASC')
|
->addOrderBy('user.firstName', \SortDirection::Ascending)
|
||||||
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
|
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
|
||||||
->setParameter('role', json_encode($role))
|
->setParameter('role', json_encode($role))
|
||||||
->getQuery()
|
->getQuery()
|
||||||
|
|||||||
Reference in New Issue
Block a user