Cadoles
/
ninegate
18
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2022-02-03 16:49:54 +01:00
parent 3818a38106 c6d349696e
commit 21fc95f71e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/AlertRepository.php
View File

@ -45,7 +45,9 @@ class AlertRepository extends EntityRepository
$roles=($user?$user->getRoles():["ROLE_ANONYME"]); $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
$niveau01=($user?$user->getNiveau01():null); $niveau01=($user?$user->getNiveau01():null);
$groups=($user?$user->getGroups():[]); $groups=($user?$user->getGroups():[]);
$userreads=($user?$user->getAlertreaders():[]);
// Initialisation du calcul des alerts // Initialisation du calcul des alerts
$alerts=new ArrayCollection(); $alerts=new ArrayCollection();
@ -67,8 +69,9 @@ class AlertRepository extends EntityRepository
->setParameter("alertcategory",$alertcategoryfilter); ->setParameter("alertcategory",$alertcategoryfilter);
} }
$alertsroles=$qb->getQuery()->getResult(); $alertsroles=$qb->getQuery()->getResult();
foreach($alertsroles as $alertrole) { foreach($alertsroles as $alertrole) {
if(!$alerts->contains($alertrole)&&!$alertrole->getReaders()->contains($user)) $alerts->add($alertrole); if(!$alerts->contains($alertrole)&&!$userreads->contains($alertrole)) $alerts->add($alertrole);
} }
} }
@ -91,7 +94,7 @@ class AlertRepository extends EntityRepository
} }
$alertsniveau01s=$qb->getQuery()->getResult(); $alertsniveau01s=$qb->getQuery()->getResult();
foreach($alertsniveau01s as $alertniveau01) { foreach($alertsniveau01s as $alertniveau01) {
if(!$alerts->contains($alertniveau01)&&!$alertniveau01->getReaders()->contains($user)) $alerts->add($alertniveau01); if(!$alerts->contains($alertniveau01)&&!$userreads->contains($alertniveau01)) $alerts->add($alertniveau01);
} }
// Récupération des alerts par group // Récupération des alerts par group
@ -113,8 +116,8 @@ class AlertRepository extends EntityRepository
->setParameter("alertcategory",$alertcategoryfilter); ->setParameter("alertcategory",$alertcategoryfilter);
} }
$alertsgroups=$qb->getQuery()->getResult(); $alertsgroups=$qb->getQuery()->getResult();
foreach($alertsgroups as $alertgroup) { foreach($alertsgroups as $alertgroup) {
if(!$alerts->contains($alertgroup)&&!$alertgroup->getReaders()->contains($user)) $alerts->add($alertgroup); if(!$alerts->contains($alertgroup)&&!$userreads->contains($alertgroup)) $alerts->add($alertgroup);
} }
} }
@ -141,8 +144,8 @@ class AlertRepository extends EntityRepository
->setParameter("alertcategory",$alertcategoryfilter); ->setParameter("alertcategory",$alertcategoryfilter);
} }
$alertsitems=$qb->getQuery()->getResult(); $alertsitems=$qb->getQuery()->getResult();
foreach($alertsitems as $alertitem) { foreach($alertsitems as $alertitem) {
if(!$alerts->contains($alertitem)&&!$alertitem->getReaders()->contains($user)) $alerts->add($alertitem); if(!$alerts->contains($alertitem)&&!$userreads->contains($alertitem)) $alerts->add($alertitem);
} }
} }