Records Found Added To Datagrid Plus

This commit is contained in:
Devansh 2022-02-04 14:29:47 +05:30
parent e022ba5427
commit 912d72edfe
4 changed files with 144 additions and 65 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=3ffc4240fed473cc24f1",
"/js/ui.js": "/js/ui.js?id=5fe92e022be45ac4802b",
"/css/ui.css": "/css/ui.css?id=57354f5eea4eb6f616e9"
}

View File

@ -151,6 +151,7 @@ trait ProvideDataGridPlus
'filterExists' => __('ui::app.datagrid.filter-exists'),
'zeroIndex' => __('ui::app.datagrid.zero-index'),
'clickOnAction' => __('ui::app.datagrid.click_on_action'),
'recordsFound' => __('admin::app.admin.system.records-found'),
'norecords' => __('ui::app.datagrid.no-records'),
'massActionDelete' => __('ui::app.datagrid.massaction.delete'),
];

View File

@ -12,15 +12,19 @@
<select
class="control"
name="channel"
@change="changeExtraFilter($event, 'channel')"
@change="
changeExtraFilter($event, 'channel')
"
>
<option
value="all"
:selected="
extraFilters.current.channel == 'all'
extraFilters.current.channel ==
'all'
"
v-text="translations.allChannels"
></option>
<option
:key="channelKey"
v-for="(channel,
@ -44,7 +48,9 @@
<select
class="control"
name="locale"
@change="changeExtraFilter($event, 'locale')"
@change="
changeExtraFilter($event, 'locale')
"
>
<option
value="all"
@ -53,6 +59,7 @@
"
v-text="translations.allLocales"
></option>
<option
:key="localeKey"
v-for="(locale,
@ -78,17 +85,21 @@
id="customer-group-switcher"
name="customer_group"
@change="
changeExtraFilter($event, 'customer_group')
changeExtraFilter(
$event,
'customer_group'
)
"
>
<option
value="all"
:selected="
extraFilters.current.customer_group ==
'all'
extraFilters.current
.customer_group == 'all'
"
v-text="translations.allCustomerGroups"
></option>
<option
:key="customerGroupKey"
v-for="(customerGroup,
@ -97,7 +108,8 @@
:value="customerGroup.id"
:selected="
customerGroup.id ==
extraFilters.current.customer_group
extraFilters.current
.customer_group
"
></option>
</select>
@ -175,7 +187,9 @@
class="filter-column-select control"
v-model="filterColumn"
v-on:change="
getColumnOrAlias(filterColumn)
getColumnOrAlias(
filterColumn
)
"
>
<option
@ -183,6 +197,7 @@
selected
disabled
></option>
<option
:key="columnKey"
v-for="(column,
@ -206,24 +221,36 @@
v-model="stringCondition"
>
<option
v-text="translations.condition"
v-text="
translations.condition
"
selected
disabled
></option>
<option
v-text="translations.contains"
v-text="
translations.contains
"
value="like"
></option>
<option
v-text="translations.ncontains"
v-text="
translations.ncontains
"
value="nlike"
></option>
<option
v-text="translations.equals"
value="eq"
></option>
<option
v-text="translations.nequals"
v-text="
translations.nequals
"
value="neqs"
></option>
</select>
@ -250,30 +277,44 @@
v-model="numberCondition"
>
<option
v-text="translations.condition"
v-text="
translations.condition
"
selected
disabled
></option>
<option
v-text="translations.equals"
value="eq"
></option>
<option
v-text="translations.nequals"
v-text="
translations.nequals
"
value="neqs"
></option>
<option
v-text="translations.greater"
v-text="
translations.greater
"
value="gt"
></option>
<option
v-text="translations.less"
value="lt"
></option>
<option
v-text="translations.greatere"
v-text="
translations.greatere
"
value="gte"
></option>
<option
v-text="translations.lesse"
value="lte"
@ -303,16 +344,22 @@
v-model="booleanCondition"
>
<option
v-text="translations.condition"
v-text="
translations.condition
"
selected
disabled
></option>
<option
v-text="translations.equals"
value="eq"
></option>
<option
v-text="translations.nequals"
v-text="
translations.nequals
"
value="neqs"
></option>
</select>
@ -330,10 +377,12 @@
selected
disabled
></option>
<option
v-text="translations.true"
value="1"
></option>
<option
v-text="translations.false"
value="0"
@ -349,30 +398,44 @@
v-model="datetimeCondition"
>
<option
v-text="translations.condition"
v-text="
translations.condition
"
selected
disabled
></option>
<option
v-text="translations.equals"
value="eq"
></option>
<option
v-text="translations.nequals"
v-text="
translations.nequals
"
value="neqs"
></option>
<option
v-text="translations.greater"
v-text="
translations.greater
"
value="gt"
></option>
<option
v-text="translations.less"
value="lt"
></option>
<option
v-text="translations.greatere"
v-text="
translations.greatere
"
value="gte"
></option>
<option
v-text="translations.lesse"
value="lte"
@ -403,7 +466,7 @@
</div>
</div>
<div class="filter-advance">
<div class="filtered-tags">
<span
:key="filterKey"
@ -413,6 +476,7 @@
style="text-transform: capitalize"
>
<span v-if="filter.column == 'perPage'">perPage</span>
<span v-else>{{ filter.label }}</span>
<span class="wrapper" v-if="filter.prettyValue">
@ -422,6 +486,7 @@
v-on:click="removeFilter(filter)"
></span>
</span>
<span class="wrapper" v-else>
{{ decodeURIComponent(filter.val) }}
<span
@ -432,6 +497,13 @@
</span>
</div>
<div class="records-count-container">
<span class="datagrid-count">
{{ records.total }} {{ translations.recordsFound }}
</span>
</div>
</div>
<div class="table-responsive">
<table class="table">
<thead v-if="massActionsToggle">
@ -443,12 +515,7 @@
<th colspan="100%">
<div
class="mass-action-wrapper"
style="
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
"
style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start;"
>
<span
class="massaction-remove"
@ -474,6 +541,7 @@
name="_token"
:value="csrf"
/>
<input
type="hidden"
id="indexes"
@ -505,7 +573,9 @@
<div
class="control-group"
style="margin-left: 10px"
v-if="massActionType.value == 'update'"
v-if="
massActionType.value == 'update'
"
>
<select
class="control"
@ -620,21 +690,27 @@
<div class="action">
<a
:key="actionIndex"
v-for="(action, actionIndex) in actions"
v-for="(action,
actionIndex) in actions"
v-if="
record[`${action.key}_to_display`]
record[
`${action.key}_to_display`
]
"
:id="
record[
typeof action.index !==
'undefined' && action.index
'undefined' &&
action.index
? action.index
: index
]
"
:href="
action.method == 'GET'
? record[`${action.key}_url`]
? record[
`${action.key}_url`
]
: 'javascript:void(0);'
"
v-on:click="
@ -670,6 +746,7 @@
</td>
</tr>
</template>
<template v-else>
<tr>
<td colspan="10">
@ -683,7 +760,6 @@
</tbody>
</table>
</div>
</div>
<div
@ -707,10 +783,12 @@
@click="changePage(link.url)"
>
<i class="icon angle-left-icon" v-if="index == 0"></i>
<i
class="icon angle-right-icon"
v-else-if="index == records.links.length - 1"
></i>
<span v-text="link.label" v-else></span>
</a>
</div>