small fixes

LitusProject · Oct 6, 2023 · 910076d · 910076d
1 parent f2a4e18
commit 910076d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/module/LogisticsBundle/Controller/CatalogController.php b/module/LogisticsBundle/Controller/CatalogController.php
@@ -36,7 +36,9 @@ public function overviewAction()
         // Gets last order for every request
         $lastOrders = array();
         foreach ($requests as $request) {
-            $lastOrders[] = $this->getLastOrderByRequest($request);
+            $lastOrder = $this->getLastOrderByRequest($request);
+            if ($lastOrder)
+            $lastOrders[] = $lastOrder;
         }
 
         return new ViewModel(
@@ -112,7 +114,7 @@ public function catalogAction()
                 );
 
                 $allArticles[] = $articleInfo;
-            } elseif ($art->isGreaterVtkVisibility() && $academic->isInWorkingGroup()) {
+            } elseif ($art->isGreaterVtkVisibility() && ($academic->isInWorkingGroup() || $academic->isPraesidium($this->getCurrentAcademicYear()))) {
                 $articleInfo = array(
                     'article' => $art,
                     'mapped'  => $mapped[$art->getId()] ?? 0,
@@ -660,6 +662,7 @@ private function getLastOrderByRequest($request)                  // Gets the mo
         $orders = $this->getEntityManager()
             ->getRepository('LogisticsBundle\Entity\Order')
             ->findAllByRequest($request);
+        array_pop($orders);                                     // pop dummy order
         return current($orders);                                       // Gets the first element of an array
     }