merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added labels to the filter tags

This commit is contained in:
Prashant Singh 2019-01-11 19:55:44 +05:30
parent 11fd8adfff
commit a2c02817f8
2 changed files with 77 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
View File

@ -15,7 +15,8 @@ class AttributeDataGrid extends DataGrid
{ {
public $allColumns = []; public $allColumns = [];
public function __construct() { public function __construct()
{
$this->itemsPerPage = 5; $this->itemsPerPage = 5;
} }
@ -138,7 +139,8 @@ class AttributeDataGrid extends DataGrid
]); ]);
} }
public function prepareActions() { public function prepareActions()
{
$this->addAction([ $this->addAction([
'type' => 'Edit', 'type' => 'Edit',
'route' => 'admin.catalog.attributes.edit', 'route' => 'admin.catalog.attributes.edit',
@ -152,7 +154,8 @@ class AttributeDataGrid extends DataGrid
]); ]);
} }
public function prepareMassActions() { public function prepareMassActions()
{
$this->addMassAction([ $this->addMassAction([
'type' => 'delete', 'type' => 'delete',
'action' => route('admin.catalog.attributes.massdelete'), 'action' => route('admin.catalog.attributes.massdelete'),

90
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -136,9 +136,9 @@
</div> </div>
<div class="filter-row-two"> <div class="filter-row-two">
<span class="filter-tag" v-if="filters.length > 0" v-for="filter in filters"> <span class="filter-tag" v-if="filters.length > 0" v-for="filter in filters">
<span v-if="filter.column == 'sort'">@{{ filter.cond }}</span> <span v-if="filter.column == 'sort'">@{{ filter.label }}</span>
<span v-else-if="filter.column == 'search'">Search</span> <span v-else-if="filter.column == 'search'">Search</span>
<span v-else>@{{ filter.column }}</span> <span v-else>@{{ filter.label }}</span>
<span class="wrapper"> <span class="wrapper">
@{{ filter.val }} @{{ filter.val }}
@ -309,23 +309,47 @@
}, },
getResponse() { getResponse() {
label = '';
for(colIndex in this.columns) {
if(this.columns[colIndex].alias == this.columnOrAlias) {
label = this.columns[colIndex].label;
}
}
if(this.type == 'string') { if(this.type == 'string') {
this.formURL(this.columnOrAlias, this.stringCondition, this.stringValue) this.formURL(this.columnOrAlias, this.stringCondition, this.stringValue, label)
} else if(this.type == 'number') { } else if(this.type == 'number') {
this.formURL(this.columnOrAlias, this.numberCondition, this.numberValue); this.formURL(this.columnOrAlias, this.numberCondition, this.numberValue, label);
} else if(this.type == 'boolean') { } else if(this.type == 'boolean') {
this.formURL(this.columnOrAlias, this.booleanCondition, this.booleanValue); this.formURL(this.columnOrAlias, this.booleanCondition, this.booleanValue, label);
} else if(this.type == 'datetime') { } else if(this.type == 'datetime') {
this.formURL(this.columnOrAlias, this.datetimeCondition, this.datetimeValue); this.formURL(this.columnOrAlias, this.datetimeCondition, this.datetimeValue, label);
} }
}, },
sortCollection(alias) { sortCollection(alias) {
this.formURL("sort", alias, this.sortAsc); label = '';
for(colIndex in this.columns) {
if(this.columns[colIndex].alias == this.columnOrAlias) {
label = this.columns[colIndex].label;
}
}
this.formURL("sort", alias, this.sortAsc, label);
}, },
searchCollection(searchValue) { searchCollection(searchValue) {
this.formURL("search", 'all', searchValue); label = '';
for(colIndex in this.columns) {
if(this.columns[colIndex].alias == this.columnOrAlias) {
label = this.columns[colIndex].label;
}
}
this.formURL("search", 'all', searchValue, label);
}, },
// function triggered to check whether the query exists or not and then call the make filters from the url // function triggered to check whether the query exists or not and then call the make filters from the url
@ -391,7 +415,7 @@
}, },
//make array of filters, sort and search //make array of filters, sort and search
formURL(column, condition, response) { formURL(column, condition, response, label) {
var obj = {}; var obj = {};
if(column == "" || condition == "" || response == "" || column == null || condition == null || response == null) { if(column == "" || condition == "" || response == "" || column == null || condition == null || response == null) {
@ -406,15 +430,10 @@
for(j = 0; j < this.filters.length; j++) { for(j = 0; j < this.filters.length; j++) {
if(this.filters[j].column == column) { if(this.filters[j].column == column) {
if(this.filters[j].cond == condition && this.filters[j].val == response) { if(this.filters[j].cond == condition && this.filters[j].val == response) {
filterRepeated = 1;
return false; return false;
} }
filterRepeated = 1;
this.filters[j].cond = condition;
this.filters[j].val = response;
this.makeURL();
} }
} }
@ -422,7 +441,7 @@
obj.column = column; obj.column = column;
obj.cond = condition; obj.cond = condition;
obj.val = response; obj.val = response;
obj.label = label;
this.filters.push(obj); this.filters.push(obj);
obj = {}; obj = {};
@ -456,6 +475,7 @@
this.filters[j].column = column; this.filters[j].column = column;
this.filters[j].cond = condition; this.filters[j].cond = condition;
this.filters[j].val = response; this.filters[j].val = response;
this.filters[j].label = label;
this.makeURL(); this.makeURL();
} }
@ -471,6 +491,7 @@
obj.column = column; obj.column = column;
obj.cond = condition; obj.cond = condition;
obj.val = this.currentSort; obj.val = this.currentSort;
obj.label = label;
this.filters.push(obj); this.filters.push(obj);
@ -483,11 +504,12 @@
if(column == "search") { if(column == "search") {
search_found = 0; search_found = 0;
for(j = 0;j < this.filters.length;j++) { for(j = 0; j < this.filters.length; j++) {
if(this.filters[j].column == "search") { if(this.filters[j].column == "search") {
this.filters[j].column = column; this.filters[j].column = column;
this.filters[j].cond = condition; this.filters[j].cond = condition;
this.filters[j].val = response; this.filters[j].val = response;
this.filters[j].label = label;
this.makeURL(); this.makeURL();
} }
@ -503,6 +525,7 @@
obj.column = column; obj.column = column;
obj.cond = condition; obj.cond = condition;
obj.val = response; obj.val = response;
obj.label = label;
this.filters.push(obj); this.filters.push(obj);
@ -515,6 +538,7 @@
obj.column = column; obj.column = column;
obj.cond = condition; obj.cond = condition;
obj.val = response; obj.val = response;
obj.label = label;
this.filters.push(obj); this.filters.push(obj);
@ -562,10 +586,38 @@
cond = moreSplitted[i][0].replace(']','').split('[')[1] cond = moreSplitted[i][0].replace(']','').split('[')[1]
val = moreSplitted[i][1]; val = moreSplitted[i][1];
label = 'cannotfindthislabel';
// for(colIndex in this.columns) {
// if(this.columns[colIndex].alias == this.columnOrAlias) {
// label = this.columns[colIndex].label;
// }
// }
obj.column = col; obj.column = col;
obj.cond = cond; obj.cond = cond;
obj.val = val; obj.val = val;
if(col == "sort") {
label = '';
for(colIndex in this.columns) {
if(this.columns[colIndex].alias == obj.cond) {
obj.label = this.columns[colIndex].label;
}
}
} else if(col == "search") {
obj.label = 'Search';
} else {
obj.label = '';
for(colIndex in this.columns) {
if(this.columns[colIndex].alias == obj.column) {
obj.label = this.columns[colIndex].label;
}
}
}
if(col != undefined && cond != undefined && val != undefined) if(col != undefined && cond != undefined && val != undefined)
this.filters.push(obj); this.filters.push(obj);
@ -622,7 +674,7 @@
} }
} }
console.log(this.dataIds); // console.log(this.dataIds);
}, },
removeMassActions() { removeMassActions() {