test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: also consider date & datetime field

Browse Source
This commit is contained in:
Shariq Ansari 2024-05-17 18:25:30 +05:30
parent ddb81c2e3e
commit b8b2d34ba6
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/Controls/DatePicker.vue
View File

@ -14,6 +14,7 @@
'form-input block h-7 w-full cursor-pointer select-none rounded border-gray-400 text-sm placeholder-gray-500',
inputClass,
]"
v-bind="$attrs"
/>
</template>
<template #body="{ togglePopover }">

2
frontend/src/components/Filter.vue
View File

@ -276,6 +276,8 @@ function getOperators(fieldtype, fieldname) {
if (typeDate.includes(fieldtype)) {
options.push(
...[
{ label: __('Equals'), value: 'equals' },
{ label: __('Not Equals'), value: 'not equals' },
{ label: __('Is'), value: 'is' },
{ label: __('>'), value: '>' },
{ label: __('<'), value: '<' },

14
frontend/src/components/ViewControls.vue
View File

@ -61,6 +61,14 @@
:placeholder="filter.label"
@change="(data) => applyQuickFilter(filter, data)"
/>
<component
v-else-if="['Date', 'Datetime'].includes(filter.type)"
class="border-none"
:is="filter.type === 'Date' ? DatePicker : DatetimePicker"
:value="filter.value"
@change="(v) => applyQuickFilter(filter, v)"
:placeholder="filter.label"
/>
<FormControl
v-else
:value="filter.value"
@ -181,6 +189,8 @@
</Dialog>
</template>
<script setup>
import DatePicker from '@/components/Controls/DatePicker.vue'
import DatetimePicker from '@/components/Controls/DatetimePicker.vue'
import Link from '@/components/Controls/Link.vue'
import RefreshIcon from '@/components/Icons/RefreshIcon.vue'
import EditIcon from '@/components/Icons/EditIcon.vue'
@ -444,7 +454,7 @@ const quickFilterList = computed(() => {
filters.forEach((filter) => {
filter['value'] = filter.type == 'Check' ? false : ''
if (list.value.params?.filters[filter.name]) {
if (['Check', 'Select'].includes(filter.type)) {
if (['Check', 'Select', 'Date', 'Datetime'].includes(filter.type)) {
filter['value'] = list.value.params.filters[filter.name]
} else {
let value = list.value.params.filters[filter.name]
@ -467,7 +477,7 @@ function applyQuickFilter(filter, value) {
let filters = { ...list.value.params.filters }
let field = filter.name
if (value) {
if (['Check', 'Select'].includes(filter.type)) {
if (['Check', 'Select', 'Date', 'Datetime'].includes(filter.type)) {
filters[field] = value
} else {
filters[field] = ['LIKE', `%${value}%`]