ItGuild/eloquent_table
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Compare commits

base: ItGuild:master
Branches Tags
ItGuild:master
ItGuild:0.4.3
ItGuild:0.4.2
ItGuild:0.4.1
ItGuild:0.4
ItGuild:0.3
ItGuild:0.2
ItGuild:0.1
..
compare: ItGuild:0.4
Branches Tags
ItGuild:master
ItGuild:0.4.3
ItGuild:0.4.2
ItGuild:0.4.1
ItGuild:0.4
ItGuild:0.3
ItGuild:0.2
ItGuild:0.1

No commits in common. "master" and "0.4" have entirely different histories.
master ... 0.4

5 changed files with 37 additions and 110 deletions
Show Stats Expand all files Collapse all files

2
composer.json
View File

@ -2,7 +2,7 @@
"name": "itguild/eloquent-table",
"type": "library",
"require": {
"itguild/tables": "^1.0"
"itguild/tables": "^0.1.9"
},
"require-dev": {
"illuminate/database": "^12.0@dev",

119
composer.lock generated
View File

@ -4,15 +4,15 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "815b5be2be1ac86399ea520c5bdbe788",
"content-hash": "ee2becfe4c626d6528700c6b89b77875",
"packages": [
{
"name": "itguild/tables",
"version": "1.0.5",
"version": "0.1.14",
"source": {
"type": "git",
"url": "https://git.itguild.info/ItGuild/tables",
"reference": "ad18d94489c20599ac1080a8b4f7f3199f206fdf"
"reference": "9e7c83b680301497d15223a320e665279f9c2555"
},
"type": "library",
"autoload": {
@ -30,7 +30,7 @@
"email": "apuc06@mail.ru"
}
],
"time": "2024-08-29T10:13:51+00:00"
"time": "2024-08-07T11:31:07+00:00"
}
],
"packages-dev": [
@ -528,12 +528,12 @@
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "e8a4eba8573bb907b0336033851cad7adbca4394"
"reference": "97a835e279896de51754c2316f9812884b294e2c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/e8a4eba8573bb907b0336033851cad7adbca4394",
"reference": "e8a4eba8573bb907b0336033851cad7adbca4394",
"url": "https://api.github.com/repos/illuminate/database/zipball/97a835e279896de51754c2316f9812884b294e2c",
"reference": "97a835e279896de51754c2316f9812884b294e2c",
"shasum": ""
},
"require": {
@ -589,7 +589,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-08-16T18:32:47+00:00"
"time": "2024-08-01T21:50:50+00:00"
},
{
"name": "illuminate/filesystem",
@ -787,12 +787,12 @@
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
"reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cb4374784c87d0a0294e8513a52eb63c0aff3139",
"reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139",
"shasum": ""
},
"require": {
@ -886,7 +886,7 @@
"type": "tidelift"
}
],
"time": "2024-08-19T06:22:39+00:00"
"time": "2024-07-16T22:29:20+00:00"
},
{
"name": "phpoption/phpoption",
@ -1192,86 +1192,18 @@
],
"time": "2024-08-06T10:13:52+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "dev-main",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
"default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
"url": "https://github.com/symfony/contracts"
}
},
"autoload": {
"files": [
"function.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/finder",
"version": "7.2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "0470b8dc10ca08d23aeaabbed5b961c928e4d89d"
"reference": "9a54be47a3813ace04e40e0903b651f3a52d952d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/0470b8dc10ca08d23aeaabbed5b961c928e4d89d",
"reference": "0470b8dc10ca08d23aeaabbed5b961c928e4d89d",
"url": "https://api.github.com/repos/symfony/finder/zipball/9a54be47a3813ace04e40e0903b651f3a52d952d",
"reference": "9a54be47a3813ace04e40e0903b651f3a52d952d",
"shasum": ""
},
"require": {
@ -1322,7 +1254,7 @@
"type": "tidelift"
}
],
"time": "2024-08-13T14:29:53+00:00"
"time": "2024-08-06T10:13:52+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -1649,17 +1581,16 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "a1c4be3a5885b9785b131c5a30d93e611848cb1d"
"reference": "a50ed69ace45368e096bc3981f456089253ed6cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/a1c4be3a5885b9785b131c5a30d93e611848cb1d",
"reference": "a1c4be3a5885b9785b131c5a30d93e611848cb1d",
"url": "https://api.github.com/repos/symfony/translation/zipball/a50ed69ace45368e096bc3981f456089253ed6cb",
"reference": "a50ed69ace45368e096bc3981f456089253ed6cb",
"shasum": ""
},
"require": {
"php": ">=8.2",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2.5|^3.0"
},
@ -1736,7 +1667,7 @@
"type": "tidelift"
}
],
"time": "2024-08-19T08:28:32+00:00"
"time": "2024-08-05T08:22:14+00:00"
},
{
"name": "symfony/translation-contracts",
@ -1823,12 +1754,12 @@
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
"reference": "e3e00b5002139adb0d5dadd6002e15b7b6cd371f"
"reference": "3083596e87146c1c5a61de7238cb69e1dab5ae8b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/e3e00b5002139adb0d5dadd6002e15b7b6cd371f",
"reference": "e3e00b5002139adb0d5dadd6002e15b7b6cd371f",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/3083596e87146c1c5a61de7238cb69e1dab5ae8b",
"reference": "3083596e87146c1c5a61de7238cb69e1dab5ae8b",
"shasum": ""
},
"replace": {
@ -1866,7 +1797,7 @@
"issues": "https://github.com/twbs/bootstrap/issues",
"source": "https://github.com/twbs/bootstrap/tree/main"
},
"time": "2024-08-27T12:36:45+00:00"
"time": "2024-08-07T10:11:06+00:00"
},
{
"name": "vlucas/phpdotenv",
@ -2040,5 +1971,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}

21
index.php
View File

@ -44,21 +44,16 @@ try {
'currentPage' => 1,
'perPage' => 3,
'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/user",
'filters' => ["email"]
'baseUrl' => "/admin/user"
]));
$table->columns([
'username' => [
'filter' => [
'class' => \Itguild\Tables\Filter\InputTextFilter::class
]
],
'created_at' => [
'format' => 'date:d-m-Y',
'filter' => [
'class' => \Itguild\Tables\Filter\InputDateFilter::class
]
],
'created_at' => function ($data) {
if (!$data){
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
},
'updated_at' => function ($data) {
if (!$data){
return null;

2
src/EloquentDataProvider.php
View File

@ -50,7 +50,7 @@ class EloquentDataProvider
$this->meta['actions'] = $options['actions'] ?? [];
$this->filters = $options['filters'] ?? [];
$this->createQuery();
$this->jsonStr = (new JSONCreator($this->meta, $this->getCollection()->toArray(), $this->filters,))->getJson();
$this->jsonStr = (new JSONCreator($this->meta, $this->filters, $this->getCollection()->toArray()))->getJson();
}
public function createQuery(): void

3
src/JSONCreator.php
View File

@ -7,7 +7,7 @@ class JSONCreator
{
protected array $informationArray = [];
public function __construct(array $meta, array $data, array $filters = [])
public function __construct(array $meta, array $filters, array $data)
{
$params = empty($meta['params']) ? ["class" => "table table-bordered", "border" => "1"] : $meta['params'];
if ($meta) {
@ -27,6 +27,7 @@ class JSONCreator
{
if ($infArr)
return json_encode($infArr, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
return null;
}