Project-Pro/shopPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 0.246: migrate banners list to new table

Browse Source
This commit is contained in:
Jacek Pyziak
2026-02-08 01:53:22 +01:00
parent d709a3df7b
commit bbf0c075b8
10 changed files with 231 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AGENTS.md Normal file
View File

@@ -0,0 +1,10 @@
# Workflow
## KONIEC PRACY
Gdy użytkownik napisze `KONIEC PRACY`, wykonaj kolejno:
1. Przeprowadzenie testów.
2. Przygotowanie aktualizacji (ZIP, plik z usuwanymi plikami, plik SQL jeśli wymagany).
3. Commit.
4. Push.

81
admin/templates/banners/banners-list.php
View File

@@ -1,78 +1,5 @@
<?php
global $gdb;
<?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?>
$grid = new \grid( 'pp_banners' );
$grid -> gdb_opt = $gdb;
$grid -> order = [ 'column' => 'name', 'type' => 'ASC' ];
$grid -> search = [
[ 'name' => 'Nazwa', 'db' => 'name', 'type' => 'text' ],
[ 'name' => 'Aktywny', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => [ 0 => 'nie', 1 => 'tak' ] ] ]
];
$grid -> columns_view = [
[
'name' => 'Lp.',
'th' => [ 'class' => 'g-lp' ],
'td' => [ 'class' => 'g-center' ],
'autoincrement' => true
],
[
'name' => 'Nazwa',
'db' => 'name',
'php' => 'echo "<a href=\'/admin/banners/banner_edit/id=[id]\'>[name]</a>";',
'sort' => true
],
[
'name' => 'Aktywny',
'db' => 'status',
'replace' => [ 'array' => [ 0 => '<span style="color: #FF0000;">nie</span>', 1 => 'tak' ] ],
'th' => [ 'class' => 'g-center', 'style' => 'width: 150px;' ],
'td' => [ 'class' => 'g-center' ]
],
[
'name' => 'Strona główna',
'db' => 'home_page',
'replace' => [ 'array' => [ 0 => 'nie', 1 => '<span class="text-system">tak</span>' ] ],
'th' => [ 'class' => 'g-center', 'style' => 'width: 150px;' ],
'td' => [ 'class' => 'g-center' ]
],
[
'name' => 'Slajder',
'db' => 'home_page',
'replace' => [ 'array' => [ 1 => 'nie', 0 => '<span class="text-system">tak</span>' ] ],
'th' => [ 'class' => 'g-center', 'style' => 'width: 150px;' ],
'td' => [ 'class' => 'g-center' ]
],
[
'name' => 'Data rozpoczęcia',
'th' => [ 'class' => 'g-center', 'style' => 'width: 140px;' ],
'td' => [ 'class' => 'g-center' ],
'php' => 'if ( "[date_start]" ) echo date( "Y-m-d", strtotime( "[date_start]" ) ); else echo "-";'
],
[
'name' => 'Data zakończenia',
'th' => [ 'class' => 'g-center', 'style' => 'width: 140px;' ],
'td' => [ 'class' => 'g-center' ],
'php' => 'if ( "[date_end]" ) echo date( "Y-m-d", strtotime( "[date_end]" ) ); else echo "-";'
],
[
'name' => 'Edytuj',
'action' => [ 'type' => 'edit', 'url' => '/admin/banners/banner_edit/id=[id]' ],
'th' => [ 'class' => 'g-center', 'style' => 'width: 70px;' ],
'td' => [ 'class' => 'g-center' ]
],
[
'name' => 'Usuń',
'action' => [ 'type' => 'delete', 'url' => '/admin/banners/banner_delete/id=[id]' ],
'th' => [ 'class' => 'g-center', 'style' => 'width: 70px;' ],
'td' => [ 'class' => 'g-center' ]
]
];
$grid -> buttons = [
[
'label' => 'Dodaj baner',
'url' => '/admin/banners/banner_edit/',
'icon' => 'fa-plus-circle',
'class' => 'btn-success'
]
];
echo $grid -> draw();
<?php if (!empty($this->viewModel->customScriptView)): ?>
<?= \Tpl::view($this->viewModel->customScriptView, ['list' => $this->viewModel]); ?>
<?php endif; ?>

84
autoload/Domain/Banner/BannerRepository.php
View File

@@ -6,6 +6,8 @@ namespace Domain\Banner;
*/
class BannerRepository
{
private const MAX_PER_PAGE = 100;
private $db;
public function __construct($db)
@@ -82,6 +84,88 @@ class BannerRepository
return (int)$bannerId;
}
/**
* Zwraca liste banerow do panelu admin z filtrowaniem, sortowaniem i paginacja.
*
* @return array{items: array<int, array<string, mixed>>, total: int}
*/
public function listForAdmin(
array $filters,
string $sortColumn = 'name',
string $sortDir = 'ASC',
int $page = 1,
int $perPage = 15
): array {
$sortColumn = trim($sortColumn);
$sortDir = strtoupper(trim($sortDir));
$allowedSortColumns = [
'name' => 'b.name',
'status' => 'b.status',
'home_page' => 'b.home_page',
'date_start' => 'b.date_start',
'date_end' => 'b.date_end',
];
$sortSql = $allowedSortColumns[$sortColumn] ?? 'b.name';
$sortDir = $sortDir === 'DESC' ? 'DESC' : 'ASC';
$page = max(1, $page);
$perPage = min(self::MAX_PER_PAGE, max(1, $perPage));
$offset = ($page - 1) * $perPage;
$where = ['1=1'];
$params = [];
$name = trim((string)($filters['name'] ?? ''));
if (strlen($name) > 255) {
$name = substr($name, 0, 255);
}
if ($name !== '') {
$where[] = 'b.name LIKE :name';
$params[':name'] = '%' . $name . '%';
}
if (($filters['status'] ?? '') !== '' && ($filters['status'] === '0' || $filters['status'] === '1')) {
$where[] = 'b.status = :status';
$params[':status'] = (int)$filters['status'];
}
$whereSql = implode(' AND ', $where);
$sqlCount = "
SELECT COUNT(0)
FROM pp_banners AS b
WHERE {$whereSql}
";
$stmtCount = $this->db->query($sqlCount, $params);
$countRows = $stmtCount ? $stmtCount->fetchAll() : [];
$total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0;
$sql = "
SELECT
b.id,
b.name,
b.status,
b.home_page,
b.date_start,
b.date_end
FROM pp_banners AS b
WHERE {$whereSql}
ORDER BY {$sortSql} {$sortDir}, b.id {$sortDir}
LIMIT {$perPage} OFFSET {$offset}
";
$stmt = $this->db->query($sql, $params);
$items = $stmt ? $stmt->fetchAll() : [];
return [
'items' => is_array($items) ? $items : [],
'total' => $total,
];
}
/**
* Zapisuje tłumaczenia banera
*/

133
autoload/admin/Controllers/BannerController.php
View File

@@ -3,14 +3,6 @@ namespace admin\Controllers;
use Domain\Banner\BannerRepository;
/**
* Kontroler banerów w panelu administratora (nowa architektura)
*
* Porównanie z starym kontrolerem admin\controls\Banners:
* - Używa Dependency Injection zamiast global $mdb
* - Deleguje logikę do Domain\Banner\BannerRepository
* - Kontroler zajmuje się TYLKO obsługą requestów i odpowiedzi
*/
class BannerController
{
private BannerRepository $repository;
@@ -21,12 +13,123 @@ class BannerController
}
/**
* Lista banerów
* Lista banerow
*/
public function list(): string
{
// Widok nie zmienia się - nadal używamy starego systemu szablonów
return \admin\view\Banners::banners_list();
$sortableColumns = ['name', 'status', 'home_page', 'date_start', 'date_end'];
$filterDefinitions = [
[
'key' => 'name',
'label' => 'Nazwa',
'type' => 'text',
],
[
'key' => 'status',
'label' => 'Aktywny',
'type' => 'select',
'options' => [
'' => '- aktywny -',
'1' => 'tak',
'0' => 'nie',
],
],
];
$listRequest = \admin\Support\TableListRequestFactory::fromRequest(
$filterDefinitions,
$sortableColumns,
'name'
);
// Historycznie lista banerow domyslnie byla sortowana rosnaco po nazwie.
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
$sortDir = 'ASC';
}
$result = $this->repository->listForAdmin(
$listRequest['filters'],
$listRequest['sortColumn'],
$sortDir,
$listRequest['page'],
$listRequest['perPage']
);
$rows = [];
$lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1;
foreach ($result['items'] as $item) {
$id = (int)$item['id'];
$name = (string)($item['name'] ?? '');
$homePage = (int)($item['home_page'] ?? 0);
$isActive = (int)($item['status'] ?? 0) === 1;
$rows[] = [
'lp' => $lp++ . '.',
'name' => '<a href="/admin/banners/banner_edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
'status' => $isActive ? 'tak' : '<span style="color: #FF0000;">nie</span>',
'home_page' => $homePage === 1 ? '<span class="text-system">tak</span>' : 'nie',
'slider' => $homePage === 1 ? 'nie' : '<span class="text-system">tak</span>',
'date_start' => !empty($item['date_start']) ? date('Y-m-d', strtotime((string)$item['date_start'])) : '-',
'date_end' => !empty($item['date_end']) ? date('Y-m-d', strtotime((string)$item['date_end'])) : '-',
'_actions' => [
[
'label' => 'Edytuj',
'url' => '/admin/banners/banner_edit/id=' . $id,
'class' => 'btn btn-xs btn-primary',
],
[
'label' => 'Usun',
'url' => '/admin/banners/banner_delete/id=' . $id,
'class' => 'btn btn-xs btn-danger',
'confirm' => 'Na pewno chcesz usunac wybrany element?',
],
],
];
}
$total = (int)$result['total'];
$totalPages = max(1, (int)ceil($total / $listRequest['perPage']));
$viewModel = new \admin\ViewModels\Common\PaginatedTableViewModel(
[
['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
['key' => 'name', 'sort_key' => 'name', 'label' => 'Nazwa', 'sortable' => true, 'raw' => true],
['key' => 'status', 'sort_key' => 'status', 'label' => 'Aktywny', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
['key' => 'home_page', 'sort_key' => 'home_page', 'label' => 'Strona glowna', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
['key' => 'slider', 'label' => 'Slajder', 'class' => 'text-center', 'sortable' => false, 'raw' => true],
['key' => 'date_start', 'sort_key' => 'date_start', 'label' => 'Data rozpoczecia', 'class' => 'text-center', 'sortable' => true],
['key' => 'date_end', 'sort_key' => 'date_end', 'label' => 'Data zakonczenia', 'class' => 'text-center', 'sortable' => true],
],
$rows,
$listRequest['viewFilters'],
[
'column' => $listRequest['sortColumn'],
'dir' => $sortDir,
],
[
'page' => $listRequest['page'],
'per_page' => $listRequest['perPage'],
'total' => $total,
'total_pages' => $totalPages,
],
array_merge($listRequest['queryFilters'], [
'sort' => $listRequest['sortColumn'],
'dir' => $sortDir,
'per_page' => $listRequest['perPage'],
]),
$listRequest['perPageOptions'],
$sortableColumns,
'/admin/banners/view_list/',
'Brak danych w tabeli.',
'/admin/banners/banner_edit/',
'Dodaj baner'
);
return \Tpl::view('banners/banners-list', [
'viewModel' => $viewModel,
]);
}
/**
@@ -46,13 +149,13 @@ class BannerController
*/
public function save(): void
{
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania baneru wystąpił błąd. Proszę spróbować ponownie.'];
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania baneru wystapil blad. Prosze sprobowac ponownie.'];
$values = json_decode(\S::get('values'), true);
$bannerId = $this->repository->save($values);
if ($bannerId) {
\S::delete_dir('../temp/');
$response = ['status' => 'ok', 'msg' => 'Baner został zapisany.', 'id' => $bannerId];
$response = ['status' => 'ok', 'msg' => 'Baner zostal zapisany.', 'id' => $bannerId];
}
echo json_encode($response);
@@ -60,14 +163,14 @@ class BannerController
}
/**
* Usunięcie banera
* Usuniecie banera
*/
public function delete(): void
{
$bannerId = (int)\S::get('id');
if ($this->repository->delete($bannerId)) {
\S::delete_dir('../temp/');
\S::alert('Baner został usunięty.');
\S::alert('Baner zostal usuniety.');
}
header('Location: /admin/banners/view_list/');

64
autoload/admin/controls/class.Banners.php
View File

@@ -1,64 +0,0 @@
<?php
namespace admin\controls;
/**
* Stary kontroler - fallback dla routingu
* Nowy routing kieruje do admin\Controllers\BannerController
* Ten plik jest używany tylko gdy nowy kontroler nie jest dostępny
*/
class Banners
{
/**
* @deprecated Routing kieruje do admin\Controllers\BannerController::delete().
* Ta metoda pozostaje tylko jako fallback dla starej architektury.
*/
public static function banner_delete()
{
if ( \admin\factory\Banners::banner_delete( \S::get( 'id' ) ) )
\S::alert( 'Baner został usunięty.' );
header( 'Location: /admin/banners/view_list/' );
exit;
}
/**
* @deprecated Routing kieruje do admin\Controllers\BannerController::save().
* Ta metoda pozostaje tylko jako fallback dla starej architektury.
*/
public static function banner_save()
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania baneru wystąpił błąd. Proszę spróbować ponownie.' ];
$values = json_decode( \S::get( 'values' ), true );
if ( $banner_id = \admin\factory\Banners::banner_save( $values['id'], $values['name'], $values['status'], $values['date_start'], $values['date_end'],
$values['home_page'], $values['src'], $values['url'], $values['html'], $values['text'] ) )
$response = [ 'status' => 'ok', 'msg' => 'Baner został zapisany.', 'id' => $banner_id ];
echo json_encode( $response );
exit;
}
/**
* @deprecated Routing kieruje do admin\Controllers\BannerController::edit().
* Ta metoda pozostaje tylko jako fallback dla starej architektury.
*/
public static function banner_edit()
{
return \admin\view\Banners::banner_edit(
\admin\factory\Banners::banner_details(
\S::get( 'id' )
),
\admin\factory\Languages::languages_list()
);
}
/**
* @deprecated Routing kieruje do admin\Controllers\BannerController::list().
* Ta metoda pozostaje tylko jako fallback dla starej architektury.
*/
public static function view_list()
{
return \admin\view\Banners::banners_list();
}
}
?>

8
autoload/admin/view/class.Banners.php
View File

@@ -5,8 +5,12 @@ class Banners
{
public static function banners_list()
{
$tpl = new \Tpl;
return $tpl -> render( 'banners/banners-list' );
// Fallback dla legacy wywolan widoku.
global $mdb;
$controller = new \admin\Controllers\BannerController(
new \Domain\Banner\BannerRepository( $mdb )
);
return $controller->list();
}
public static function banner_edit( $banner, $languages )

BIN
updates/0.20/ver_0.246.zip Normal file
View File

Binary file not shown.

1
updates/0.20/ver_0.246_files.txt Normal file
View File

@@ -0,0 +1 @@
F: ../autoload/admin/controls/class.Banners.php

7
updates/changelog.php
View File

@@ -1,4 +1,11 @@
<b>ver. 0.245</b><br />
<b>ver. 0.246</b><br />
- UPDATE - migracja listy banerow do nowego mechanizmu tabeli (`components/table-list`, filtrowanie, sortowanie, paginacja)
- UPDATE - `admin\Controllers\BannerController::list()` buduje `PaginatedTableViewModel`
- UPDATE - `Domain\Banner\BannerRepository::listForAdmin()` (bezpieczne filtrowanie i sortowanie)
- UPDATE - usunieto legacy kontroler `autoload/admin/controls/class.Banners.php`
- UPDATE - plik do usuniecia dodany w `updates/0.20/ver_0.246_files.txt`
<hr><b>ver. 0.245</b><br />
- UPDATE - refaktoryzacja listy artykulow: wspolny komponent `admin/templates/components/table-list.php` + `PaginatedTableViewModel`
- NEW - `admin\Support\TableListRequestFactory` (wspolna obsluga filtrow, sortowania i paginacji dla list)
- UPDATE - `Domain\Article\ArticleRepository::listForAdmin()` utwardzone pod katem bezpieczenstwa (whitelist sortowania, bind params, limit per_page)

2
updates/versions.php
View File

@@ -1,5 +1,5 @@
<?
$current_ver = 245;
$current_ver = 246;
for ($i = 1; $i <= $current_ver; $i++)
{