ver. 0.251 - migrate Dictionaries to Domain/Controller and remove legacy classes

autoload/admin/Controllers/DictionariesController.php

@@ -0,0 +1,253 @@
+<?php
+namespace admin\Controllers;
+
+use Domain\Dictionaries\DictionariesRepository;
+use admin\ViewModels\Forms\FormAction;
+use admin\ViewModels\Forms\FormEditViewModel;
+use admin\ViewModels\Forms\FormField;
+use admin\ViewModels\Forms\FormTab;
+use admin\Support\Forms\FormRequestHandler;
+
+class DictionariesController
+{
+    private DictionariesRepository $repository;
+    private FormRequestHandler $formHandler;
+
+    public function __construct(DictionariesRepository $repository)
+    {
+        $this->repository = $repository;
+        $this->formHandler = new FormRequestHandler();
+    }
+
+    public function list(): string
+    {
+        $sortableColumns = ['id', 'text'];
+
+        $filterDefinitions = [
+            [
+                'key' => 'text',
+                'label' => 'Tekst',
+                'type' => 'text',
+            ],
+        ];
+
+        $listRequest = \admin\Support\TableListRequestFactory::fromRequest(
+            $filterDefinitions,
+            $sortableColumns,
+            'id'
+        );
+
+        $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'];
+            $text = trim((string)($item['text'] ?? ''));
+
+            $rows[] = [
+                'lp' => $lp++ . '.',
+                'text' => '<a href="/admin/dictionaries/unit_edit/id=' . $id . '">' . htmlspecialchars($text, ENT_QUOTES, 'UTF-8') . '</a>',
+                '_actions' => [
+                    [
+                        'label' => 'Edytuj',
+                        'url' => '/admin/dictionaries/unit_edit/id=' . $id,
+                        'class' => 'btn btn-xs btn-primary',
+                    ],
+                    [
+                        'label' => 'Usun',
+                        'url' => '/admin/dictionaries/unit_delete/id=' . $id,
+                        'class' => 'btn btn-xs btn-danger',
+                        'confirm' => 'Na pewno chcesz usunac wybrana jednostke miary?',
+                    ],
+                ],
+            ];
+        }
+
+        $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' => 'text', 'sort_key' => 'text', 'label' => 'Tekst', 'sortable' => true, 'raw' => 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/dictionaries/view_list/',
+            'Brak danych w tabeli.',
+            '/admin/dictionaries/unit_edit/',
+            'Dodaj jednostke miary'
+        );
+
+        return \Tpl::view('dictionaries/units-list', [
+            'viewModel' => $viewModel,
+        ]);
+    }
+
+    public function edit(): string
+    {
+        $unitId = (int)\S::get('id');
+        $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
+        $languages = \admin\factory\Languages::languages_list();
+
+        $validationErrors = $_SESSION['form_errors'][$this->getFormId()] ?? null;
+        if ($validationErrors) {
+            unset($_SESSION['form_errors'][$this->getFormId()]);
+        }
+
+        $viewModel = $this->buildFormViewModel($unit, $languages, $validationErrors);
+
+        return \Tpl::view('dictionaries/unit-edit', ['form' => $viewModel]);
+    }
+
+    public function save(): void
+    {
+        $legacyValues = \S::get('values');
+        if ($legacyValues) {
+            $values = json_decode($legacyValues, true);
+            $response = ['status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystapil blad.'];
+
+            if (is_array($values)) {
+                $savedId = $this->repository->save([
+                    'id' => (int)($values['id'] ?? 0),
+                    'text' => (array)($values['text'] ?? []),
+                ]);
+                if ($savedId) {
+                    $response = ['status' => 'ok', 'msg' => 'Jednostka miary zostala zapisana.', 'id' => $savedId];
+                }
+            }
+
+            echo json_encode($response);
+            exit;
+        }
+
+        $unitId = (int)\S::get('id');
+        $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
+        $languages = \admin\factory\Languages::languages_list();
+        $viewModel = $this->buildFormViewModel($unit, $languages);
+
+        $result = $this->formHandler->handleSubmit($viewModel, $_POST);
+        if (!$result['success']) {
+            $_SESSION['form_errors'][$this->getFormId()] = $result['errors'];
+            echo json_encode(['success' => false, 'errors' => $result['errors']]);
+            exit;
+        }
+
+        $data = $result['data'];
+        $data['id'] = $unitId ?: null;
+
+        $savedId = $this->repository->save($data);
+        if ($savedId) {
+            echo json_encode([
+                'success' => true,
+                'id' => $savedId,
+                'message' => 'Jednostka miary zostala zapisana.',
+            ]);
+            exit;
+        }
+
+        echo json_encode([
+            'success' => false,
+            'errors' => ['general' => 'Blad podczas zapisywania do bazy.'],
+        ]);
+        exit;
+    }
+
+    public function delete(): void
+    {
+        $unitId = (int)\S::get('id');
+        if ($this->repository->delete($unitId)) {
+            \S::alert('Jednostka miary zostala usunieta.');
+        }
+
+        header('Location: /admin/dictionaries/view_list/');
+        exit;
+    }
+
+    private function buildFormViewModel(array $unit, array $languages, ?array $errors = null): FormEditViewModel
+    {
+        $unitId = (int)($unit['id'] ?? 0);
+        $isNew = $unitId <= 0;
+
+        $data = [
+            'id' => $unitId,
+            'languages' => [],
+        ];
+
+        if (isset($unit['languages']) && is_array($unit['languages'])) {
+            foreach ($unit['languages'] as $langId => $translation) {
+                $data['languages'][(string)$langId] = [
+                    'text' => (string)($translation['text'] ?? ''),
+                ];
+            }
+        }
+
+        $tabs = [
+            new FormTab('content', 'Tresc', 'fa-file'),
+        ];
+
+        $fields = [
+            FormField::langSection('translations', 'content', [
+                FormField::text('text', [
+                    'label' => 'Tekst',
+                ]),
+            ]),
+        ];
+
+        $actionUrl = '/admin/dictionaries/unit_save/' . ($isNew ? '' : ('id=' . $unitId));
+        $actions = [
+            FormAction::save($actionUrl, '/admin/dictionaries/view_list/'),
+            FormAction::cancel('/admin/dictionaries/view_list/'),
+        ];
+
+        return new FormEditViewModel(
+            $this->getFormId(),
+            $isNew ? 'Nowa jednostka miary' : 'Edycja jednostki miary',
+            $data,
+            $fields,
+            $tabs,
+            $actions,
+            'POST',
+            $actionUrl,
+            '/admin/dictionaries/view_list/',
+            true,
+            ['id' => $unitId],
+            $languages,
+            $errors
+        );
+    }
+
+    private function getFormId(): string
+    {
+        return 'dictionaries-unit-edit';
+    }
+}

autoload/admin/class.Site.php

@@ -227,6 +227,13 @@ class Site
           new \Domain\Product\ProductRepository( $mdb )
         );
       },
+      'Dictionaries' => function() {
+        global $mdb;
+
+        return new \admin\Controllers\DictionariesController(
+          new \Domain\Dictionaries\DictionariesRepository( $mdb )
+        );
+      },
     ];
 
     return self::$newControllers;
@@ -267,6 +274,9 @@ class Site
     'clear_cache_ajax' => 'clearCacheAjax',
     'settings_save' => 'save',
     'products_list' => 'list',
+    'unit_edit' => 'edit',
+    'unit_save' => 'save',
+    'unit_delete' => 'delete',
   ];
 
   public static function route()

autoload/admin/controls/class.Dictionaries.php

@@ -1,39 +0,0 @@
-<?php
-namespace admin\controls;
-
-class Dictionaries {
-  public static function view_list()
-  {
-    return \Tpl::view( 'dictionaries/units-list' );
-  }
-
-  public static function unit_edit()
-  {
-    return \Tpl::view( 'dictionaries/unit-edit', [
-      'unit' => \admin\factory\Dictionaries::unit_details( \S::get( 'id' )),
-      'languages' => \admin\factory\Languages::languages_list(),
-    ] );
-  }
-
-  static public function unit_save()
-  {
-    $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystąpił błąd. Proszę spróbować ponownie.' ];
-    $values = json_decode( \S::get( 'values' ), true );
-
-    if ( $id = \admin\factory\Dictionaries::unit_save( $values['id'], $values['text']) )
-      $response = [ 'status' => 'ok', 'msg' => 'Jednostka miary została zapisana.', 'id' => $id ];
-
-    echo json_encode( $response );
-    exit;
-
-  }
-
-  static public function unit_delete()
-  {
-    if ( \admin\factory\Dictionaries::unit_delete( \S::get( 'id' ) ) )
-      \S::alert( 'Jesdnostka miary została usunięta.' );
-
-    header( 'Location: /admin/dictionaries/view_list/' );
-    exit;
-  }
-}

autoload/admin/controls/class.ShopProduct.php

@@ -230,7 +230,7 @@ class ShopProduct
 
   // edycja produktu
   public static function product_edit() {
-    global $user;
+    global $user, $mdb;
 
     if ( !$user ) {
       header( 'Location: /admin/' );
@@ -249,7 +249,7 @@ class ShopProduct
       'dlang'       => \front\factory\Languages::default_language(),
       'sets'        => \shop\ProductSet::sets_list(),
       'producers'   => \admin\factory\ShopProducer::all(),
-      'units'       => \admin\factory\Dictionaries::all_units(),
+      'units'       => ( new \Domain\Dictionaries\DictionariesRepository( $mdb ) ) -> allUnits(),
       'user'        => $user
     ] );
   }

autoload/admin/factory/class.Dictionaries.php

@@ -1,89 +0,0 @@
-<?
-namespace admin\factory;
-class Dictionaries
-{
-  static public function all_units()
-  {
-    global $mdb;
-
-    $results = $mdb -> select( 'pp_units', '*' );
-    foreach ( $results as $row )
-    {
-      $resutls2 = $mdb -> query( 'SELECT text FROM pp_units_langs AS psl, pp_langs AS pl WHERE unit_id = ' . $row['id'] . ' AND lang_id = pl.id AND text != \'\' ORDER BY o ASC LIMIT 1' ) -> fetchAll( \PDO::FETCH_ASSOC );
-      $row['text'] = $resutls2[0]['text'];
-      $units[ $row['id'] ] = $row;
-    }
-    return $units;
-  }
-
-  static public function unit_details( $unit_id )
-  {
-    global $mdb;
-
-    $unit = $mdb -> get( 'pp_units', '*', [ 'id' => (int)$unit_id ] );
-
-    $results = $mdb -> select( 'pp_units_langs', '*', [ 'unit_id' => (int)$unit_id ] );
-    if ( is_array( $results ) ) foreach ( $results as $row )
-      $unit['languages'][ $row['lang_id'] ] = $row;
-
-    return $unit;
-
-  }
-
-  static public function unit_save( $unit_id, $text )
-  {
-    global $mdb;
-
-    if ( !$unit_id )
-    {
-      $mdb -> insert( 'pp_units', array());
-
-      $id = $mdb -> id();
-
-      if ( $id )
-      {
-        foreach ( $text as $key => $val )
-        {
-          $mdb -> insert( 'pp_units_langs', [
-            'unit_id' => (int)$id,
-            'lang_id' => $key,
-            'text' => $text[$key]
-          ] );
-        }
-
-        \S::delete_dir( '../temp/' );
-
-        return $id;
-      }
-    }
-    else
-    {
-      foreach ( $text as $key => $val )
-      {
-        if ( $translation_id = $mdb -> get( 'pp_units_langs', 'id', [ 'AND' => [ 'unit_id' => $unit_id, 'lang_id' => $key ] ] ) )
-          $mdb -> update( 'pp_units_langs', [
-            'lang_id' => $key,
-            'text' => $text[$key]
-          ], [
-            'id' => $translation_id
-          ] );
-        else
-          $mdb -> insert( 'pp_units_langs', [
-            'unit_id' => (int)$unit_id,
-            'lang_id' => $key,
-            'text' => $text[$key]
-          ] );
-      }
-
-      \S::delete_dir( '../temp/dictionaries' );
-
-      return $unit_id;
-    }
-  }
-
-  static public function unit_delete( $unit_id )
-  {
-    global $mdb;
-    return $mdb -> delete( 'pp_units', [ 'id' => (int)$unit_id ] );
-  }
-}