review dashboard #4 blockdto

leifos-gmbh · Jun 26, 2023 · 90272d7 · 90272d7
1 parent 06b61b0
commit 90272d7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/...rd/Block/classes/class.ilBlockDataDTO.php → ...hboard/Block/classes/class.ilBlockDTO.php b/...rd/Block/classes/class.ilBlockDataDTO.php → ...hboard/Block/classes/class.ilBlockDTO.php
@@ -17,7 +17,7 @@
 *********************************************************************/
 
 declare(strict_types=1);
-class ilBlockDataDTO
+class ilBlockDTO
 {
     private string $type;
     private int $ref_id;

diff --git a/Services/Dashboard/Block/classes/class.ilDashboardBlockGUI.php b/Services/Dashboard/Block/classes/class.ilDashboardBlockGUI.php
@@ -74,7 +74,7 @@ abstract public function addCustomCommandsToActionMenu(ilObjectListGUI $itemList
     abstract public function emptyHandling(): string;
 
 
-    protected function getCardForData(ilBlockDataDTO $data): ?RepositoryObject
+    protected function getCardForData(ilBlockDTO $data): ?RepositoryObject
     {
         $itemListGui = $this->byType($data->getType());
         $card = $itemListGui->getAsCard(
@@ -107,7 +107,7 @@ protected function getListItemGroups(): array
         return $groupedCards;
     }
 
-    protected function getListItemForDataDTO(ilBlockDataDTO $data): ?Item
+    protected function getListItemForDataDTO(ilBlockDTO $data): ?Item
     {
         $itemListGui = $this->byType($data->getType());
         $this->addCustomCommandsToActionMenu($itemListGui, $data->getRefId());
@@ -200,31 +200,31 @@ public function getHTML(): string
     }
 
     /**
-     * @param array<string, ilBlockDataDTO[]> $a_data
+     * @param array<string, ilBlockDTO[]> $a_data
      */
     public function setData(array $a_data): void
     {
         $this->data = array_filter(array_map(
-            static fn ($group) => array_filter($group, fn ($item) => $item instanceof ilBlockDataDTO),
+            static fn ($group) => array_filter($group, fn ($item) => $item instanceof ilBlockDTO),
             $a_data
         ));
     }
 
     /**
-     * @return array<string, ilBlockDataDTO[]>
+     * @return array<string, ilBlockDTO[]>
      */
     public function getData(): array
     {
         return parent::getData();
     }
 
     /**
-     * @return array<string, ilBlockDataDTO[]>
+     * @return array<string, ilBlockDTO[]>
      */
     public function groupItemsByStartDate(): array
     {
         $data = $this->getData();
-        /** @var ilBlockDataDTO[] $items */
+        /** @var ilBlockDTO[] $items */
         $items = array_merge(...array_values($data));
 
         $groups = [
@@ -247,7 +247,7 @@ public function groupItemsByStartDate(): array
             }
         }
 
-        $orderByDate = static function (ilBlockDataDTO $left, ilBlockDataDTO $right, bool $asc = true) {
+        $orderByDate = static function (ilBlockDTO $left, ilBlockDTO $right, bool $asc = true) {
             if ($left->getStartDate() && $right->getStartDate() && $left->getStartDate()->get(
                 IL_CAL_UNIX
             ) < $right->getStartDate()->get(IL_CAL_UNIX)) {
@@ -277,7 +277,7 @@ public function groupItemsByStartDate(): array
     }
 
     /**
-     * @return array<string, ilBlockDataDTO[]>
+     * @return array<string, ilBlockDTO[]>
      */
     protected function groupItemsByType(): array
     {
@@ -286,7 +286,7 @@ protected function groupItemsByType(): array
         );
         $grouped_items = [];
         $data = $this->getData();
-        /** @var ilBlockDataDTO[] $data */
+        /** @var ilBlockDTO[] $data */
         $data = array_merge(...array_values($data));
         $provider = new ilPDSelectedItemsBlockMembershipsProvider($this->viewSettings->getActor());
 
@@ -317,17 +317,17 @@ protected function groupItemsByType(): array
     }
 
     /**
-     * @return array<string, ilBlockDataDTO[]>
+     * @return array<string, ilBlockDTO[]>
      */
     protected function groupItemsByLocation(): array
     {
         $grouped_items = [];
         $data = $this->getData();
-        /** @var ilBlockDataDTO[] $data */
+        /** @var ilBlockDTO[] $data */
         $data = array_merge(...array_values($data));
 
         $parent_ref_ids = array_values(array_unique(
-            array_map(fn (ilBlockDataDTO $item): ?int => $this->tree->getParentId($item->getRefId()), $data)
+            array_map(fn (ilBlockDTO $item): ?int => $this->tree->getParentId($item->getRefId()), $data)
         ));
         $this->object_cache->preloadReferenceCache($parent_ref_ids);
 
@@ -464,7 +464,7 @@ protected function returnToContext(): void
     }
 
     /**
-     * @return array<string, ilBlockDataDTO[]>
+     * @return array<string, ilBlockDTO[]>
      */
     public function getItemGroups(): array
     {
@@ -741,13 +741,13 @@ public function byType(string $a_type): ilObjectListGUI
     }
 
     /**
-     * @param ilBlockDataDTO[] $data
+     * @param ilBlockDTO[] $data
      */
     private function sortByTitle(array $data, bool $asc = true): array
     {
         uasort(
             $data,
-            static fn (ilBlockDataDTO $left, ilBlockDataDTO $right) => $asc ?
+            static fn (ilBlockDTO $left, ilBlockDTO $right) => $asc ?
                 strcmp($left->getTitle(), $right->getTitle()) :
                 strcmp($right->getTitle(), $left->getTitle())
         );

diff --git a/Services/Dashboard/Block/classes/class.ilLearningSequenceBlockGUI.php b/Services/Dashboard/Block/classes/class.ilLearningSequenceBlockGUI.php
@@ -76,7 +76,7 @@ public function initData(): void
                 continue;
             }
 
-            $data[] = new ilBlockDataDTO(
+            $data[] = new ilBlockDTO(
                 'lso',
                 $lso_ref_id,
                 $lso_obj->getId(),

diff --git a/Services/Dashboard/Block/classes/class.ilMembershipBlockGUI.php b/Services/Dashboard/Block/classes/class.ilMembershipBlockGUI.php
@@ -47,7 +47,7 @@ public function initData(): void
         $data = array_map(static function (array $item) {
             $start = isset($item['start']) && $item['start'] instanceof ilDateTime ? $item['start'] : null;
             $end = isset($item['end']) && $item['end'] instanceof ilDateTime ? $item['end'] : null;
-            return new ilBlockDataDTO(
+            return new ilBlockDTO(
                 $item['type'],
                 (int) $item['ref_id'],
                 (int) $item['obj_id'],

diff --git a/Services/Dashboard/Block/classes/class.ilRecommendedContentBlockGUI.php b/Services/Dashboard/Block/classes/class.ilRecommendedContentBlockGUI.php
@@ -84,7 +84,7 @@ public function initData(): void
                         break;
                 }
             }
-            return new ilBlockDataDTO(
+            return new ilBlockDTO(
                 ilObject::_lookupType($obj_id),
                 $ref_id,
                 $obj_id,

diff --git a/Services/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php b/Services/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php
@@ -74,7 +74,7 @@ public function initData(): void
         $data = array_map(static function (array $item) {
             $start = isset($item['start']) && $item['start'] instanceof ilDateTime ? $item['start'] : null;
             $end = isset($item['end']) && $item['end'] instanceof ilDateTime ? $item['end'] : null;
-            return new ilBlockDataDTO(
+            return new ilBlockDTO(
                 $item['type'],
                 (int) $item['ref_id'],
                 (int) $item['obj_id'],

diff --git a/Services/Dashboard/Block/classes/class.ilStudyProgrammeBlockGUI.php b/Services/Dashboard/Block/classes/class.ilStudyProgrammeBlockGUI.php
@@ -24,7 +24,7 @@ class ilStudyProgrammeBlockGUI extends ilDashboardBlockGUI
 {
     protected ?string $visible_on_pd_mode = null;
 
-    protected function getListItemForDataDTO(ilBlockDataDTO $data): ?Item
+    protected function getListItemForDataDTO(ilBlockDTO $data): ?Item
     {
         $item_gui = $this->byType($data->getType());
         $item_gui->initItem(
@@ -158,7 +158,7 @@ public function initData(): void
                 $properties[] = [$this->lng->txt('certificate') => $this->renderer->render($cert_link)];
             }
 
-            $items[] = new ilBlockDataDTO(
+            $items[] = new ilBlockDTO(
                 $prg->getType(),
                 $prg->getRefId(),
                 $prg->getId(),