WIP: Adjust model, remove manager branch in navigation
This commit is contained in:
1 parent
25a90b04aa
commit
8740041e7a
30 files changed
+302
-152
No files matched your search
@@ -29,17 +29,16 @@ class BpnDateRepository extends ServiceEntityRepository
|
||||
$qb = $this->createQueryBuilder('bpn_date');
|
||||
|
||||
$dates = $qb
|
||||
->select('bpn_date.id', 'bpn_date.product', 'bpn_date.hotel', 'bpn_date.dateFrom', 'bpn_date.dateTo')
|
||||
->where($qb->expr()->orX(
|
||||
$qb->expr()->like('bpn_date.product', ':product'),
|
||||
$qb->expr()->like('bpn_date.hotel', ':hotel')
|
||||
))
|
||||
->setParameter('product', '%'.$this->escapeLikeWildcards($search).'%')
|
||||
->setParameter('hotel', '%'.$this->escapeLikeWildcards($search).'%')
|
||||
->orderBy('bpn_date.product', 'ASC')
|
||||
->addOrderBy('bpn_date.dateFrom', 'ASC')
|
||||
->orderBy('bpn_date.dateFrom', 'ASC')
|
||||
->addOrderBy('bpn_date.product', 'ASC')
|
||||
->getQuery()
|
||||
->getArrayResult()
|
||||
->getResult()
|
||||
;
|
||||
|
||||
$data = [
|
||||
@@ -51,8 +50,8 @@ class BpnDateRepository extends ServiceEntityRepository
|
||||
|
||||
foreach ($dates as $date) {
|
||||
$data[] = [
|
||||
'value' => $date['id'],
|
||||
'text' => sprintf('%s (%s - %s)', $date['product'], $date['dateFrom']->format('d.m.y'), $date['dateTo']->format('d.m.y')),
|
||||
'value' => $date->getId(),
|
||||
'text' => (string) $date,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ class JobProfileRepository extends ServiceEntityRepository
|
||||
|
||||
return $qb
|
||||
->select('job_profile', 'required_training')
|
||||
->leftJoin('job_profile.requiredTraining', 'required_training')
|
||||
->leftJoin('job_profile.requiredTrainings', 'required_training')
|
||||
->orderBy('job_profile.name', 'ASC')
|
||||
->getQuery()
|
||||
->getResult()
|
||||
|
||||
Reference in new issue
Block a user