Compare commits
No commits in common. "1381e4f7be42ecdf2748ed48fc8d464afef0419c" and "1d490ae06656220d740cf6debe7a7b49efc6c4e6" have entirely different histories.
1381e4f7be
...
1d490ae066
|
@ -48,13 +48,14 @@ class ItemRepository extends EntityRepository
|
|||
->setParameter("itemcategory",$itemcategoryfilter);
|
||||
}
|
||||
|
||||
$itemsroles=$qb->getQuery()->getResult();
|
||||
foreach($itemsroles as $itemrole) {
|
||||
if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) {
|
||||
if(!$fgessential || ($fgessential && $itemrole->getEssential()))
|
||||
$items->add($itemrole);
|
||||
if($fgessential) {
|
||||
$qb->andWhere("item.essential=:flag")
|
||||
->setParameter("flag",true);
|
||||
}
|
||||
|
||||
$itemsroles=$qb->getQuery()->getResult();
|
||||
foreach($itemsroles as $itemrole) {
|
||||
if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
|
||||
if(!$itemalls->contains($itemrole)) $itemalls->add($itemrole);
|
||||
}
|
||||
}
|
||||
|
@ -73,13 +74,14 @@ class ItemRepository extends EntityRepository
|
|||
->setParameter("itemcategory",$itemcategoryfilter);
|
||||
}
|
||||
|
||||
$itemsgroups=$qb->getQuery()->getResult();
|
||||
foreach($itemsgroups as $itemgroup) {
|
||||
if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) {
|
||||
if(!$fgessential || ($fgessential && $itemgroup->getEssential()))
|
||||
$items->add($itemgroup);
|
||||
if($fgessential) {
|
||||
$qb->andWhere("item.essential=:flag")
|
||||
->setParameter("flag",true);
|
||||
}
|
||||
|
||||
$itemsgroups=$qb->getQuery()->getResult();
|
||||
foreach($itemsgroups as $itemgroup) {
|
||||
if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
|
||||
if(!$itemalls->contains($itemgroup)) $itemalls->add($itemgroup);
|
||||
}
|
||||
|
||||
|
@ -101,13 +103,14 @@ class ItemRepository extends EntityRepository
|
|||
->setParameter("itemcategory",$itemcategoryfilter);
|
||||
}
|
||||
|
||||
$itemsniveau01s=$qb->getQuery()->getResult();
|
||||
foreach($itemsniveau01s as $itemniveau01) {
|
||||
if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) {
|
||||
if(!$fgessential || ($fgessential && $itemniveau01->getEssential()))
|
||||
$items->add($itemniveau01);
|
||||
if($fgessential) {
|
||||
$qb->andWhere("item.essential=:flag")
|
||||
->setParameter("flag",true);
|
||||
}
|
||||
|
||||
$itemsniveau01s=$qb->getQuery()->getResult();
|
||||
foreach($itemsniveau01s as $itemniveau01) {
|
||||
if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
|
||||
if(!$itemalls->contains($itemniveau01)) $itemalls->add($itemniveau01);
|
||||
}
|
||||
}
|
||||
|
@ -126,13 +129,14 @@ class ItemRepository extends EntityRepository
|
|||
->setParameter("itemcategory",$itemcategoryfilter);
|
||||
}
|
||||
|
||||
$itemsssoitems=$qb->getQuery()->getResult();
|
||||
foreach($itemsssoitems as $itemssoitem) {
|
||||
if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
|
||||
if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
|
||||
$items->add($itemssoitem);
|
||||
if($fgessential) {
|
||||
$qb->andWhere("item.essential=:flag")
|
||||
->setParameter("flag",true);
|
||||
}
|
||||
|
||||
$itemsssoitems=$qb->getQuery()->getResult();
|
||||
foreach($itemsssoitems as $itemssoitem) {
|
||||
if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) $items->add($itemssoitem);
|
||||
if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue