TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Datagrid format for url and filter by url query has changed and it is working decently

This commit is contained in:
prashant-webkul 2018-07-13 18:18:59 +05:30
parent 636062c481
commit 9e0cf41e0c
4 changed files with 197 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
packages/Webkul/Admin/src/Http/Controllers/DataGridController.php
View File

@ -69,33 +69,76 @@ class DataGridController extends Controller
// ]);
//Make case without any aliasing or joins
/*
operations list <,>,<=,>=,!=,=,like, IN.
contains will get resolved by like after where and ranges can be resolved
by using IN or where in (1,2,3)
verbs => [
'eq' => '=',
'lt' => '<',
'gt' => '>',
'lte' => '<=',
'gte' => '>=',
'neq' => '!=',
'inc_range' => '>x AND <y',
'exc_range' => '>=x AND <=y',
'not_inc_range' => '!>x AND <y',
'not_exc_range' => '!>=x AND <=y',
]
*/
$verbs = [
'eq' => '=',
'lt' => '<',
'gt' => '>',
'lte' => '<=',
'gte' => '>=',
'neq' => 'not =',
'inc_range' => '>x AND <y', //cummutative
'exc_range' => '>=x AND <=y',
'not_inc_range' => 'not >x AND <y',
'not_exc_range' => 'not >=x AND <=y',
];
DataGrid::make([
'name' => 'admins',
'table' => 'admins as a',
'select' => 'a.id',
'join' => [
'name' => 'posts',
'table' => 'authors',
'select' => 'id',
'filterable' => [
[
'join' => 'rightjoin',
'table' => 'roles as r',
'primaryKey' => 'a.role_id',
'condition' => '=',
'secondaryKey' => 'r.id',
'column' => 'id',
'type' => 'integer'
], [
'column' => 'email',
'type' => 'string'
], [
'column' => 'first_name',
'type' => 'string'
]
],
'join' => [
// [
// 'join' => 'rightjoin',
// 'table' => 'roles as r',
// 'primaryKey' => 'a.role_id',
// 'condition' => '=',
// 'secondaryKey' => 'r.id',
// ]
],
'columns' => [
[
'name' => 'a.id',
'name' => 'id',
'type' => 'string',
'label' => 'Admin ID',
'sortable' => true,
'filterable' => true,
],
[
'name' => 'a.email',
'name' => 'email',
'type' => 'string',
'label' => 'Admin E-Mail',
'sortable' => true,
'filterable' => true,
],
// [
// 'name' => 'r.name',
@ -105,11 +148,10 @@ class DataGridController extends Controller
// 'filterable' => true,
// ],
[
'name' => 'r.name',
'name' => 'first_name',
'type' => 'string',
'label' => 'Admin Name',
'sortable' => true,
'filterable' => false,
// will create on run time query
// 'filter' => [
// 'function' => 'where', // orwhere
@ -121,11 +163,24 @@ class DataGridController extends Controller
'onclick' => "window.alert('alert from datagrid column')"
],
'wrapper' => function ($value, $object) {
return '<a href="'.$value.'">' . $object->name . '</a>';
return '<a href="'.$value.'">' . $object->first_name . '</a>';
},
],
],
'verbs' => [
'eq' => '=',
'lt' => '<',
'gt' => '>',
'lte' => '<=',
'gte' => '>=',
'neq' => 'not =',
'contains' => 'like',
'inc_range' => '>x AND <y',
'exc_range' => '>=x AND <=y',
'not_inc_range' => 'not >x AND <y',
'not_exc_range' => 'not >=x AND <=y',
]
// 'css' => []
]);

131
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -87,10 +87,10 @@ class DataGrid
public function make($args)
{
// list($name, $select, $table, $join, $columns) = array_values($args);
$name = $select = $table = false;
$join = $columns = $css = [];
$name = $select = $filterable = $table = false;
$join = $columns = $css = $verbs = [];
extract($args);
return $this->build($name, $select, $table, $join, $columns, $css);
return $this->build($name, $select, $filterable, $table, $join, $columns, $css, $verbs);
}
//starts buikding the queries on the basis of selects, joins and filter with
@ -99,20 +99,24 @@ class DataGrid
public function build(
$name = null,
$select = false,
array $filterable = [],
$table = null,
array $join = [],
array $columns = null,
array $css = [],
array $verbs = [],
Pagination $pagination = null
) {
$this->request = Request::capture();
$this->setName($name);
$this->setSelect($select);
$this->setFilterable($filterable);
$this->setTable($table);
$this->setJoin($join);
$this->addColumns($columns, true);
$this->setCss($css);
$this->setVerbs($verbs);
// $this->addPagination($pagination);
return $this;
}
@ -141,6 +145,17 @@ class DataGrid
return $this;
}
/**
* Set Filterable
* @return $this
*/
public function setFilterable(array $filterable)
{
$this->filterable = $filterable ?: [];
return $this;
}
/**
* Add Columns.
*
@ -165,12 +180,28 @@ class DataGrid
return $this;
}
/**
* Adds the custom css rules
* @retun $this
*/
private function setCss($css = [])
{
$this->css = new Css($css);
return $this->css;
}
/**
* setFilterableColumns
* @return $this
*/
// public function setFilterableColumns($filterable_columns = [])
// {
// $this->join = $filterable_columns ?: [];
// return $this;
// }
/**
* Add Columns.
*
@ -243,6 +274,17 @@ class DataGrid
return $this;
}
/**
* Adds expressional verbs to be used
* @return $this
*/
public function setVerbs(array $verbs)
{
$this->verbs = $verbs ?: [];
return $this;
}
/**
* Add Pagination.
*
@ -314,24 +356,57 @@ class DataGrid
private function getQueryWithFilters()
{
//solve aliasing for table when as is used with table name
//refer https://recursiveiterator.wordpress.com/2015/02/28/laravel-query-builder-dynamic-queries/
//refer https://m.dotdev.co/writing-advanced-eloquent-search-query-filters-de8b6c2598db
//New API Structure change
//No kind of aliasing at all
foreach ($this->columns as $column) {
if ($column->filterable) { //condition is required managing params from users i.e url or request
if ($columnFromRequest = $this->request->offsetGet($column->correct())) {
if ($filter = $columnFromRequest['filter']) {
if ($condition = $columnFromRequest['condition']) {
$this->query->where(
$column->correct(),
$condition,
$filter
);
}
$filterable_columns = [];
foreach ($this->filterable as $on_column) {
array_push($filterable_columns, $on_column['column']);
}
$queried_columns = [];
$qr = $_SERVER['QUERY_STRING'];
$parsed;
parse_str($qr, $parsed);
foreach ($parsed as $key=>$value) {
array_push($queried_columns, $key);
}
foreach ($filterable_columns as $fkey=>$fvalue) {
//determines whether column is both filterable and query string is present for it.
foreach ($queried_columns as $key=>$value) {
if ($fvalue==$value) {
$conditions =$parsed[$value];
foreach ($conditions as $condition => $filter) {
$this->query->where(
$value,
$this->verbs[$condition],
$filter
);
}
}
}
}
// if ($column->filterable) { //condition is required managing params from users i.e url or request
// $qr = $_SERVER['QUERY_STRING'];
// $col_name = $column->name;
// $col_name = str_replace(".", "_", $col_name);
// // dd($qr);
// dump($col_name);
// if ($columnFromfilterableRequest = $this->request->offsetGet($col_name)) {
// if ($filter = $columnFromRequest['filter']) {
// if ($condition = $columnFromRequest['condition']) {
// $this->query->where(
// $column->correctDotOnly(),
// $condition,
// $filter
// );
// }
// }
// }
// }
}
//follow a case where table is aliased and joins are not present
}
@ -349,7 +424,10 @@ class DataGrid
//explode if alias is available
$exploded = explode('as', $this->table);
if (isset($exploded)) {
// dd($exploded);
if ($exploded[0]==$this->table) {
$table_alias = false;
} else { // (isset($exploded))
$table_alias = true;
$table_name = trim($exploded[0]);
$table_alias = trim($exploded[1]);
@ -404,13 +482,24 @@ class DataGrid
}
//Check for column filter bags and resolve aliasing
foreach ($this->columns as $column) {
//run this if there are columns with filter bag
$this->getQueryWithColumnFilters();
}
//run this if there are columns with filter bag
$this->getQueryWithColumnFilters();
//Run this if there are filters or sort params or range params in the urls
$this->getQueryWithFilters();
$qr = $_SERVER['QUERY_STRING'];
$parsed;
//parse_url($qr, PHP_URL_QUERY)
parse_str($qr, $parsed);
if (!empty($parsed)) {
dump('parsed url is not empty');
// $filterable_columns = [];
// foreach ($this->filterable as $on_column) {
// array_push($filterable_columns, $on_column['column']);
// }
$this->getQueryWithFilters();
} else {
dd('parsed url is empty');
}
// dump($this->query);
$this->results = $this->query->get();

9
packages/Webkul/Ui/src/DataGrid/Helpers/Column.php
View File

@ -88,6 +88,15 @@ class Column extends AbstractFillable
return $return;
}
public function correctDotOnly()
{
$col_name = explode('.', $this->name);
if (isset($col_name)) {
$col_name = trim($col_name[1]);
return $col_name;
}
}
public function correct($tillDot = true)
{
$as = explode('as', $this->name);

11
packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
View File

@ -61,6 +61,7 @@
<table class="{{ $css->table }}">
<thead class="{{-- $css->thead --}}">
<tr>
<th class="{{-- $css->thead_td --}}">Mass Action</th>
@foreach ($columns as $column)
<th class="{{-- $css->thead_td --}}">{!! $column->sorting() !!}</th>
@endforeach
@ -70,6 +71,7 @@
@foreach ($results as $result)
<tr>
<td class="{{-- $css->tbody_td --}}"><input type="checkbox" /></td>
@foreach ($columns as $column)
<td class="{{-- $css->tbody_td --}}">{!! $column->render($result) !!}</td>
@endforeach
@ -77,8 +79,9 @@
@endforeach
</tbody>
</table>
<div class="{{ $css->pagination }}" style="margin-top:15px;">
{{-- <div class="pagination">
{{-- @include('ui::partials.pagination') --}}
{{-- <div class="{{ $css->pagination }}" style="margin-top:15px;">
<div class="pagination">
<a class="page-item previous">
<i class="icon angle-right-icon"></i>
</a>
@ -90,8 +93,8 @@
<a href="#status/6/page/2" class="page-item next">
<i class="icon angle-left-icon"></i>
</a>
</div> --}}
</div>
</div>
</div> --}}
</div>
</div>