verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 86 Releases Wiki Activity

Merge pull request '#8232 change default scopeDays' (!1000) from 8232-changeDefaultScopeDays into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1000
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-11-26 09:44:18 +00:00
parent 7feea110a6 15c1898044
commit 9c5125a4d2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Monitor/Ticket/MonitorTicketFilter.vue
View File

@ -18,7 +18,7 @@ const groupedStates = ref();
const handleScopeDays = (params, days, callback) => { const handleScopeDays = (params, days, callback) => {
const [from, to] = dateRange(Date.vnNew()); const [from, to] = dateRange(Date.vnNew());
if (!days) { if (!days) {
Object.assign(params, { from, to, scopeDays: 1 }); Object.assign(params, { from, to, scopeDays: 0 });
} else { } else {
params.from = from; params.from = from;
to.setDate(to.getDate() + days); to.setDate(to.getDate() + days);
@ -59,7 +59,7 @@ const getLocale = (label) => {
</template> </template>
<template #customTags="{ params, searchFn, formatFn }"> <template #customTags="{ params, searchFn, formatFn }">
<VnFilterPanelChip <VnFilterPanelChip
v-if="params.scopeDays" v-if="params.scopeDays !== null"
removable removable
@remove="handleScopeDays(params, null, searchFn)" @remove="handleScopeDays(params, null, searchFn)"
> >

8
src/pages/Monitor/Ticket/MonitorTickets.vue
View File

@ -25,11 +25,7 @@ const stateOpts = ref([]);
const zoneOpts = ref([]); const zoneOpts = ref([]);
const visibleColumns = ref([]); const visibleColumns = ref([]);
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const from = Date.vnNew(); const [from, to] = dateRange(Date.vnNew());
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
to.setDate(to.getDate() + 1);
to.setHours(23, 59, 59, 999);
function exprBuilder(param, value) { function exprBuilder(param, value) {
switch (param) { switch (param) {
@ -342,7 +338,7 @@ const openTab = (id) =>
auto-load auto-load
:row-click="({ id }) => openTab(id)" :row-click="({ id }) => openTab(id)"
:disable-option="{ card: true }" :disable-option="{ card: true }"
:user-params="{ from, to, scopeDays: 1 }" :user-params="{ from, to, scopeDays: 0 }"
> >
<template #top-left> <template #top-left>
<QBtn <QBtn