This commit is contained in:
2023-03-28 18:12:47 +02:00
parent 561d069a3e
commit 331443ae12
5 changed files with 13 additions and 8 deletions

View File

@@ -64,7 +64,6 @@ class SocialWorkTypeFilter implements FilterInterface
$orX = $qb->expr()->orX();
foreach ($data['goal'] as $goal) {
/** @var Goal $goal */
$andX = $qb->expr()->andX();
$andX->add($qb->expr()->eq('acpw_goal.goal', $goalId = ':goal_'.uniqid()));
@@ -73,7 +72,6 @@ class SocialWorkTypeFilter implements FilterInterface
if (count($data['result']) > 0) {
$orXResult = $qb->expr()->orX();
foreach ($data['result'] as $result) {
/** @var Result $result */
$orXResult->add($qb->expr()->isMemberOf($resultId = ':result_'.uniqid(), 'acpw_goal.results'));
$qb->setParameter($resultId, $result);

View File

@@ -80,7 +80,7 @@ class SimilarPersonMatcher
->where('SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) >= :precision')
->andWhere($qb->expr()->in('center_history.center', ':centers'))
->andWhere($qb->expr()->andX(
$qb->expr()->lte('center_history.startDate', 'CURRENT_DATE()'),
$qb->expr()->lte('center_history.startDate', 'CURRENT_DATE()'),
$qb->expr()->orX(
$qb->expr()->isNull('center_history.endDate'),
$qb->expr()->gt('center_history.endDate', 'CURRENT_DATE()')

View File

@@ -2,6 +2,13 @@
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\Migrations\Person;
use Doctrine\DBAL\Schema\Schema;