Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI/DataTable: with additional view control #8401

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

UI/DataTable: with additional view control #8401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08b28b1
UI/DataTable: with additional view control
nhaagen Nov 11, 2024
4662025
UI/DataTable: mixed params additional_viewcontrol_data, filter_data, …
nhaagen Nov 21, 2024
89998ab
(UI/DataTable): adjust DataRetrieval according to changed interface
nhaagen Nov 21, 2024
04e3733
UI/DataTable: with additional view control
nhaagen Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions components/ILIAS/AccessControl/src/Log/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$log_data = $this->rbac_log->getLogItems(
$this->getRefId(),
Expand All @@ -167,8 +168,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return $this->rbac_log->getLogItemsCount($this->getRefId(), $filter_data);
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/AdministrativeNotification/classes/DataRetrieval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$records = $this->getRecords($order);
foreach ($records as $idx => $record) {
Expand Down Expand Up @@ -86,8 +87,9 @@ protected function getRecords(Order $order): array
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return count(ilADNNotification::getArray());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Authentication/classes/Pages/AuthPageLanguagesOverviewTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ public function getRows(
array $visible_column_ids,
Data\Range $range,
Data\Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$records = $this->getRecords($range, $order);

Expand All @@ -185,8 +186,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
$this->initRecords();

Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilBadgeImageTemplateTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -130,8 +131,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return \count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilBadgePersonalTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $idx => $record) {
Expand All @@ -103,8 +104,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilBadgeTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -201,8 +202,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return \count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilBadgeTypesTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -116,8 +117,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return \count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilBadgeUserTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -210,8 +211,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return \count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Badge/classes/class.ilObjectBadgeTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -137,8 +138,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return \count($this->getRecords());
}
Expand Down
13 changes: 7 additions & 6 deletions components/ILIAS/Bibliographic/classes/Admin/Library/class.ilBiblLibraryTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
use ILIAS\UI\Component\Table\DataRowBuilder;
use ILIAS\Data\Range;
use ILIAS\Data\Order;
use Psr\Http\Message\ServerRequestInterface AS HttpRequest;
use Psr\Http\Message\ServerRequestInterface as HttpRequest;
use ILIAS\UI\Factory as UIFactory;
use ILIAS\UI\Renderer AS UIRenderer;
use ILIAS\UI\Renderer as UIRenderer;
use ILIAS\Data\Factory as DataFactory;
use ILIAS\UI\URLBuilder;
use ILIAS\UI\Component\Table\Data AS DataTable;
use ILIAS\UI\Component\Table\Data as DataTable;
use ILIAS\UI\URLBuilderToken;

/**
Expand Down Expand Up @@ -156,8 +156,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->getRecords($range, $order);
foreach ($records as $record) {
Expand All @@ -167,7 +168,7 @@ public function getRows(
}


public function getTotalRowCount(?array $filter_data, ?array $additional_parameters): ?int
public function getTotalRowCount(mixed $additional_viewcontrol_data, mixed $filter_data, mixed $additional_parameters): ?int
{
return count($this->getRecords());
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Bibliographic/classes/Field/DataRetrieval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$records = $this->getRecords($order);
foreach ($records as $idx => $record) {
Expand All @@ -67,8 +68,9 @@ protected function getRecords(Order $order): array
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return count($this->facade->fieldFactory()->getAvailableFieldsForObjId($this->facade->iliasObjId()));
}
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Bibliographic/classes/FieldFilter/DataRetrieval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$records = $this->getRecords($order);
foreach ($records as $idx => $record) {
Expand All @@ -70,8 +71,9 @@ protected function getRecords(Order $order): array
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
return count($this->facade->filterFactory()->getAllForObjectId($this->facade->iliasObjId()));
}
Expand Down
7 changes: 4 additions & 3 deletions components/ILIAS/Calendar/classes/ConsultationHours/BookingTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->provider->limitData($range, $order);
foreach ($records as $row) {
Expand All @@ -95,7 +96,7 @@ public function getRows(
}
}

public function getTotalRowCount(?array $filter_data, ?array $additional_parameters): ?int
public function getTotalRowCount(mixed $additional_viewcontrol_data, mixed $filter_data, mixed $additional_parameters): ?int
{
return count($this->provider->getData());
}
Expand Down
7 changes: 4 additions & 3 deletions components/ILIAS/Certificate/classes/Overview/CertificateOverviewTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
/**
* @var array{certificate_id: null|string, issue_date: null|DateTime, object: null|string, owner: null|string} $filter_data
Expand Down Expand Up @@ -130,7 +131,7 @@ public function getRows(
}
}

public function getTotalRowCount(?array $filter_data, ?array $additional_parameters): ?int
public function getTotalRowCount(mixed $additional_viewcontrol_data, mixed $filter_data, mixed $additional_parameters): ?int
{
/**
* @var array{certificate_id: null|string, issue_date: null|DateTime, object: null|string, owner: null|string} $filter_data
Expand Down
10 changes: 6 additions & 4 deletions components/ILIAS/Chatroom/classes/Bans/BannedUsersTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,9 @@ public function getRows(
array $visible_column_ids,
Data\Range $range,
Data\Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): \Generator {
$records = $this->getRecords($range, $order);

Expand All @@ -169,8 +170,9 @@ public function getRows(
}

public function getTotalRowCount(
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): ?int {
$this->initRecords();

Expand Down
7 changes: 4 additions & 3 deletions components/ILIAS/Conditions/classes/Configuration/ConditionTriggerTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ public function getRows(
array $visible_column_ids,
Range $range,
Order $order,
?array $filter_data,
?array $additional_parameters
mixed $additional_viewcontrol_data,
mixed $filter_data,
mixed $additional_parameters
): Generator {
$records = $this->provider->limitData($range, $order);
foreach ($records as $row) {
Expand All @@ -88,7 +89,7 @@ public function getRows(
}
}

public function getTotalRowCount(?array $filter_data, ?array $additional_parameters): ?int
public function getTotalRowCount(mixed $additional_viewcontrol_data, mixed $filter_data, mixed $additional_parameters): ?int
{
return count($this->provider->getData());
}
Expand Down
Loading
Loading