filter fix

examples/simple.json

@@ -15,11 +15,11 @@
     "currentPage": "1",
     "showActionColumn": true,
     "showFiltersRow": true,
-    "filter": true,
     "total": 10,
     "paginationPrefix": "/page",
     "params": {"class":  "table table-bordered", "border": "1"}
   },
+  "filters": ["email", "status"],
   "data": [
     {"id": 1,"email":"fas1@mail.ru","description":"sdgsdfg","description2":"ffdghdas", "created_at": "17.06.2024", "status":  "1"},
     {"id": 2,"email":"fas2@mail.ru","description":"fafdgdfgsdfdfs","description2":"ffdghdas", "created_at": "18.06.2024", "status":  "1"},

examples/simple.php

@@ -68,6 +68,9 @@ $table->addColumn("Колонка 33", "k33", function ($id) {
 $table->addColumn("Колонка 34", "k34", function ($id) {
     return "some34";
 });
+$table->addAction(function($row, $url){
+    return "<a href='mailto:". $row['email'] ."'>Написать</a>";
+});
 $table->create();
 $table->render();
 

examples/view.php

@@ -7,6 +7,10 @@ use Itguild\Tables\ViewJsonTable;
 $json = file_get_contents('view.json');
 
 $table = new ViewJsonTable($json);
+
+$table->addRow("Имя", function (){
+    return "Kirill";
+}, ['after' => 'username']);
 //$table->rows([
 $table->rows([
     'username' => function ($cell) {

src/ListJsonTable.php

@@ -6,8 +6,10 @@ use Exception;
 use Itguild\Tables\ActionColumn\DeleteActionColumn;
 use Itguild\Tables\ActionColumn\EditActionColumn;
 use Itguild\Tables\ActionColumn\ViewActionColumn;
+use Itguild\Tables\Filter\InputTextFilter;
 use Itguild\Tables\traits\CreateParams;
 use JetBrains\PhpStorm\NoReturn;
+use kernel\helpers\Debug;
 
 class ListJsonTable extends JasonTable
 {
@@ -17,6 +19,7 @@ class ListJsonTable extends JasonTable
 
     private int $count = 0;
     private string $baseUrl;
+    private string $searchPrefix;
     private array $data;
 
     private bool $pagination = true;
@@ -34,6 +37,7 @@ class ListJsonTable extends JasonTable
         $this->json = $json;
         $this->data = json_decode($this->json, true);
         $this->baseUrl = $this->data['meta']['baseUrl'] ?? '';
+        $this->searchPrefix = $this->data['meta']['searchPrefix'] ?? '/search';
         $this->pagination = $this->data['meta']['pagination'] ?? true;
         $this->showActionColumn = $this->data['meta']['showActionColumn'] ?? true;
         $this->showFiltersRow = $this->data['meta']['showFiltersRow'] ?? true;
@@ -64,16 +68,16 @@ class ListJsonTable extends JasonTable
             $this->html .= "<th>" . "ID" . "</th>";
             $columnKeys[] = "id";
         }
-        $columnKeys = $this->getColumnKeys();
+        $columnKeys = array_merge($columnKeys, $this->getColumnKeys());
         $columnKeys = array_merge($columnKeys, $this->getCustomColumnKeys());
         $this->getCustomHeadColumn();
         if ($this->showActionColumn) {
             $this->html .= "<th>Действия</th></th></tr>";
         }
-        if($this->showFiltersRow){
+        if ($this->showFiltersRow) {
             $this->getFilters($columnKeys);
-            $this->html .= "</thead>";
         }
+        $this->html .= "</thead>";
     }
 
     public function createTbody(): void
@@ -91,7 +95,10 @@ class ListJsonTable extends JasonTable
                 }
                 foreach ($row as $key => $cell) {
                     if ($this->issetColumn($key) and $this->is_fillable($key)) {
-                        if($this->beforePrintCell) {
+                        if ($this->beforePrintCell) {
+                            if ($key === "id" and $cell === 0) {
+                                $cell = $this->count;
+                            }
                             $cell = $this->getCustomCell($key, $cell);
                         }
                         $this->html .= "<td style='" . $this->getStyleFromCustomColumn($key) . "'>" . $cell . "</td>";
@@ -100,7 +107,7 @@ class ListJsonTable extends JasonTable
                 $this->getCustomColumns($row["id"] ?? null);
                 if ($this->showActionColumn) {
                     if (isset($row["id"])) {
-                        $actions = $this->getActions($row["id"]);
+                        $actions = $this->getActions($row);
 
                         $this->html .= "<td>$actions</td></tr>";
                     } else {
@@ -111,7 +118,7 @@ class ListJsonTable extends JasonTable
         }
     }
 
-    public function addAction(string $actionColumn): void
+    public function addAction(string|\Closure $actionColumn): void
     {
         $this->customActionsArray[] = $actionColumn;
     }
@@ -144,9 +151,9 @@ class ListJsonTable extends JasonTable
 
     private function getCurrentFilter(string $column)
     {
-        if (is_array($this->beforePrintCell[$column])) {
+        if (isset($this->beforePrintCell[$column]) and is_array($this->beforePrintCell[$column])) {
             if (isset($this->beforePrintCell[$column]['filter'])) {
-                if (is_array($this->beforePrintCell[$column]['filter'])) {
+                if (isset($this->beforePrintCell[$column]['filter']) and is_array($this->beforePrintCell[$column]['filter'])) {
                     return $this->beforePrintCell[$column]['filter'];
                 }
             }
@@ -179,7 +186,6 @@ class ListJsonTable extends JasonTable
     }
 
 
-
     private function getColumnKeys(): array
     {
         $columnKeys = [];
@@ -250,12 +256,16 @@ class ListJsonTable extends JasonTable
         return false;
     }
 
-    private function getActions(int $id): string
+    private function getActions(array $row): string
     {
         $actions = "";
         foreach ($this->actionsArray as $item) {
-            $objItem = new $item($this->baseUrl, $id);
+            if (is_string($item)) {
-            $actions .= $objItem->fetch();
+                $objItem = new $item($this->baseUrl, $row['id']);
+                $actions .= $objItem->fetch();
+            } else {
+                $actions .= $item($row, $this->baseUrl);
+            }
         }
 
         return $actions;
@@ -263,21 +273,32 @@ class ListJsonTable extends JasonTable
 
     private function getFilters(array $columnKeys): void
     {
-        $this->html .= "<tr><form action='$this->baseUrl/search'>";
+        $this->html .= "<tr><form action='$this->baseUrl$this->searchPrefix'>";
-        foreach ($columnKeys as $key){
+        $flag = false;
-            if ($this->issetFilter($key)){
+        foreach ($columnKeys as $key) {
+            if ($this->issetFilter($key)) {
+                $flag = true;
                 $filter = $this->getCurrentFilter($key);
-                $class = new $filter['class']([
+                $params = [
                     'param' => $filter['param'] ?? '',
                     'name' => $key,
                     'value' => $filter['value'] ?? '',
-                ]);
+                ];
-                $this->html .= $class->fetch();
+                if ($filter) {
-            }
+                    $class = new $filter['class']($params);
-            else {
+                    $this->html .= $class->fetch();
+                } else {
+                    $class = new InputTextFilter($params);
+                    $this->html .= $class->fetch();
+                }
+            } else {
                 $this->html .= "<td></td>";
             }
         }
+        if ($flag) {
+            $this->showActionColumn = true;
+            $this->html .= "<td><input class='btn btn-primary' type='submit' style='width: 150px' value='Применить'></td>";
+        }
         $this->html .= "</form></tr>";
     }
 
@@ -314,7 +335,7 @@ class ListJsonTable extends JasonTable
         $hookAfter = $this->afterPrintHook;
         $this->html .= $hookAfter($this->data['meta']);
 
-        if ($this->pagination) {
+        if ($this->pagination && $this->data['data']) {
             $options = [
                 'countItem' => $this->data['meta']['total'],
                 'perPage' => $this->data['meta']['perPage'] ?? 10,

src/ViewJsonTable.php

@@ -11,6 +11,9 @@ class ViewJsonTable extends JasonTable
     private array $data;
     private string $json;
     private array $dataJson;
+
+    private array $customRowsArray = [];
+
     public function __construct($json)
     {
         $this->beforePrintCell = [];
@@ -28,44 +31,40 @@ class ViewJsonTable extends JasonTable
         $paramsStr = $this->createParams($this->data['meta']['params']);
 
         //Хук перед выводом ячейки
-        if (isset($this->beforePrintHook)){
+        if (isset($this->beforePrintHook)) {
             $hook = $this->beforePrintHook;
             $this->html .= $hook();
         }
 
         $this->html .= "<table $paramsStr>";
     }
+
     public function createRows(): string
     {
-        foreach ($this->data['meta']['rows'] as $key => $row){
+        foreach ($this->data['meta']['rows'] as $key => $row) {
-            if ($this->issetRow($key)){
+            if ($this->issetRow($key)) {
+                $rowsBefore = $this->getCustomRows($key, "before");
+                $rowsAfter = $this->getCustomRows($key, "after");
                 if ($this->beforePrintCell) {
                     $this->dataJson[$key] = $this->getCustomCell($key, $this->dataJson[$key]);
                 }
+                foreach ($rowsBefore as $item){
+                    $this->html .= "<tr><th>" . $item['label'] . "</th><td>" . $this->getCustomRowHandler($item) . "</td></tr>";
+                }
                 $this->html .= "<tr><th>" . $row . "</th><td>" . $this->dataJson[$key] . "</td></tr>";
-            }
+                foreach ($rowsAfter as $item){
-        }
+                    $this->html .= "<tr><th>" . $item['label'] . "</th><td>" . $this->getCustomRowHandler($item) . "</td></tr>";
-        return $this->html;
-    }
-    private function issetRow($column): bool
-    {
-
-        if (isset($this->data['meta']['rows'])){
-            foreach ($this->data['meta']['rows'] as $key => $currentColumn){
-                if ($key === $column){
-                    return true;
                 }
             }
         }
-
+        return $this->html;
-        return false;
     }
 
     public function endTable(): void
     {
         $this->html .= "</table>";
 
-        if(isset($this->afterPrintHook)){
+        if (isset($this->afterPrintHook)) {
             $hookAfter = $this->afterPrintHook;
             $this->html .= $hookAfter();
         }
@@ -85,4 +84,46 @@ class ViewJsonTable extends JasonTable
             $this->beforePrintCell[$key] = $value;
         }
     }
+
+    public function addRow(string $label, \Closure $handler, array $position = []): void
+    {
+        $this->customRowsArray[] = ['label' => $label, 'handler' => $handler, 'position' => $position];
+    }
+
+    private function issetRow($column): bool
+    {
+
+        if (isset($this->data['meta']['rows'])) {
+            foreach ($this->data['meta']['rows'] as $key => $currentColumn) {
+                if ($key === $column) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private function getCustomRows(string $key, string $position): array
+    {
+        $customRows = [];
+        foreach ($this->customRowsArray as $item) {
+            if (!empty($item['position'])) {
+                if (isset($item['position'][$position]) && $item['position'][$position] === $key){
+                    $customRows[] = $item;
+                }
+            }
+        }
+
+        return $customRows;
+    }
+
+    private function getCustomRowHandler(array $row): mixed
+    {
+        if (isset($row['handler'])){
+            return $row['handler']();
+        }
+
+        return false;
+    }
 }