Compare commits
147 Commits
7638-showA
...
dev
Author | SHA1 | Date |
---|---|---|
|
787f76b401 | |
|
665168dc45 | |
|
55a0a53915 | |
|
caa5fdf587 | |
|
f615c5c196 | |
|
77db8392cc | |
|
d8234ba141 | |
|
2eb70aadcb | |
|
1d573b5dee | |
|
d122752672 | |
|
82b6fb6c2f | |
|
1a3e717620 | |
|
31acc3d0a1 | |
|
5b3ef29294 | |
|
a66849f361 | |
|
04e1f7a1b5 | |
|
a7ccc68ab7 | |
|
917a7e8ecc | |
|
4f7dcca917 | |
|
64e30b7143 | |
|
63e7c55b7d | |
|
de359043af | |
|
e6e43ccfc4 | |
|
dcf6d3cad4 | |
|
0f7bb9cfe1 | |
|
e03e6b2305 | |
|
d171c7dd94 | |
|
12fdf567c4 | |
|
01ac0f2921 | |
|
b524a6d8eb | |
|
9838342e27 | |
|
be7c63150c | |
|
bbd07e71fa | |
|
6692b499d2 | |
|
78f1756edc | |
|
9919352e8c | |
|
690d807ef1 | |
|
ff6d2a71bf | |
|
f49f694970 | |
|
d399afcd89 | |
|
7119cbbe89 | |
|
2e8192ef7b | |
|
b162dd7672 | |
|
05311b8ffa | |
|
d1440c1083 | |
|
180153d8f0 | |
|
535bfa4347 | |
|
6acd2e9e9f | |
|
3bcafc5734 | |
|
510eab8af0 | |
|
b32a889dfe | |
|
37bc464a98 | |
|
5fca08aaa2 | |
|
fd36bd7c7e | |
|
80fb1eaf6a | |
|
5f2e2421a8 | |
|
e7bb829bf5 | |
|
d0f4eb9db9 | |
|
e809e598f7 | |
|
8f5b4af7cc | |
|
0440115d5a | |
|
0a90c62369 | |
|
bcad2dea1b | |
|
2afa0765b9 | |
|
088c401723 | |
|
19751ee3fb | |
|
c2d56ee002 | |
|
d29a27999a | |
|
20ccdb133c | |
|
32fa5248d0 | |
|
da31d6db3b | |
|
2f47bb10aa | |
|
477ab36487 | |
|
789b0d22cc | |
|
6434a37598 | |
|
cf8923a2d4 | |
|
269427e08c | |
|
c9bea020fa | |
|
b1bd730fbf | |
|
92fba2e0c4 | |
|
65a089e562 | |
|
d2d38c1d3e | |
|
8be9feb41f | |
|
38d16b56a9 | |
|
ca2e507401 | |
|
f4d347eef1 | |
|
d2b414c883 | |
|
0404c00a05 | |
|
351f291086 | |
|
bc75bd9dc0 | |
|
48689374bc | |
|
b26b8b6ddd | |
|
fd68071a2e | |
|
d8bea48b26 | |
|
4a5171aa6e | |
|
d3d80149e0 | |
|
c672d33b0c | |
|
e3c2ae935c | |
|
69548456c3 | |
|
64fe998053 | |
|
ae856ec0bc | |
|
7d5f51349a | |
|
239805515d | |
|
56da11345b | |
|
78d0f31b11 | |
|
2ac3b280af | |
|
70a15bff30 | |
|
8995d7d454 | |
|
8a8ce72c4c | |
|
da8366d05b | |
|
57e80040fa | |
|
e0def231b1 | |
|
23eff4937c | |
|
cfccc74710 | |
|
4c4d7c9dbe | |
|
ee4eafc639 | |
|
8417411efc | |
|
7510611c0b | |
|
55394c2a2e | |
|
bc69b33028 | |
|
08b0eb3c74 | |
|
4db882cc03 | |
|
fc61c13ec4 | |
|
bb949cd00c | |
|
20c531bc04 | |
|
f4c22938c7 | |
|
23670debd1 | |
|
311c361f11 | |
|
429772ce88 | |
|
48ebca9568 | |
|
adb78c7433 | |
|
ff4e0103e7 | |
|
a0860522f5 | |
|
cee6e0d0b1 | |
|
f33f09ca6f | |
|
6e9e5c7564 | |
|
83b9b602a0 | |
|
1101db707e | |
|
640d989090 | |
|
a5f287d782 | |
|
9bf0b4c077 | |
|
27866e7090 | |
|
97c673b5f3 | |
|
e0ad4fc2f1 | |
|
69452e2627 | |
|
a7d271bafd | |
|
55841d795f |
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.16.0",
|
"version": "25.18.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
@ -89,4 +89,4 @@
|
||||||
"vite": "^6.0.11",
|
"vite": "^6.0.11",
|
||||||
"vitest": "^0.31.1"
|
"vitest": "^0.31.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,6 +2,7 @@
|
||||||
import { onMounted } from 'vue';
|
import { onMounted } from 'vue';
|
||||||
import { useQuasar, Dark } from 'quasar';
|
import { useQuasar, Dark } from 'quasar';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import VnScroll from './components/common/VnScroll.vue';
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { availableLocales, locale, fallbackLocale } = useI18n();
|
const { availableLocales, locale, fallbackLocale } = useI18n();
|
||||||
|
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RouterView />
|
<RouterView />
|
||||||
|
<VnScroll/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
import { boot } from 'quasar/wrappers';
|
import { boot } from 'quasar/wrappers';
|
||||||
|
import { date as quasarDate } from 'quasar';
|
||||||
|
const { formatDate } = quasarDate;
|
||||||
|
|
||||||
export default boot(() => {
|
export default boot(() => {
|
||||||
Date.vnUTC = () => {
|
Date.vnUTC = () => {
|
||||||
|
@ -25,4 +27,34 @@ export default boot(() => {
|
||||||
const date = new Date(Date.vnUTC());
|
const date = new Date(Date.vnUTC());
|
||||||
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Date.getCurrentDateTimeFormatted = (
|
||||||
|
options = {
|
||||||
|
startOfDay: false,
|
||||||
|
endOfDay: true,
|
||||||
|
iso: true,
|
||||||
|
mask: 'DD-MM-YYYY HH:mm',
|
||||||
|
},
|
||||||
|
) => {
|
||||||
|
const date = Date.vnUTC();
|
||||||
|
if (options.startOfDay) {
|
||||||
|
date.setHours(0, 0, 0);
|
||||||
|
}
|
||||||
|
if (options.endOfDay) {
|
||||||
|
date.setHours(23, 59, 0);
|
||||||
|
}
|
||||||
|
if (options.iso) {
|
||||||
|
return date.toISOString();
|
||||||
|
}
|
||||||
|
return formatDate(date, options.mask);
|
||||||
|
};
|
||||||
|
|
||||||
|
Date.convertToISODateTime = (dateTimeStr) => {
|
||||||
|
const [datePart, timePart] = dateTimeStr.split(' ');
|
||||||
|
const [day, month, year] = datePart.split('-');
|
||||||
|
const [hours, minutes] = timePart.split(':');
|
||||||
|
|
||||||
|
const isoDate = new Date(year, month - 1, day, hours, minutes);
|
||||||
|
return isoDate.toISOString();
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
|
||||||
img.onerror = () => {
|
img.onerror = () => {
|
||||||
notify(
|
notify(
|
||||||
t("This photo provider doesn't allow remote downloads"),
|
t("This photo provider doesn't allow remote downloads"),
|
||||||
'negative'
|
'negative',
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -219,11 +219,7 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateLeft()"
|
@click="rotateLeft()"
|
||||||
>
|
/>
|
||||||
<!-- <QTooltip class="no-pointer-events">
|
|
||||||
{{ t('Rotate left') }}
|
|
||||||
</QTooltip> -->
|
|
||||||
</QIcon>
|
|
||||||
<div>
|
<div>
|
||||||
<div ref="photoContainerRef" />
|
<div ref="photoContainerRef" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -233,11 +229,7 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateRight()"
|
@click="rotateRight()"
|
||||||
>
|
/>
|
||||||
<!-- <QTooltip class="no-pointer-events">
|
|
||||||
{{ t('Rotate right') }}
|
|
||||||
</QTooltip> -->
|
|
||||||
</QIcon>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="column">
|
<div class="column">
|
||||||
|
@ -265,7 +257,6 @@ const makeRequest = async () => {
|
||||||
class="cursor-pointer q-mr-sm"
|
class="cursor-pointer q-mr-sm"
|
||||||
@click="openInputFile()"
|
@click="openInputFile()"
|
||||||
>
|
>
|
||||||
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
|
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon name="info" class="cursor-pointer">
|
<QIcon name="info" class="cursor-pointer">
|
||||||
<QTooltip>{{
|
<QTooltip>{{
|
||||||
|
|
|
@ -406,6 +406,7 @@ defineExpose({
|
||||||
</QBtnDropdown>
|
</QBtnDropdown>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-else
|
v-else
|
||||||
|
data-cy="saveDefaultBtn"
|
||||||
:label="tMobile('globals.save')"
|
:label="tMobile('globals.save')"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
|
|
@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
|
||||||
'no-visible': !stateQuery.isLoading().value,
|
'no-visible': !stateQuery.isLoading().value,
|
||||||
}"
|
}"
|
||||||
size="sm"
|
size="sm"
|
||||||
data-cy="loading-spinner"
|
data-cy="navBar-spinner"
|
||||||
/>
|
/>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<div id="searchbar" class="searchbar"></div>
|
<div id="searchbar" class="searchbar"></div>
|
||||||
|
|
|
@ -33,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
|
||||||
import VnTableFilter from './VnTableFilter.vue';
|
import VnTableFilter from './VnTableFilter.vue';
|
||||||
import { getColAlign } from 'src/composables/getColAlign';
|
import { getColAlign } from 'src/composables/getColAlign';
|
||||||
import RightMenu from '../common/RightMenu.vue';
|
import RightMenu from '../common/RightMenu.vue';
|
||||||
|
import VnScroll from '../common/VnScroll.vue'
|
||||||
|
|
||||||
const arrayData = useArrayData(useAttrs()['data-key']);
|
const arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -168,6 +169,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
|
||||||
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
||||||
const app = inject('app');
|
const app = inject('app');
|
||||||
const tableHeight = useTableHeight();
|
const tableHeight = useTableHeight();
|
||||||
|
const vnScrollRef = ref(null);
|
||||||
|
|
||||||
const editingRow = ref(null);
|
const editingRow = ref(null);
|
||||||
const editingField = ref(null);
|
const editingField = ref(null);
|
||||||
|
@ -189,6 +191,17 @@ const tableModes = [
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const onVirtualScroll = ({ to }) => {
|
||||||
|
handleScroll();
|
||||||
|
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
|
||||||
|
if (virtualScrollContainer) {
|
||||||
|
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
|
||||||
|
if (vnScrollRef.value) {
|
||||||
|
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
const urlParams = route.query[$props.searchUrl];
|
const urlParams = route.query[$props.searchUrl];
|
||||||
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
||||||
|
@ -327,16 +340,13 @@ function handleOnDataSaved(_) {
|
||||||
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
||||||
else $props.create.onDataSaved(_);
|
else $props.create.onDataSaved(_);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleScroll() {
|
function handleScroll() {
|
||||||
if ($props.crudModel.disableInfiniteScroll) return;
|
if ($props.crudModel.disableInfiniteScroll) return;
|
||||||
|
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
||||||
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
||||||
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
||||||
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
||||||
if (evt?.shiftKey && added) {
|
if (evt?.shiftKey && added) {
|
||||||
const rowIndex = selectedRows[0].$index;
|
const rowIndex = selectedRows[0].$index;
|
||||||
|
@ -669,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
v-bind="table"
|
v-bind="table"
|
||||||
:class="[
|
:class="[
|
||||||
'vnTable',
|
'vnTable',
|
||||||
table ? 'selection-cell' : '',
|
table ? 'selection-cell' : '',
|
||||||
$props.footer ? 'last-row-sticky' : '',
|
$props.footer ? 'last-row-sticky' : '',
|
||||||
]"
|
]"
|
||||||
wrap-cells
|
wrap-cells
|
||||||
:columns="splittedColumns.columns"
|
:columns="splittedColumns.columns"
|
||||||
|
@ -683,7 +693,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
flat
|
flat
|
||||||
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
||||||
:virtual-scroll="isTableMode"
|
:virtual-scroll="isTableMode"
|
||||||
@virtual-scroll="handleScroll"
|
@virtual-scroll="onVirtualScroll"
|
||||||
@row-click="(event, row) => handleRowClick(event, row)"
|
@row-click="(event, row) => handleRowClick(event, row)"
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
|
@ -741,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
withFilters
|
withFilters
|
||||||
"
|
"
|
||||||
:column="col"
|
:column="col"
|
||||||
|
:data-cy="`column-filter-${col.name}`"
|
||||||
:show-title="true"
|
:show-title="true"
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
v-model="params[columnName(col)]"
|
v-model="params[columnName(col)]"
|
||||||
|
@ -1087,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
<VnScroll
|
||||||
|
ref="vnScrollRef"
|
||||||
|
v-if="isTableMode"
|
||||||
|
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
|
|
|
@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="model"
|
v-model="model"
|
||||||
ref="inputRef"
|
ref="inputRef"
|
||||||
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
|
||||||
|
@blur="model = useAccountShortToStandard(model) ?? model"
|
||||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
<script setup>
|
||||||
|
import { computed, useAttrs } from 'vue';
|
||||||
|
import { date } from 'quasar';
|
||||||
|
import VnDate from './VnDate.vue';
|
||||||
|
import VnTime from './VnTime.vue';
|
||||||
|
|
||||||
|
const $attrs = useAttrs();
|
||||||
|
const model = defineModel({ type: [Date] });
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
isOutlined: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
showEvent: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const styleAttrs = computed(() => {
|
||||||
|
return $props.isOutlined
|
||||||
|
? {
|
||||||
|
dense: true,
|
||||||
|
outlined: true,
|
||||||
|
rounded: true,
|
||||||
|
}
|
||||||
|
: {};
|
||||||
|
});
|
||||||
|
const mask = 'DD-MM-YYYY HH:mm';
|
||||||
|
const selectedDate = computed({
|
||||||
|
get() {
|
||||||
|
if (!model.value) return new Date(model.value);
|
||||||
|
return date.formatDate(new Date(model.value), mask);
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
model.value = Date.convertToISODateTime(value);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const manageDate = (date) => {
|
||||||
|
selectedDate.value = date;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
|
<QInput
|
||||||
|
ref="vnInputDateRef"
|
||||||
|
v-model="selectedDate"
|
||||||
|
class="vn-input-date"
|
||||||
|
placeholder="dd/mm/aaaa HH:mm"
|
||||||
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
|
:clearable="false"
|
||||||
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
|
@keydown="isPopupOpen = false"
|
||||||
|
hide-bottom-space
|
||||||
|
@update:model-value="manageDate"
|
||||||
|
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
|
||||||
|
>
|
||||||
|
<template #prepend>
|
||||||
|
<QIcon name="today" size="xs">
|
||||||
|
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||||
|
<VnDate :mask="mask" v-model="selectedDate" />
|
||||||
|
</QPopupProxy>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
<template #append>
|
||||||
|
<QIcon name="access_time" size="xs">
|
||||||
|
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||||
|
<VnTime format24h :mask="mask" v-model="selectedDate" />
|
||||||
|
</QPopupProxy>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
</QInput>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Open date: Abrir fecha
|
||||||
|
</i18n>
|
|
@ -0,0 +1,100 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
scrollTarget: { type: [String, Object], default: 'window' }
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollPosition = ref(0);
|
||||||
|
const showButton = ref(false);
|
||||||
|
let scrollContainer = null;
|
||||||
|
|
||||||
|
const onScroll = () => {
|
||||||
|
if (!scrollContainer) return;
|
||||||
|
scrollPosition.value =
|
||||||
|
typeof props.scrollTarget === 'object'
|
||||||
|
? scrollContainer.scrollTop
|
||||||
|
: window.scrollY;
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(scrollPosition, (newValue) => {
|
||||||
|
showButton.value = newValue > 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollToTop = () => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateScrollContainer = (container) => {
|
||||||
|
if (container) {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
}
|
||||||
|
scrollContainer = container;
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
onScroll();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
updateScrollContainer
|
||||||
|
});
|
||||||
|
|
||||||
|
const initScrollContainer = async () => {
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
if (typeof props.scrollTarget === 'object') {
|
||||||
|
scrollContainer = props.scrollTarget;
|
||||||
|
} else {
|
||||||
|
scrollContainer = window;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!scrollContainer) return
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
initScrollContainer();
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
scrollContainer = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QIcon
|
||||||
|
v-if="showButton"
|
||||||
|
color="primary"
|
||||||
|
name="keyboard_arrow_up"
|
||||||
|
class="scroll-to-top"
|
||||||
|
@click="scrollToTop"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.scroll-to-top {
|
||||||
|
position: fixed;
|
||||||
|
top: 70px;
|
||||||
|
font-size: 65px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 1000;
|
||||||
|
transition: transform 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.scroll-to-top:hover {
|
||||||
|
transform: translateX(-50%) scale(1.2);
|
||||||
|
cursor: pointer;
|
||||||
|
filter: brightness(0.8);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -232,7 +232,7 @@ fr:
|
||||||
pt: Portugais
|
pt: Portugais
|
||||||
pt:
|
pt:
|
||||||
Send SMS: Enviar SMS
|
Send SMS: Enviar SMS
|
||||||
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
|
CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
|
||||||
Language: Linguagem
|
Language: Linguagem
|
||||||
Phone: Móvel
|
Phone: Móvel
|
||||||
Subject: Assunto
|
Subject: Assunto
|
||||||
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper.js';
|
||||||
|
import { describe, it, expect, beforeAll } from 'vitest';
|
||||||
|
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
|
||||||
|
import vnDateBoot from 'src/boot/vnDate';
|
||||||
|
|
||||||
|
let vm;
|
||||||
|
let wrapper;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
// Initialize the vnDate boot
|
||||||
|
vnDateBoot();
|
||||||
|
});
|
||||||
|
function generateWrapper(date, outlined, showEvent) {
|
||||||
|
wrapper = createWrapper(VnInputDateTime, {
|
||||||
|
props: {
|
||||||
|
modelValue: date,
|
||||||
|
isOutlined: outlined,
|
||||||
|
showEvent: showEvent,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
wrapper = wrapper.wrapper;
|
||||||
|
vm = wrapper.vm;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('VnInputDateTime', () => {
|
||||||
|
describe('selectedDate', () => {
|
||||||
|
it('formats a valid datetime correctly', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.selectedDate).toBe('25-12-2023 10:30');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('handles null date value', async () => {
|
||||||
|
generateWrapper(null, false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.selectedDate).toBeInstanceOf(Date);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('updates the model value when a new datetime is set', async () => {
|
||||||
|
vm.selectedDate = '31-12-2023 15:45';
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('styleAttrs', () => {
|
||||||
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.styleAttrs).toEqual({});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', true, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.styleAttrs).toEqual({
|
||||||
|
dense: true,
|
||||||
|
outlined: true,
|
||||||
|
rounded: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('component rendering', () => {
|
||||||
|
it('should render date and time icons', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
const icons = wrapper.findAllComponents({ name: 'QIcon' });
|
||||||
|
expect(icons.length).toBe(2);
|
||||||
|
expect(icons[0].props('name')).toBe('today');
|
||||||
|
expect(icons[1].props('name')).toBe('access_time');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should render popup proxies for date and time', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
|
||||||
|
expect(popups.length).toBe(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -44,7 +44,8 @@ onBeforeMount(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// It enables to load data only once if the module is the same as the dataKey
|
// It enables to load data only once if the module is the same as the dataKey
|
||||||
if (!isSameDataKey.value || !route.params.id) await getData();
|
if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
|
||||||
|
await getData();
|
||||||
watch(
|
watch(
|
||||||
() => [$props.url, $props.filter],
|
() => [$props.url, $props.filter],
|
||||||
async () => {
|
async () => {
|
||||||
|
@ -58,7 +59,8 @@ async function getData() {
|
||||||
store.filter = $props.filter ?? {};
|
store.filter = $props.filter ?? {};
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
try {
|
try {
|
||||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
await arrayData.fetch({ append: false, updateRouter: false });
|
||||||
|
const { data } = store;
|
||||||
state.set($props.dataKey, data);
|
state.set($props.dataKey, data);
|
||||||
emit('onFetch', data);
|
emit('onFetch', data);
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -212,6 +212,7 @@ const getLocale = (label) => {
|
||||||
color="primary"
|
color="primary"
|
||||||
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
||||||
icon="search"
|
icon="search"
|
||||||
|
data-cy="vnFilterPanel_search"
|
||||||
@click="search()"
|
@click="search()"
|
||||||
>
|
>
|
||||||
<QTooltip bottom anchor="bottom right">
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
@ -229,6 +230,7 @@ const getLocale = (label) => {
|
||||||
<QItemSection top side>
|
<QItemSection top side>
|
||||||
<QBtn
|
<QBtn
|
||||||
@click="clearFilters"
|
@click="clearFilters"
|
||||||
|
data-cy="clearFilters"
|
||||||
color="primary"
|
color="primary"
|
||||||
dense
|
dense
|
||||||
flat
|
flat
|
||||||
|
@ -292,6 +294,7 @@ const getLocale = (label) => {
|
||||||
</QList>
|
</QList>
|
||||||
</QForm>
|
</QForm>
|
||||||
<QInnerLoading
|
<QInnerLoading
|
||||||
|
data-cy="filterPanel-spinner"
|
||||||
:label="t('globals.pleaseWait')"
|
:label="t('globals.pleaseWait')"
|
||||||
:showing="isLoading"
|
:showing="isLoading"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|
|
@ -6,6 +6,7 @@ globals:
|
||||||
quantity: Quantity
|
quantity: Quantity
|
||||||
entity: Entity
|
entity: Entity
|
||||||
preview: Preview
|
preview: Preview
|
||||||
|
scrollToTop: Go up
|
||||||
user: User
|
user: User
|
||||||
details: Details
|
details: Details
|
||||||
collapseMenu: Collapse lateral menu
|
collapseMenu: Collapse lateral menu
|
||||||
|
@ -19,6 +20,7 @@ globals:
|
||||||
logOut: Log out
|
logOut: Log out
|
||||||
date: Date
|
date: Date
|
||||||
dataSaved: Data saved
|
dataSaved: Data saved
|
||||||
|
openDetail: Open detail
|
||||||
dataDeleted: Data deleted
|
dataDeleted: Data deleted
|
||||||
delete: Delete
|
delete: Delete
|
||||||
search: Search
|
search: Search
|
||||||
|
|
|
@ -6,6 +6,7 @@ globals:
|
||||||
quantity: Cantidad
|
quantity: Cantidad
|
||||||
entity: Entidad
|
entity: Entidad
|
||||||
preview: Vista previa
|
preview: Vista previa
|
||||||
|
scrollToTop: Ir arriba
|
||||||
user: Usuario
|
user: Usuario
|
||||||
details: Detalles
|
details: Detalles
|
||||||
collapseMenu: Contraer menú lateral
|
collapseMenu: Contraer menú lateral
|
||||||
|
@ -20,10 +21,11 @@ globals:
|
||||||
date: Fecha
|
date: Fecha
|
||||||
dataSaved: Datos guardados
|
dataSaved: Datos guardados
|
||||||
dataDeleted: Datos eliminados
|
dataDeleted: Datos eliminados
|
||||||
|
dataCreated: Datos creados
|
||||||
|
openDetail: Ver detalle
|
||||||
delete: Eliminar
|
delete: Eliminar
|
||||||
search: Buscar
|
search: Buscar
|
||||||
changes: Cambios
|
changes: Cambios
|
||||||
dataCreated: Datos creados
|
|
||||||
add: Añadir
|
add: Añadir
|
||||||
create: Crear
|
create: Crear
|
||||||
edit: Modificar
|
edit: Modificar
|
||||||
|
|
|
@ -11,7 +11,7 @@ const $props = defineProps({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy>
|
<QPopupProxy data-cy="CustomerDescriptor">
|
||||||
<CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
|
<CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
|
||||||
</QPopupProxy>
|
</QPopupProxy>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
import { QBtn, useQuasar } from 'quasar';
|
import { QBtn, useQuasar } from 'quasar';
|
||||||
|
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import { toDateTimeFormat } from 'src/filters/date';
|
import { toDateTimeFormat } from 'src/filters/date';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
|
@ -74,12 +73,11 @@ const tableRef = ref();
|
||||||
<template>
|
<template>
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="ClientSamples"
|
data-key="CustomerSamples"
|
||||||
auto-load
|
auto-load
|
||||||
:filter="filter"
|
:user-filter="filter"
|
||||||
url="ClientSamples"
|
url="ClientSamples"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:disable-option="{ card: true }"
|
:disable-option="{ card: true }"
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
|
|
|
@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
|
||||||
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
|
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import notifyResults from 'src/utils/notifyResults';
|
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import { useState } from 'src/composables/useState';
|
||||||
|
|
||||||
const MATCH = 'match';
|
const MATCH = 'match';
|
||||||
|
const { notifyResults } = displayResults();
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -18,14 +20,20 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
filter: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
default: () => {},
|
||||||
|
},
|
||||||
replaceAction: {
|
replaceAction: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: false,
|
required: true,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
sales: {
|
sales: {
|
||||||
type: Array,
|
type: Array,
|
||||||
required: false,
|
required: true,
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
|
||||||
const sale = computed(() => $props.sales[0]);
|
const sale = computed(() => $props.sales[0]);
|
||||||
const saleFk = computed(() => sale.value.saleFk);
|
const saleFk = computed(() => sale.value.saleFk);
|
||||||
const filter = computed(() => ({
|
const filter = computed(() => ({
|
||||||
|
where: $props.filter,
|
||||||
|
|
||||||
itemFk: $props.itemLack.itemFk,
|
itemFk: $props.itemLack.itemFk,
|
||||||
sales: saleFk.value,
|
sales: saleFk.value,
|
||||||
}));
|
}));
|
||||||
|
@ -228,11 +238,15 @@ async function handleTicketConfig(data) {
|
||||||
url="TicketConfigs"
|
url="TicketConfigs"
|
||||||
:filter="{ fields: ['lackAlertPrice'] }"
|
:filter="{ fields: ['lackAlertPrice'] }"
|
||||||
@on-fetch="handleTicketConfig"
|
@on-fetch="handleTicketConfig"
|
||||||
auto-load
|
></FetchData>
|
||||||
|
<QInnerLoading
|
||||||
|
:showing="isLoading"
|
||||||
|
:label="t && t('globals.pleaseWait')"
|
||||||
|
color="primary"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<VnTable
|
<VnTable
|
||||||
v-if="ticketConfig"
|
v-if="!isLoading"
|
||||||
auto-load
|
auto-load
|
||||||
data-cy="proposalTable"
|
data-cy="proposalTable"
|
||||||
ref="proposalTableRef"
|
ref="proposalTableRef"
|
||||||
|
|
|
@ -1,13 +1,17 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import ItemProposal from './ItemProposal.vue';
|
import ItemProposal from './ItemProposal.vue';
|
||||||
import { useDialogPluginComponent } from 'quasar';
|
import { useDialogPluginComponent } from 'quasar';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
itemLack: {
|
itemLack: {
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true,
|
required: true,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
filter: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
default: () => {},
|
||||||
|
},
|
||||||
replaceAction: {
|
replaceAction: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: false,
|
required: false,
|
||||||
|
@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
|
||||||
<QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
|
<QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
|
||||||
<QCard class="dialog-width">
|
<QCard class="dialog-width">
|
||||||
<QCardSection class="row items-center q-pb-none">
|
<QCardSection class="row items-center q-pb-none">
|
||||||
<span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
|
<span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<QBtn icon="close" flat round dense v-close-popup />
|
<QBtn icon="close" flat round dense v-close-popup />
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
|
|
|
@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
|
||||||
class="q-pa-md"
|
class="q-pa-md"
|
||||||
:style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
|
:style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
|
||||||
>
|
>
|
||||||
<div style="flex: 0.3">
|
<div style="flex: 0.3" data-cy="clientsOnWebsite">
|
||||||
<span
|
<span
|
||||||
class="q-ml-md text-body1"
|
class="q-ml-md text-body1"
|
||||||
v-text="$t('salesMonitor.clientsOnWebsite')"
|
v-text="$t('salesMonitor.clientsOnWebsite')"
|
||||||
/>
|
/>
|
||||||
<SalesClientTable />
|
<SalesClientTable />
|
||||||
</div>
|
</div>
|
||||||
<div style="flex: 0.7">
|
<div style="flex: 0.7" data-cy="recentOrderActions">
|
||||||
<span
|
<span
|
||||||
class="q-ml-md text-body1"
|
class="q-ml-md text-body1"
|
||||||
v-text="$t('salesMonitor.recentOrderActions')"
|
v-text="$t('salesMonitor.recentOrderActions')"
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
|
||||||
import { toCurrency } from 'src/filters';
|
import { toCurrency } from 'src/filters';
|
||||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import VnDateBadge from 'src/components/common/VnDateBadge.vue';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -165,16 +166,7 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #column-dateSend="{ row }">
|
<template #column-dateSend="{ row }">
|
||||||
<QTd>
|
<VnDateBadge :date="row.date_send" />
|
||||||
<QBadge
|
|
||||||
:color="getBadgeColor(row.date_send)"
|
|
||||||
text-color="black"
|
|
||||||
class="q-pa-sm"
|
|
||||||
style="font-size: 14px"
|
|
||||||
>
|
|
||||||
{{ toDateFormat(row.date_send) }}
|
|
||||||
</QBadge>
|
|
||||||
</QTd>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #column-clientFk="{ row }">
|
<template #column-clientFk="{ row }">
|
||||||
|
|
|
@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
||||||
import FetchData from 'src/components/FetchData.vue';
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
import { dateRange } from 'src/filters';
|
import { dateRange } from 'src/filters';
|
||||||
|
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||||
|
|
||||||
defineProps({ dataKey: { type: String, required: true } });
|
defineProps({ dataKey: { type: String, required: true } });
|
||||||
const { t, te } = useI18n();
|
const { t, te } = useI18n();
|
||||||
|
@ -209,7 +210,7 @@ const getLocale = (label) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<VnCheckbox
|
||||||
:label="t('params.myTeam')"
|
:label="t('params.myTeam')"
|
||||||
v-model="params.myTeam"
|
v-model="params.myTeam"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
|
@ -218,7 +219,7 @@ const getLocale = (label) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<VnCheckbox
|
||||||
:label="t('params.problems')"
|
:label="t('params.problems')"
|
||||||
v-model="params.problems"
|
v-model="params.problems"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
|
@ -227,7 +228,7 @@ const getLocale = (label) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<VnCheckbox
|
||||||
:label="t('params.pending')"
|
:label="t('params.pending')"
|
||||||
v-model="params.pending"
|
v-model="params.pending"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted } from 'vue';
|
import { ref, computed, onMounted } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import FetchData from 'components/FetchData.vue';
|
|
||||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||||
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
|
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
|
||||||
|
@ -168,9 +167,11 @@ const columns = computed(() => [
|
||||||
component: 'select',
|
component: 'select',
|
||||||
name: 'provinceFk',
|
name: 'provinceFk',
|
||||||
attrs: {
|
attrs: {
|
||||||
options: provinceOpts.value,
|
url: 'Provinces',
|
||||||
'option-value': 'id',
|
fields: ['id', 'name'],
|
||||||
'option-label': 'name',
|
sortBy: ['name ASC'],
|
||||||
|
optionValue: 'id',
|
||||||
|
optionLabel: 'name',
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -183,9 +184,11 @@ const columns = computed(() => [
|
||||||
component: 'select',
|
component: 'select',
|
||||||
name: 'stateFk',
|
name: 'stateFk',
|
||||||
attrs: {
|
attrs: {
|
||||||
options: stateOpts.value,
|
sortBy: ['name ASC'],
|
||||||
'option-value': 'id',
|
url: 'States',
|
||||||
'option-label': 'name',
|
fields: ['id', 'name'],
|
||||||
|
optionValue: 'id',
|
||||||
|
optionLabel: 'name',
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -212,9 +215,12 @@ const columns = computed(() => [
|
||||||
component: 'select',
|
component: 'select',
|
||||||
name: 'zoneFk',
|
name: 'zoneFk',
|
||||||
attrs: {
|
attrs: {
|
||||||
options: zoneOpts.value,
|
url: 'Zones',
|
||||||
'option-value': 'id',
|
fields: ['id', 'name'],
|
||||||
'option-label': 'name',
|
sortBy: ['name ASC'],
|
||||||
|
|
||||||
|
optionValue: 'id',
|
||||||
|
optionLabel: 'name',
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -225,11 +231,12 @@ const columns = computed(() => [
|
||||||
align: 'left',
|
align: 'left',
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'select',
|
component: 'select',
|
||||||
url: 'PayMethods',
|
|
||||||
attrs: {
|
attrs: {
|
||||||
options: PayMethodOpts.value,
|
url: 'PayMethods',
|
||||||
optionValue: 'id',
|
fields: ['id', 'name'],
|
||||||
|
sortBy: ['id ASC'],
|
||||||
optionLabel: 'name',
|
optionLabel: 'name',
|
||||||
|
optionValue: 'id',
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -254,7 +261,9 @@ const columns = computed(() => [
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
options: DepartmentOpts.value,
|
url: 'Departments',
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
sortBy: ['id ASC'],
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -265,11 +274,12 @@ const columns = computed(() => [
|
||||||
align: 'left',
|
align: 'left',
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'select',
|
component: 'select',
|
||||||
url: 'ItemPackingTypes',
|
|
||||||
attrs: {
|
attrs: {
|
||||||
options: ItemPackingTypeOpts.value,
|
url: 'ItemPackingTypes',
|
||||||
'option-value': 'code',
|
fields: ['code'],
|
||||||
'option-label': 'code',
|
sortBy: ['code ASC'],
|
||||||
|
optionValue: 'code',
|
||||||
|
optionCode: 'code',
|
||||||
dense: true,
|
dense: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
|
||||||
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
|
||||||
url="Provinces"
|
|
||||||
:filter="{
|
|
||||||
fields: ['id', 'name'],
|
|
||||||
order: 'name ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (provinceOpts = data)"
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="States"
|
|
||||||
:filter="{
|
|
||||||
fields: ['id', 'name'],
|
|
||||||
order: 'name ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (stateOpts = data)"
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="Zones"
|
|
||||||
:filter="{
|
|
||||||
fields: ['id', 'name'],
|
|
||||||
order: 'name ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (zoneOpts = data)"
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="ItemPackingTypes"
|
|
||||||
:filter="{
|
|
||||||
fields: ['code'],
|
|
||||||
order: 'code ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (ItemPackingTypeOpts = data)"
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="Departments"
|
|
||||||
:filter="{
|
|
||||||
fields: ['id', 'name'],
|
|
||||||
order: 'id ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (DepartmentOpts = data)"
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="PayMethods"
|
|
||||||
:filter="{
|
|
||||||
fields: ['id', 'name'],
|
|
||||||
order: 'id ASC',
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (PayMethodOpts = data)"
|
|
||||||
/>
|
|
||||||
<MonitorTicketSearchbar />
|
<MonitorTicketSearchbar />
|
||||||
<RightMenu>
|
<RightMenu>
|
||||||
<template #right-panel>
|
<template #right-panel>
|
||||||
|
|
|
@ -233,10 +233,10 @@ const ticketColumns = ref([
|
||||||
</span>
|
</span>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-client="{ value, row }">
|
<template #body-cell-client="{ row }">
|
||||||
<QTd auto-width>
|
<QTd>
|
||||||
<span class="link">
|
<span class="link">
|
||||||
{{ value }}
|
{{ row.clientFk }}
|
||||||
<CustomerDescriptorProxy :id="row?.clientFk" />
|
<CustomerDescriptorProxy :id="row?.clientFk" />
|
||||||
</span>
|
</span>
|
||||||
</QTd>
|
</QTd>
|
||||||
|
|
|
@ -101,7 +101,7 @@ const onNextStep = async () => {
|
||||||
t('basicData.negativesConfirmMessage'),
|
t('basicData.negativesConfirmMessage'),
|
||||||
submitWithNegatives,
|
submitWithNegatives,
|
||||||
);
|
);
|
||||||
else submit();
|
else await submit();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -28,6 +28,7 @@ const props = defineProps({
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
restoreTicket();
|
restoreTicket();
|
||||||
|
hasDocuware();
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import TicketDescriptor from './TicketDescriptor.vue';
|
import TicketDescriptor from './TicketDescriptor.vue';
|
||||||
import TicketSummary from './TicketSummary.vue';
|
import TicketSummary from './TicketSummary.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: {
|
id: {
|
||||||
type: Number,
|
type: Number,
|
||||||
|
@ -10,7 +9,7 @@ const $props = defineProps({
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy>
|
<QPopupProxy data-cy="TicketDescriptor">
|
||||||
<TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
|
<TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
|
||||||
</QPopupProxy>
|
</QPopupProxy>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -773,6 +773,7 @@ watch(
|
||||||
v-model="row.itemFk"
|
v-model="row.itemFk"
|
||||||
:use-like="false"
|
:use-like="false"
|
||||||
@update:model-value="changeItem(row)"
|
@update:model-value="changeItem(row)"
|
||||||
|
autofocus
|
||||||
>
|
>
|
||||||
<template #option="scope">
|
<template #option="scope">
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
|
|
|
@ -3,7 +3,9 @@ import { ref } from 'vue';
|
||||||
|
|
||||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
import split from './components/split';
|
import split from './components/split';
|
||||||
const emit = defineEmits(['ticketTransfered']);
|
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||||
|
const { notifyResults } = displayResults();
|
||||||
|
const emit = defineEmits(['ticketTransferred']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
ticket: {
|
ticket: {
|
||||||
|
@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
|
||||||
|
|
||||||
const splitSelectedRows = async () => {
|
const splitSelectedRows = async () => {
|
||||||
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
|
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
|
||||||
await split(tickets, splitDate.value);
|
const results = await split(tickets, splitDate.value);
|
||||||
emit('ticketTransfered', tickets);
|
notifyResults(results, 'ticketFk');
|
||||||
|
emit('ticketTransferred', tickets);
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
|
<VnInputDate
|
||||||
|
class="q-mr-sm"
|
||||||
|
:label="$t('New date')"
|
||||||
|
v-model="splitDate"
|
||||||
|
clearable
|
||||||
|
autofocus
|
||||||
|
/>
|
||||||
<QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
|
<QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import TicketTransferForm from './TicketTransferForm.vue';
|
import TicketTransferForm from './TicketTransferForm.vue';
|
||||||
|
|
||||||
import { toDateFormat } from 'src/filters/date.js';
|
import { toDateFormat } from 'src/filters/date.js';
|
||||||
const emit = defineEmits(['ticketTransfered']);
|
const emit = defineEmits(['ticketTransferred']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
mana: {
|
mana: {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import TicketTransfer from './TicketTransfer.vue';
|
import TicketTransfer from './TicketTransfer.vue';
|
||||||
import Split from './TicketSplit.vue';
|
import TicketSplit from './TicketSplit.vue';
|
||||||
const emit = defineEmits(['ticketTransfered']);
|
const emit = defineEmits(['ticketTransferred']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
mana: {
|
mana: {
|
||||||
|
@ -35,7 +35,7 @@ const transferRef = ref(null);
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
|
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
|
||||||
<div class="flex row items-center q-ma-lg" v-if="$props.split">
|
<div class="flex row items-center q-ma-lg" v-if="$props.split">
|
||||||
<Split
|
<TicketSplit
|
||||||
ref="splitRef"
|
ref="splitRef"
|
||||||
@splitSelectedRows="splitSelectedRows"
|
@splitSelectedRows="splitSelectedRows"
|
||||||
:ticket="$props.ticket"
|
:ticket="$props.ticket"
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import notifyResults from 'src/utils/notifyResults';
|
|
||||||
|
|
||||||
export default async function (data, date) {
|
export default async function (data, date) {
|
||||||
const reducedData = data.reduce((acc, item) => {
|
const reducedData = data.reduce((acc, item) => {
|
||||||
const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
|
const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
|
||||||
if (existing) {
|
if (existing) {
|
||||||
existing.sales.push(item.saleFk);
|
existing.sales.push(item.saleFk);
|
||||||
} else {
|
} else {
|
||||||
acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
|
acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
|
||||||
}
|
}
|
||||||
return acc;
|
return acc;
|
||||||
}, []);
|
}, []);
|
||||||
|
@ -16,7 +14,5 @@ export default async function (data, date) {
|
||||||
|
|
||||||
const results = await Promise.allSettled(promises);
|
const results = await Promise.allSettled(promises);
|
||||||
|
|
||||||
notifyResults(results, 'ticketFk');
|
|
||||||
|
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@ const tableRef = ref();
|
||||||
const changeItemDialogRef = ref(null);
|
const changeItemDialogRef = ref(null);
|
||||||
const changeStateDialogRef = ref(null);
|
const changeStateDialogRef = ref(null);
|
||||||
const changeQuantityDialogRef = ref(null);
|
const changeQuantityDialogRef = ref(null);
|
||||||
const showProposalDialog = ref(false);
|
|
||||||
const showChangeQuantityDialog = ref(false);
|
const showChangeQuantityDialog = ref(false);
|
||||||
const selectedRows = ref([]);
|
const selectedRows = ref([]);
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -63,6 +62,7 @@ const showItemProposal = () => {
|
||||||
.dialog({
|
.dialog({
|
||||||
component: ItemProposalProxy,
|
component: ItemProposalProxy,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
|
filter: filter.value,
|
||||||
itemLack: tableRef.value.itemLack,
|
itemLack: tableRef.value.itemLack,
|
||||||
replaceAction: true,
|
replaceAction: true,
|
||||||
sales: selectedRows.value,
|
sales: selectedRows.value,
|
||||||
|
@ -117,21 +117,17 @@ const showItemProposal = () => {
|
||||||
sales: selectedRows,
|
sales: selectedRows,
|
||||||
lastActiveTickets: selectedRows.map((row) => row.id),
|
lastActiveTickets: selectedRows.map((row) => row.id),
|
||||||
}"
|
}"
|
||||||
@ticket-transfered="reload"
|
@ticket-transferred="reload"
|
||||||
></TicketTransferProxy>
|
></TicketTransferProxy>
|
||||||
</template>
|
</template>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
color="primary"
|
color="primary"
|
||||||
@click="showProposalDialog = true"
|
@click="showItemProposal"
|
||||||
:disable="selectedRows.length < 1"
|
:disable="!(selectedRows.length === 1)"
|
||||||
data-cy="itemProposal"
|
data-cy="itemProposal"
|
||||||
>
|
>
|
||||||
<QIcon
|
<QIcon name="import_export" class="rotate-90" />
|
||||||
name="import_export"
|
|
||||||
class="rotate-90"
|
|
||||||
@click="showItemProposal"
|
|
||||||
></QIcon>
|
|
||||||
<QTooltip bottom anchor="bottom right">
|
<QTooltip bottom anchor="bottom right">
|
||||||
{{ t('itemProposal') }}
|
{{ t('itemProposal') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
|
@ -139,7 +135,7 @@ const showItemProposal = () => {
|
||||||
<VnPopupProxy
|
<VnPopupProxy
|
||||||
data-cy="changeItem"
|
data-cy="changeItem"
|
||||||
icon="sync"
|
icon="sync"
|
||||||
:disable="selectedRows.length < 1"
|
:disable="!(selectedRows.length === 1)"
|
||||||
:tooltip="t('negative.detail.modal.changeItem.title')"
|
:tooltip="t('negative.detail.modal.changeItem.title')"
|
||||||
>
|
>
|
||||||
<template #extraIcon> <QIcon name="vn:item" /> </template>
|
<template #extraIcon> <QIcon name="vn:item" /> </template>
|
||||||
|
@ -153,7 +149,7 @@ const showItemProposal = () => {
|
||||||
<VnPopupProxy
|
<VnPopupProxy
|
||||||
data-cy="changeState"
|
data-cy="changeState"
|
||||||
icon="sync"
|
icon="sync"
|
||||||
:disable="selectedRows.length < 1"
|
:disable="!(selectedRows.length === 1)"
|
||||||
:tooltip="t('negative.detail.modal.changeState.title')"
|
:tooltip="t('negative.detail.modal.changeState.title')"
|
||||||
>
|
>
|
||||||
<template #extraIcon> <QIcon name="vn:eye" /> </template>
|
<template #extraIcon> <QIcon name="vn:eye" /> </template>
|
||||||
|
@ -167,7 +163,7 @@ const showItemProposal = () => {
|
||||||
<VnPopupProxy
|
<VnPopupProxy
|
||||||
data-cy="changeQuantity"
|
data-cy="changeQuantity"
|
||||||
icon="sync"
|
icon="sync"
|
||||||
:disable="selectedRows.length < 1"
|
:disable="!(selectedRows.length === 1)"
|
||||||
:tooltip="t('negative.detail.modal.changeQuantity.title')"
|
:tooltip="t('negative.detail.modal.changeQuantity.title')"
|
||||||
@click="showChangeQuantityDialog = true"
|
@click="showChangeQuantityDialog = true"
|
||||||
>
|
>
|
||||||
|
|
|
@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
|
||||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
|
@ -66,6 +67,7 @@ const setUserParams = (params) => {
|
||||||
:data-key="props.dataKey"
|
:data-key="props.dataKey"
|
||||||
:search-button="true"
|
:search-button="true"
|
||||||
@set-user-params="setUserParams"
|
@set-user-params="setUserParams"
|
||||||
|
:unremovable-params="['warehouseFk']"
|
||||||
>
|
>
|
||||||
<template #tags="{ tag, formatFn }">
|
<template #tags="{ tag, formatFn }">
|
||||||
<div class="q-gutter-x-xs">
|
<div class="q-gutter-x-xs">
|
||||||
|
@ -77,12 +79,11 @@ const setUserParams = (params) => {
|
||||||
<QList dense class="q-gutter-y-sm q-mt-sm">
|
<QList dense class="q-gutter-y-sm q-mt-sm">
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInput
|
<VnInputDateTime
|
||||||
v-model="params.days"
|
v-model="params.availabled"
|
||||||
:label="t('negative.days')"
|
:label="t('negative.availabled')"
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
type="number"
|
|
||||||
@update:model-value="
|
@update:model-value="
|
||||||
(value) => {
|
(value) => {
|
||||||
setUserParams(params);
|
setUserParams(params);
|
||||||
|
|
|
@ -21,14 +21,13 @@ const selectedRows = ref([]);
|
||||||
const tableRef = ref();
|
const tableRef = ref();
|
||||||
const filterParams = ref({});
|
const filterParams = ref({});
|
||||||
const negativeParams = reactive({
|
const negativeParams = reactive({
|
||||||
days: useRole().likeAny('buyer') ? 2 : 0,
|
|
||||||
warehouseFk: useState().getUser().value.warehouseFk,
|
warehouseFk: useState().getUser().value.warehouseFk,
|
||||||
|
availabled: Date.getCurrentDateTimeFormatted(),
|
||||||
});
|
});
|
||||||
const redirectToCreateView = ({ itemFk }) => {
|
const redirectToCreateView = ({ itemFk }) => {
|
||||||
router.push({
|
router.push({
|
||||||
name: 'NegativeDetail',
|
name: 'NegativeDetail',
|
||||||
params: { id: itemFk },
|
params: { id: itemFk },
|
||||||
query: { days: filterParams.value.days ?? negativeParams.days },
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -65,15 +64,19 @@ const columns = computed(() => [
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'input',
|
component: 'input',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
columnClass: 'shrink',
|
inWhere: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'longName',
|
name: 'longName',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
label: t('negative.longName'),
|
label: t('negative.longName'),
|
||||||
field: ({ longName }) => longName,
|
field: ({ longName }) => longName,
|
||||||
|
columnFilter: {
|
||||||
|
component: 'input',
|
||||||
|
inWhere: false,
|
||||||
|
useLike: true,
|
||||||
|
},
|
||||||
sortable: true,
|
sortable: true,
|
||||||
headerStyle: 'width: 350px',
|
headerStyle: 'width: 350px',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
|
@ -94,6 +97,11 @@ const columns = computed(() => [
|
||||||
field: ({ inkFk }) => inkFk,
|
field: ({ inkFk }) => inkFk,
|
||||||
sortable: true,
|
sortable: true,
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: 'input',
|
||||||
|
columnClass: 'shrink',
|
||||||
|
inWhere: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'size',
|
name: 'size',
|
||||||
|
@ -155,7 +163,6 @@ const setUserParams = (params) => {
|
||||||
<TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
|
<TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
|
||||||
</template>
|
</template>
|
||||||
</RightMenu>
|
</RightMenu>
|
||||||
{{ filterRef }}
|
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="NegativeList"
|
data-key="NegativeList"
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import FetchData from 'src/components/FetchData.vue';
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
import { toDate, toHour } from 'src/filters';
|
import { toDate } from 'src/filters';
|
||||||
import useNotify from 'src/composables/useNotify.js';
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
|
import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
@ -22,14 +22,6 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(
|
|
||||||
() => $props.filter,
|
|
||||||
(v) => {
|
|
||||||
filterLack.value.where = v;
|
|
||||||
tableRef.value.reload(filterLack);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
const filterLack = ref({
|
const filterLack = ref({
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
|
@ -90,6 +82,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'alertLevelCode',
|
name: 'alertLevelCode',
|
||||||
|
field: 'alertLevelCode',
|
||||||
label: t('negative.detail.state'),
|
label: t('negative.detail.state'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
name: 'alertLevelCode',
|
name: 'alertLevelCode',
|
||||||
|
@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
|
||||||
fetchItemLack.value.fetch();
|
fetchItemLack.value.fetch();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error saving changes', err);
|
console.error('Error saving changes', err);
|
||||||
f;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -171,7 +163,11 @@ function onBuysFetched(data) {
|
||||||
<FetchData
|
<FetchData
|
||||||
ref="fetchItemLack"
|
ref="fetchItemLack"
|
||||||
:url="`Tickets/itemLack`"
|
:url="`Tickets/itemLack`"
|
||||||
:params="{ id: entityId }"
|
:params="{
|
||||||
|
itemFk: entityId,
|
||||||
|
warehouseFk: $props.filter.warehouseFk,
|
||||||
|
availabled: Date.getCurrentDateTimeFormatted(),
|
||||||
|
}"
|
||||||
@on-fetch="(data) => (itemLack = data[0])"
|
@on-fetch="(data) => (itemLack = data[0])"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
|
@ -207,6 +203,7 @@ function onBuysFetched(data) {
|
||||||
dense
|
dense
|
||||||
:is-editable="true"
|
:is-editable="true"
|
||||||
:row-click="false"
|
:row-click="false"
|
||||||
|
:search-url="false"
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
:right-search-icon="false"
|
:right-search-icon="false"
|
||||||
v-model:selected="selectedRows"
|
v-model:selected="selectedRows"
|
||||||
|
@ -214,7 +211,6 @@ function onBuysFetched(data) {
|
||||||
>
|
>
|
||||||
<template #top-left>
|
<template #top-left>
|
||||||
<div style="display: flex; align-items: center" v-if="itemLack">
|
<div style="display: flex; align-items: center" v-if="itemLack">
|
||||||
<!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
|
|
||||||
<div class="flex column" style="align-items: center">
|
<div class="flex column" style="align-items: center">
|
||||||
<QBadge
|
<QBadge
|
||||||
ref="badgeLackRef"
|
ref="badgeLackRef"
|
||||||
|
@ -239,7 +235,7 @@ function onBuysFetched(data) {
|
||||||
|
|
||||||
<template #column-status="{ row }">
|
<template #column-status="{ row }">
|
||||||
<QTd style="min-width: 150px">
|
<QTd style="min-width: 150px">
|
||||||
<div class="icon-container">
|
<div class="flex items-start q-ma-sm">
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="row.isBasket"
|
v-if="row.isBasket"
|
||||||
name="vn:basket"
|
name="vn:basket"
|
||||||
|
@ -266,9 +262,10 @@ function onBuysFetched(data) {
|
||||||
size="xs"
|
size="xs"
|
||||||
>
|
>
|
||||||
<QTooltip>{{
|
<QTooltip>{{
|
||||||
t('negative.detail.hasObservation')
|
row?.note || t('negative.detail.hasObservation')
|
||||||
}}</QTooltip> </QIcon
|
}}</QTooltip>
|
||||||
><QIcon
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
v-if="row.isRookie"
|
v-if="row.isRookie"
|
||||||
name="vn:Person"
|
name="vn:Person"
|
||||||
size="xs"
|
size="xs"
|
||||||
|
@ -305,9 +302,9 @@ function onBuysFetched(data) {
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-ticketFk="{ row }">
|
<template #column-ticketFk="{ row }">
|
||||||
<span class="q-pa-sm link">
|
<span class="link" @click.stop>
|
||||||
{{ row.id }}
|
{{ row.ticketFk }}
|
||||||
<TicketDescriptorProxy :id="row.id" />
|
<TicketDescriptorProxy :id="row.ticketFk" />
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-alertLevelCode="props">
|
<template #column-alertLevelCode="props">
|
||||||
|
@ -335,15 +332,6 @@ function onBuysFetched(data) {
|
||||||
</VnTable>
|
</VnTable>
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.icon-container {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(3, 0.2fr);
|
|
||||||
row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
|
|
||||||
}
|
|
||||||
.icon-container > * {
|
|
||||||
width: 100%;
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
.list-enter-active,
|
.list-enter-active,
|
||||||
.list-leave-active {
|
.list-leave-active {
|
||||||
transition: all 1s ease;
|
transition: all 1s ease;
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import notifyResults from 'src/utils/notifyResults';
|
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||||
|
|
||||||
|
const { notifyResults } = displayResults();
|
||||||
const emit = defineEmits(['update-item']);
|
const emit = defineEmits(['update-item']);
|
||||||
|
|
||||||
const showChangeItemDialog = ref(false);
|
const showChangeItemDialog = ref(false);
|
||||||
|
@ -37,7 +39,6 @@ const updateItem = async () => {
|
||||||
<template>
|
<template>
|
||||||
<QCard class="q-pa-sm">
|
<QCard class="q-pa-sm">
|
||||||
<QCardSection class="row items-center justify-center column items-stretch">
|
<QCardSection class="row items-center justify-center column items-stretch">
|
||||||
{{ showChangeItemDialog }}
|
|
||||||
<span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
|
<span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
url="Items/WithName"
|
url="Items/WithName"
|
||||||
|
@ -47,6 +48,7 @@ const updateItem = async () => {
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="newItem"
|
v-model="newItem"
|
||||||
|
autofocus
|
||||||
>
|
>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
|
|
|
@ -2,8 +2,9 @@
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import notifyResults from 'src/utils/notifyResults';
|
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||||
|
|
||||||
|
const { notifyResults } = displayResults();
|
||||||
const showChangeQuantityDialog = ref(false);
|
const showChangeQuantityDialog = ref(false);
|
||||||
const newQuantity = ref(null);
|
const newQuantity = ref(null);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
|
||||||
const updateQuantity = async () => {
|
const updateQuantity = async () => {
|
||||||
try {
|
try {
|
||||||
showChangeQuantityDialog.value = true;
|
showChangeQuantityDialog.value = true;
|
||||||
const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
|
const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
|
||||||
axios.post(`Sales/${saleFk}/updateQuantity`, {
|
axios.post(`Sales/${saleFk}/updateQuantity`, {
|
||||||
saleFk,
|
saleFk,
|
||||||
|
ticketFk,
|
||||||
quantity: +newQuantity.value,
|
quantity: +newQuantity.value,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
const result = await Promise.allSettled(rowsToUpdate);
|
const result = await Promise.allSettled(rowsToUpdate);
|
||||||
notifyResults(result, 'saleFk');
|
notifyResults(result, 'ticketFk');
|
||||||
|
|
||||||
emit('update-quantity', newQuantity.value);
|
emit('update-quantity', newQuantity.value);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
@ -42,6 +44,7 @@ const updateQuantity = async () => {
|
||||||
:min="0"
|
:min="0"
|
||||||
:label="$t('negative.detail.modal.changeQuantity.placeholder')"
|
:label="$t('negative.detail.modal.changeQuantity.placeholder')"
|
||||||
v-model="newQuantity"
|
v-model="newQuantity"
|
||||||
|
autofocus
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
@ -3,8 +3,9 @@ import { ref } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import notifyResults from 'src/utils/notifyResults';
|
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||||
|
|
||||||
|
const { notifyResults } = displayResults();
|
||||||
const emit = defineEmits(['update-state']);
|
const emit = defineEmits(['update-state']);
|
||||||
const editableStates = ref([]);
|
const editableStates = ref([]);
|
||||||
const showChangeStateDialog = ref(false);
|
const showChangeStateDialog = ref(false);
|
||||||
|
@ -49,6 +50,7 @@ const updateState = async () => {
|
||||||
:options="editableStates"
|
:options="editableStates"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="code"
|
option-value="code"
|
||||||
|
autofocus
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
import { Notify } from 'quasar';
|
||||||
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
export function displayResults() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
const createSuccessNotification = (id, path) => {
|
||||||
|
Notify.create({
|
||||||
|
type: 'positive',
|
||||||
|
message: t('globals.dataSaved'),
|
||||||
|
actions: [
|
||||||
|
{
|
||||||
|
label: t('globals.openDetail'),
|
||||||
|
color: 'white',
|
||||||
|
handler: () => useOpenURL(`#/ticket/${id}/${path}`),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleResult = (result, key, path) => {
|
||||||
|
if (result.status !== 'fulfilled') {
|
||||||
|
const data = JSON.parse(result.reason.config.data);
|
||||||
|
const error =
|
||||||
|
result.reason.response?.data?.error?.message ?? result.reason.message;
|
||||||
|
Notify.create({
|
||||||
|
type: 'negative',
|
||||||
|
message: `Ticket ${data[key]}: ${error}`,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = JSON.parse(result.value.config.data);
|
||||||
|
let id = data[key];
|
||||||
|
|
||||||
|
if (result.value.data.status === 'noSplit') {
|
||||||
|
Notify.create({
|
||||||
|
type: 'warning',
|
||||||
|
message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.value.data.status === 'split') {
|
||||||
|
id = result.value.data.newTicket;
|
||||||
|
}
|
||||||
|
|
||||||
|
createSuccessNotification(id, path);
|
||||||
|
};
|
||||||
|
|
||||||
|
const notifyResults = (results, key, path = 'sale') =>
|
||||||
|
results.forEach((result) => handleResult(result, key, path));
|
||||||
|
|
||||||
|
return { notifyResults };
|
||||||
|
}
|
|
@ -42,7 +42,11 @@ const groupedStates = ref([]);
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
<VnFilterPanel
|
||||||
|
:data-key="props.dataKey"
|
||||||
|
:search-button="true"
|
||||||
|
:unremovableParams="['from', 'to']"
|
||||||
|
>
|
||||||
<template #tags="{ tag, formatFn }">
|
<template #tags="{ tag, formatFn }">
|
||||||
<div class="q-gutter-x-xs">
|
<div class="q-gutter-x-xs">
|
||||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||||
|
|
|
@ -236,6 +236,7 @@ negative:
|
||||||
minTimed: minTimed
|
minTimed: minTimed
|
||||||
negativeAction: Negative
|
negativeAction: Negative
|
||||||
totalNegative: Total negatives
|
totalNegative: Total negatives
|
||||||
|
availabled: Availabled
|
||||||
days: Days
|
days: Days
|
||||||
buttonsUpdate:
|
buttonsUpdate:
|
||||||
item: Item
|
item: Item
|
||||||
|
@ -265,7 +266,7 @@ negative:
|
||||||
isRookie: Is rookie
|
isRookie: Is rookie
|
||||||
turno: Turn line
|
turno: Turn line
|
||||||
isBasket: Basket
|
isBasket: Basket
|
||||||
hasObservation: Has substitution
|
hasObservation: Has substitution note
|
||||||
hasToIgnore: VIP
|
hasToIgnore: VIP
|
||||||
modal:
|
modal:
|
||||||
changeItem:
|
changeItem:
|
||||||
|
@ -288,3 +289,4 @@ negative:
|
||||||
newTicket: New ticket
|
newTicket: New ticket
|
||||||
status: Result
|
status: Result
|
||||||
message: Message
|
message: Message
|
||||||
|
noSplit: No split
|
||||||
|
|
|
@ -216,7 +216,8 @@ ticketList:
|
||||||
negative:
|
negative:
|
||||||
hour: Hora
|
hour: Hora
|
||||||
id: Id Articulo
|
id: Id Articulo
|
||||||
longName: Articulo
|
longName: Artículo
|
||||||
|
itemFk: Artículo
|
||||||
supplier: Productor
|
supplier: Productor
|
||||||
colour: Color
|
colour: Color
|
||||||
size: Medida
|
size: Medida
|
||||||
|
@ -232,6 +233,7 @@ negative:
|
||||||
inkFk: Color
|
inkFk: Color
|
||||||
timed: Hora
|
timed: Hora
|
||||||
date: Fecha
|
date: Fecha
|
||||||
|
availabled: Disponible
|
||||||
minTimed: Hora
|
minTimed: Hora
|
||||||
type: Tipo
|
type: Tipo
|
||||||
negativeAction: Negativo
|
negativeAction: Negativo
|
||||||
|
@ -265,7 +267,7 @@ negative:
|
||||||
isRookie: Cliente nuevo
|
isRookie: Cliente nuevo
|
||||||
turno: Linea turno
|
turno: Linea turno
|
||||||
isBasket: Cesta
|
isBasket: Cesta
|
||||||
hasObservation: Tiene sustitución
|
hasObservation: Tiene nota de sustitución
|
||||||
hasToIgnore: VIP
|
hasToIgnore: VIP
|
||||||
modal:
|
modal:
|
||||||
changeItem:
|
changeItem:
|
||||||
|
@ -284,10 +286,11 @@ negative:
|
||||||
title: Gestionar tickets spliteados
|
title: Gestionar tickets spliteados
|
||||||
subTitle: Confir fecha y agencia
|
subTitle: Confir fecha y agencia
|
||||||
split:
|
split:
|
||||||
ticket: Ticket viejo
|
ticket: Ticket origen
|
||||||
newTicket: Ticket nuevo
|
newTicket: Ticket nuevo
|
||||||
status: Estado
|
status: Estado
|
||||||
message: Mensaje
|
message: Mensaje
|
||||||
|
noSplit: No se puede splitar
|
||||||
rounding: Redondeo
|
rounding: Redondeo
|
||||||
noVerifiedData: Sin datos comprobados
|
noVerifiedData: Sin datos comprobados
|
||||||
purchaseRequest: Petición de compra
|
purchaseRequest: Petición de compra
|
||||||
|
|
|
@ -11,7 +11,7 @@ const $props = defineProps({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy>
|
<QPopupProxy data-cy="DepartmentDescriptor">
|
||||||
<DepartmentDescriptor
|
<DepartmentDescriptor
|
||||||
v-if="$props.id"
|
v-if="$props.id"
|
||||||
:id="$props.id"
|
:id="$props.id"
|
||||||
|
|
|
@ -68,7 +68,7 @@ const arrayData = useArrayData('ZoneEvents');
|
||||||
const exclusionGeoCreate = async () => {
|
const exclusionGeoCreate = async () => {
|
||||||
const params = {
|
const params = {
|
||||||
zoneFk: parseInt(route.params.id),
|
zoneFk: parseInt(route.params.id),
|
||||||
date: dated,
|
date: dated.value,
|
||||||
geoIds: tickedNodes.value,
|
geoIds: tickedNodes.value,
|
||||||
};
|
};
|
||||||
await axios.post('Zones/exclusionGeo', params);
|
await axios.post('Zones/exclusionGeo', params);
|
||||||
|
@ -101,9 +101,17 @@ const exclusionCreate = async () => {
|
||||||
const existsEvent = data.events.find(
|
const existsEvent = data.events.find(
|
||||||
(event) => toDateFormat(event.dated) === toDateFormat(dated.value),
|
(event) => toDateFormat(event.dated) === toDateFormat(dated.value),
|
||||||
);
|
);
|
||||||
|
const existsGeoEvent = data.geoExclusions.find(
|
||||||
|
(event) => toDateFormat(event.dated) === toDateFormat(dated.value),
|
||||||
|
);
|
||||||
if (existsEvent) {
|
if (existsEvent) {
|
||||||
await axios.delete(`Zones/${existsEvent?.zoneFk}/events/${existsEvent?.id}`);
|
await axios.delete(`Zones/${existsEvent?.zoneFk}/events/${existsEvent?.id}`);
|
||||||
}
|
}
|
||||||
|
if (existsGeoEvent) {
|
||||||
|
await axios.delete(
|
||||||
|
`Zones/${existsGeoEvent?.zoneFk}/exclusions/${existsGeoEvent?.zoneExclusionFk}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (isNew.value || props.event?.type) await axios.post(`${url}`, [body]);
|
if (isNew.value || props.event?.type) await axios.post(`${url}`, [body]);
|
||||||
else await axios.put(`${url}/${props.event?.id}`, body);
|
else await axios.put(`${url}/${props.event?.id}`, body);
|
||||||
|
@ -122,8 +130,21 @@ const onSubmit = async () => {
|
||||||
|
|
||||||
const deleteEvent = async () => {
|
const deleteEvent = async () => {
|
||||||
if (!props.event) return;
|
if (!props.event) return;
|
||||||
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
|
if (!props.event.created) {
|
||||||
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
|
const filter = {
|
||||||
|
where: {
|
||||||
|
dated: dated.value,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const params = { filter: JSON.stringify(filter) };
|
||||||
|
const { data: res } = await axios.get(`Zones/${route.params.id}/exclusions`, {
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
if (res) await axios.delete(`Zones/${route.params.id}/exclusions/${res[0].id}`);
|
||||||
|
} else {
|
||||||
|
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
|
||||||
|
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
|
||||||
|
}
|
||||||
await refetchEvents();
|
await refetchEvents();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -135,7 +156,7 @@ const refetchEvents = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (props.event) {
|
if (props.event && props.event.dated) {
|
||||||
dated.value = props.event?.dated;
|
dated.value = props.event?.dated;
|
||||||
excludeType.value =
|
excludeType.value =
|
||||||
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
|
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
|
||||||
|
|
|
@ -56,6 +56,7 @@ const isNew = computed(() => props.isNewMode);
|
||||||
const eventInclusionFormData = ref({ wdays: [] });
|
const eventInclusionFormData = ref({ wdays: [] });
|
||||||
const dated = ref(props.date || Date.vnNew());
|
const dated = ref(props.date || Date.vnNew());
|
||||||
const _inclusionType = ref('indefinitely');
|
const _inclusionType = ref('indefinitely');
|
||||||
|
const hasDeletedEvent = ref(false);
|
||||||
const inclusionType = computed({
|
const inclusionType = computed({
|
||||||
get: () => _inclusionType.value,
|
get: () => _inclusionType.value,
|
||||||
set: (val) => {
|
set: (val) => {
|
||||||
|
@ -84,7 +85,7 @@ const createEvent = async () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
|
const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
|
||||||
for (const id of zoneIds) {
|
for (const zoneId of zoneIds) {
|
||||||
let today = eventInclusionFormData.value.dated
|
let today = eventInclusionFormData.value.dated
|
||||||
? moment(eventInclusionFormData.value.dated)
|
? moment(eventInclusionFormData.value.dated)
|
||||||
: moment(dated.value);
|
: moment(dated.value);
|
||||||
|
@ -92,7 +93,7 @@ const createEvent = async () => {
|
||||||
|
|
||||||
const { data } = await axios.get(`Zones/getEventsFiltered`, {
|
const { data } = await axios.get(`Zones/getEventsFiltered`, {
|
||||||
params: {
|
params: {
|
||||||
zoneFk: id,
|
zoneFk: zoneId,
|
||||||
started: today,
|
started: today,
|
||||||
ended: lastDay,
|
ended: lastDay,
|
||||||
},
|
},
|
||||||
|
@ -106,15 +107,19 @@ const createEvent = async () => {
|
||||||
await axios.delete(
|
await axios.delete(
|
||||||
`Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`,
|
`Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`,
|
||||||
);
|
);
|
||||||
|
await refetchEvents();
|
||||||
|
hasDeletedEvent.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isNew.value)
|
delete eventInclusionFormData.value.id;
|
||||||
await axios.post(`Zones/${id}/events`, eventInclusionFormData.value);
|
if (isNew.value || hasDeletedEvent.value)
|
||||||
|
await axios.post(`Zones/${zoneId}/events`, eventInclusionFormData.value);
|
||||||
else
|
else
|
||||||
await axios.put(
|
await axios.put(
|
||||||
`Zones/${id}/events/${props.event?.id}`,
|
`Zones/${zoneId}/events/${props.event?.id}`,
|
||||||
eventInclusionFormData.value,
|
eventInclusionFormData.value,
|
||||||
);
|
);
|
||||||
|
hasDeletedEvent.value = false;
|
||||||
}
|
}
|
||||||
quasar.notify({
|
quasar.notify({
|
||||||
message: t('globals.dataSaved'),
|
message: t('globals.dataSaved'),
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { Notify } from 'quasar';
|
|
||||||
|
|
||||||
export default function (results, key) {
|
|
||||||
results.forEach((result, index) => {
|
|
||||||
if (result.status === 'fulfilled') {
|
|
||||||
const data = JSON.parse(result.value.config.data);
|
|
||||||
Notify.create({
|
|
||||||
type: 'positive',
|
|
||||||
message: `Operación (${index + 1}) ${data[key]} completada con éxito.`,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
const data = JSON.parse(result.reason.config.data);
|
|
||||||
Notify.create({
|
|
||||||
type: 'negative',
|
|
||||||
message: `Operación (${index + 1}) ${data[key]} fallida: ${result.reason.message}`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
|
@ -53,7 +53,7 @@ describe('invoiceInCorrective', () => {
|
||||||
it('should show/hide the section if it is a corrective invoice', () => {
|
it('should show/hide the section if it is a corrective invoice', () => {
|
||||||
cy.visit('/#/invoice-in/1/summary');
|
cy.visit('/#/invoice-in/1/summary');
|
||||||
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('not.exist');
|
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('not.exist');
|
||||||
cy.clicDescriptorAction(4);
|
cy.clickDescriptorAction(4);
|
||||||
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('exist');
|
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('exist');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -64,17 +64,17 @@ describe('InvoiceInDescriptor', () => {
|
||||||
beforeEach(() => cy.visit('/#/invoice-in/1/summary'));
|
beforeEach(() => cy.visit('/#/invoice-in/1/summary'));
|
||||||
|
|
||||||
it('should navigate to the supplier summary', () => {
|
it('should navigate to the supplier summary', () => {
|
||||||
cy.clicDescriptorAction(1);
|
cy.clickDescriptorAction(1);
|
||||||
cy.url().should('to.match', /supplier\/\d+\/summary/);
|
cy.url().should('to.match', /supplier\/\d+\/summary/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should navigate to the entry summary', () => {
|
it('should navigate to the entry summary', () => {
|
||||||
cy.clicDescriptorAction(2);
|
cy.clickDescriptorAction(2);
|
||||||
cy.url().should('to.match', /entry\/\d+\/summary/);
|
cy.url().should('to.match', /entry\/\d+\/summary/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should navigate to the invoiceIn list', () => {
|
it('should navigate to the invoiceIn list', () => {
|
||||||
cy.clicDescriptorAction(3);
|
cy.clickDescriptorAction(3);
|
||||||
cy.url().should('to.match', /invoice-in\/list\?table=\{.*supplierFk.+\}/);
|
cy.url().should('to.match', /invoice-in\/list\?table=\{.*supplierFk.+\}/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -93,7 +93,7 @@ describe('InvoiceInDescriptor', () => {
|
||||||
createCorrective();
|
createCorrective();
|
||||||
redirect(originalId);
|
redirect(originalId);
|
||||||
|
|
||||||
cy.clicDescriptorAction(4);
|
cy.clickDescriptorAction(4);
|
||||||
cy.validateVnTableRows({
|
cy.validateVnTableRows({
|
||||||
cols: [
|
cols: [
|
||||||
{
|
{
|
||||||
|
@ -141,7 +141,7 @@ function createCorrective() {
|
||||||
function redirect(subtitle) {
|
function redirect(subtitle) {
|
||||||
const regex = new RegExp(`InvoiceIns/${subtitle}\\?filter=.*`);
|
const regex = new RegExp(`InvoiceIns/${subtitle}\\?filter=.*`);
|
||||||
cy.intercept('GET', regex).as('getOriginal');
|
cy.intercept('GET', regex).as('getOriginal');
|
||||||
cy.clicDescriptorAction(4);
|
cy.clickDescriptorAction(4);
|
||||||
cy.wait('@getOriginal');
|
cy.wait('@getOriginal');
|
||||||
cy.validateDescriptor({ subtitle });
|
cy.validateDescriptor({ subtitle });
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
|
||||||
|
describe('Monitor Clients actions', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
cy.login('salesPerson');
|
||||||
|
cy.intercept('GET', '**/Departments**').as('departments');
|
||||||
|
cy.visit('/#/monitor/clients-actions');
|
||||||
|
cy.waitForElement('.q-page');
|
||||||
|
cy.wait('@departments').then((xhr) => {
|
||||||
|
cy.window().then((win) => {
|
||||||
|
const user = JSON.parse(win.sessionStorage.getItem('user'));
|
||||||
|
const { where } = JSON.parse(xhr.request.query.filter);
|
||||||
|
expect(where.id.like).to.include(user.departmentFk.toString());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
cy.intercept('GET', '**/SalesMonitors/ordersFilter*').as('ordersFilter');
|
||||||
|
cy.intercept('GET', '**/SalesMonitors/clientsFilter*').as('clientsFilter');
|
||||||
|
});
|
||||||
|
it('Should filter by field', () => {
|
||||||
|
cy.get('.q-page').should('be.visible');
|
||||||
|
cy.dataCy('clientsOnWebsite')
|
||||||
|
.find('[data-cy="column-filter-departmentFk"] [data-cy="_select"]')
|
||||||
|
.click();
|
||||||
|
cy.dataCy('recentOrderActions').within(() => {
|
||||||
|
cy.getRowCol('clientFk').find('span').should('have.class', 'link').click();
|
||||||
|
});
|
||||||
|
cy.checkVisibleDescriptor('Customer');
|
||||||
|
|
||||||
|
cy.dataCy('recentOrderActions').within(() => {
|
||||||
|
cy.getRowCol('departmentFk', 2)
|
||||||
|
.find('span')
|
||||||
|
.should('have.class', 'link')
|
||||||
|
.click();
|
||||||
|
});
|
||||||
|
|
||||||
|
cy.checkVisibleDescriptor('Department');
|
||||||
|
|
||||||
|
cy.dataCy('clientsOnWebsite')
|
||||||
|
.find('.q-ml-md')
|
||||||
|
.should('have.text', 'Clients on website');
|
||||||
|
cy.dataCy('recentOrderActions')
|
||||||
|
.find('.q-ml-md')
|
||||||
|
.should('have.text', 'Recent order actions');
|
||||||
|
cy.dataCy('From_inputDate').should('have.value', '01/01/2001');
|
||||||
|
cy.dataCy('To_inputDate').should('have.value', '01/01/2001');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,69 @@
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
describe('Monitor Tickets Table', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
cy.viewport(1920, 1080);
|
||||||
|
cy.login('salesPerson');
|
||||||
|
cy.visit('/#/monitor/tickets');
|
||||||
|
cy.waitForElement('.q-page');
|
||||||
|
cy.intercept('GET', '**/SalesMonitors/salesFilter*').as('filterRequest');
|
||||||
|
cy.openRightMenu();
|
||||||
|
});
|
||||||
|
it('should open new tab when ctrl+click on client link', () => {
|
||||||
|
cy.intercept('GET', '**/SalesMonitors/salesFilter*').as('filterRequest');
|
||||||
|
|
||||||
|
cy.window().then((win) => {
|
||||||
|
cy.stub(win, 'open').as('windowOpen');
|
||||||
|
});
|
||||||
|
|
||||||
|
cy.getRowCol('provinceFk').click({ ctrlKey: true });
|
||||||
|
cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
|
||||||
|
});
|
||||||
|
it('should open the descriptorProxy and SummaryPopup', () => {
|
||||||
|
cy.getRowCol('totalProblems');
|
||||||
|
|
||||||
|
cy.getRowCol('id').find('span').should('have.class', 'link').click();
|
||||||
|
cy.checkVisibleDescriptor('Ticket');
|
||||||
|
|
||||||
|
cy.getRowCol('zoneFk').find('span').should('have.class', 'link').click();
|
||||||
|
cy.checkVisibleDescriptor('Zone');
|
||||||
|
|
||||||
|
cy.getRowCol('clientFk').find('span').should('have.class', 'link').click();
|
||||||
|
cy.checkVisibleDescriptor('Customer');
|
||||||
|
|
||||||
|
cy.getRowCol('departmentFk').find('span').should('have.class', 'link').click();
|
||||||
|
cy.checkVisibleDescriptor('Department');
|
||||||
|
|
||||||
|
cy.getRowCol('shippedDate').find('.q-badge');
|
||||||
|
cy.tableActions().click({ ctrlKey: true });
|
||||||
|
cy.tableActions(1).click();
|
||||||
|
cy.get('.summaryHeader').should('exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('clear scopeDays', () => {
|
||||||
|
cy.get('[data-cy="Days onward_input"]').clear().type('2');
|
||||||
|
cy.searchInFilterPanel();
|
||||||
|
cy.get('.q-chip__content > span').should('have.text', '"2"');
|
||||||
|
cy.waitSpinner();
|
||||||
|
checkScopeDays(2);
|
||||||
|
cy.get('[data-cy="Days onward_input"]').clear();
|
||||||
|
cy.searchInFilterPanel();
|
||||||
|
cy.get('.q-chip__content > span').should('have.text', '"0"');
|
||||||
|
cy.waitSpinner();
|
||||||
|
checkScopeDays(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function checkScopeDays(scopeDays) {
|
||||||
|
cy.url().then((url) => {
|
||||||
|
const urlParams = new URLSearchParams(url.split('?')[1]);
|
||||||
|
const saleMonitorTickets = JSON.parse(
|
||||||
|
decodeURIComponent(urlParams.get('saleMonitorTickets')),
|
||||||
|
);
|
||||||
|
expect(saleMonitorTickets.scopeDays).to.equal(scopeDays);
|
||||||
|
const fromDate = new Date(saleMonitorTickets.from);
|
||||||
|
const toDate = new Date(saleMonitorTickets.to);
|
||||||
|
expect(toDate.getDate() - fromDate.getDate()).to.equal(
|
||||||
|
saleMonitorTickets.scopeDays,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
|
@ -2,7 +2,7 @@
|
||||||
describe('OrderCatalog', () => {
|
describe('OrderCatalog', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.viewport(1920, 720);
|
cy.viewport(1920, 1080);
|
||||||
cy.visit('/#/order/8/catalog');
|
cy.visit('/#/order/8/catalog');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -11,14 +11,15 @@ describe('OrderList', () => {
|
||||||
|
|
||||||
it('create order', () => {
|
it('create order', () => {
|
||||||
cy.get('[data-cy="vnTableCreateBtn"]').click();
|
cy.get('[data-cy="vnTableCreateBtn"]').click();
|
||||||
cy.selectOption(clientCreateSelect, 1101);
|
cy.selectOption('[data-cy="Client_select"]', 1101);
|
||||||
cy.get(addressCreateSelect).click();
|
cy.dataCy('landedDate').find('input').type('06/01/2001');
|
||||||
|
cy.get('[data-cy="Address_select"]').click();
|
||||||
cy.get(
|
cy.get(
|
||||||
'.q-menu > div> div.q-item:nth-child(1) >div.q-item__section--avatar > i',
|
'.q-menu > div> div.q-item:nth-child(1) >div.q-item__section--avatar > i',
|
||||||
).should('have.text', 'star');
|
).should('have.text', 'star');
|
||||||
cy.dataCy('landedDate').find('input').type('06/01/2001');
|
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
|
||||||
cy.selectOption(agencyCreateSelect, 1);
|
cy.get('.q-card [data-cy="Agency_select"]').click();
|
||||||
|
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
|
||||||
cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
|
cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
|
||||||
cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
|
cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
|
||||||
cy.wait('@orderSale');
|
cy.wait('@orderSale');
|
||||||
|
|
|
@ -6,9 +6,7 @@ describe('ParkingBasicData', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.visit(`/#/shelving/parking/1/basic-data`);
|
cy.visit(`/#/shelving/parking/1/basic-data`);
|
||||||
cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should(
|
cy.get('[data-cy="navBar-spinner"]', { timeout: 10000 }).should('not.be.visible');
|
||||||
'not.be.visible',
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should give an error if the code aldready exists', () => {
|
it('should give an error if the code aldready exists', () => {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
const firstRow = 'tbody > :nth-child(1)';
|
const firstRow = 'tbody > :nth-child(1)';
|
||||||
|
|
||||||
describe('TicketSale', () => {
|
describe('TicketSale', () => {
|
||||||
describe.skip('#23', () => {
|
describe.skip('Ticket #23', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('claimManager');
|
cy.login('claimManager');
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
Cypress.Commands.add('checkVisibleDescriptor', (alias) =>
|
||||||
|
cy
|
||||||
|
.get(`[data-cy="${alias}Descriptor"] [data-cy="vnDescriptor"] > .header`)
|
||||||
|
.should('exist')
|
||||||
|
.and('be.visible'),
|
||||||
|
);
|
|
@ -2,9 +2,7 @@ Cypress.Commands.add('getRow', (index = 1) =>
|
||||||
cy.get(`.vnTable .q-virtual-scroll__content tr:nth-child(${index})`),
|
cy.get(`.vnTable .q-virtual-scroll__content tr:nth-child(${index})`),
|
||||||
);
|
);
|
||||||
Cypress.Commands.add('getRowCol', (field, index = 1) =>
|
Cypress.Commands.add('getRowCol', (field, index = 1) =>
|
||||||
cy.get(
|
cy.getRow(index).find(`[data-col-field="${field}"]`),
|
||||||
`.vnTable .q-virtual-scroll__content > :nth-child(${index}) > [data-col-field="${field}"]`,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
Cypress.Commands.add('vnTableCreateBtn', () =>
|
Cypress.Commands.add('vnTableCreateBtn', () =>
|
||||||
|
@ -14,3 +12,9 @@ Cypress.Commands.add('vnTableCreateBtn', () =>
|
||||||
Cypress.Commands.add('waitTableScrollLoad', () =>
|
Cypress.Commands.add('waitTableScrollLoad', () =>
|
||||||
cy.waitForElement('[data-q-vs-anchor]'),
|
cy.waitForElement('[data-q-vs-anchor]'),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Cypress.Commands.add('tableActions', (n = 0, child = 1) =>
|
||||||
|
cy.get(
|
||||||
|
`:nth-child(${child}) > .q-table--col-auto-width > [data-cy="tableAction-${n}"] > .q-btn__content > .q-icon`,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
|
@ -10,7 +10,7 @@ describe('WagonTypeEdit', () => {
|
||||||
cy.get('.q-card');
|
cy.get('.q-card');
|
||||||
cy.get('input').first().type(' changed');
|
cy.get('input').first().type(' changed');
|
||||||
cy.get('div.q-checkbox__bg').first().click();
|
cy.get('div.q-checkbox__bg').first().click();
|
||||||
cy.get('.q-btn--standard').click();
|
cy.dataCy('saveDefaultBtn').click();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should delete a tray', () => {
|
it('should delete a tray', () => {
|
||||||
|
|
|
@ -78,20 +78,21 @@ Cypress.Commands.add('waitForElement', (element) => {
|
||||||
Cypress.Commands.add('getValue', (selector) => {
|
Cypress.Commands.add('getValue', (selector) => {
|
||||||
cy.get(selector).then(($el) => {
|
cy.get(selector).then(($el) => {
|
||||||
if ($el.find('.q-checkbox__inner').length > 0) {
|
if ($el.find('.q-checkbox__inner').length > 0) {
|
||||||
return cy.get(selector + '.q-checkbox__inner');
|
return cy.get(`${selector}.q-checkbox__inner`);
|
||||||
}
|
}
|
||||||
// Si es un QSelect
|
// Si es un QSelect
|
||||||
if ($el.find('.q-select__dropdown-icon').length) {
|
if ($el.find('.q-select__dropdown-icon').length) {
|
||||||
return cy
|
return cy
|
||||||
.get(
|
.get(
|
||||||
selector +
|
`${
|
||||||
'> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input',
|
selector
|
||||||
|
}> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input`,
|
||||||
)
|
)
|
||||||
.invoke('val');
|
.invoke('val');
|
||||||
}
|
}
|
||||||
// Si es un QSelect
|
// Si es un QSelect
|
||||||
if ($el.find('span').length) {
|
if ($el.find('span').length) {
|
||||||
return cy.get(selector + ' span').then(($span) => {
|
return cy.get(`${selector} span`).then(($span) => {
|
||||||
return $span[0].innerText;
|
return $span[0].innerText;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -100,10 +101,15 @@ Cypress.Commands.add('getValue', (selector) => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('waitSpinner', () => {
|
Cypress.Commands.add('waitSpinner', (_spinner = 'navBar') => {
|
||||||
|
const spinners = {
|
||||||
|
navBar: '[data-cy="navBar-spinner"]',
|
||||||
|
filterPanel: '[data-cy="filterPanel-spinner"]',
|
||||||
|
};
|
||||||
|
const spinner = spinners[_spinner];
|
||||||
cy.get('body').then(($body) => {
|
cy.get('body').then(($body) => {
|
||||||
if ($body.find('[data-cy="loading-spinner"]').length) {
|
if ($body.find(spinner).length) {
|
||||||
cy.get('[data-cy="loading-spinner"]').should('not.be.visible');
|
cy.get(spinner).should('not.be.visible');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -142,7 +148,7 @@ function selectItem(selector, option, ariaControl, hasWrite = true) {
|
||||||
function getItems(ariaControl, startTime = Cypress._.now(), timeout = 2500) {
|
function getItems(ariaControl, startTime = Cypress._.now(), timeout = 2500) {
|
||||||
// Se intenta obtener la lista de opciones del desplegable de manera recursiva
|
// Se intenta obtener la lista de opciones del desplegable de manera recursiva
|
||||||
return cy
|
return cy
|
||||||
.get('#' + ariaControl, { timeout })
|
.get(`#${ariaControl}`, { timeout })
|
||||||
.should('exist')
|
.should('exist')
|
||||||
.find('.q-item')
|
.find('.q-item')
|
||||||
.should('exist')
|
.should('exist')
|
||||||
|
@ -352,11 +358,21 @@ Cypress.Commands.add('openListSummary', (row) => {
|
||||||
cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(row).click();
|
cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(row).click();
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('openRightMenu', (element) => {
|
Cypress.Commands.add('openRightMenu', (element = 'toggle-right-drawer') => {
|
||||||
if (element) cy.waitForElement(element);
|
if (element) cy.waitForElement(`[data-cy="${element}"]`);
|
||||||
cy.get('[data-cy="toggle-right-drawer"]').click();
|
cy.dataCy(element).click();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('cleanFilterPanel', (element = 'clearFilters') => {
|
||||||
|
cy.get('#filterPanelForm').scrollIntoView();
|
||||||
|
if (element) cy.waitForElement(`[data-cy="${element}"]`);
|
||||||
|
cy.dataCy(element).click();
|
||||||
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('searchInFilterPanel', (element = 'vnFilterPanel_search') => {
|
||||||
|
if (element) cy.waitForElement(`[data-cy="${element}"]`);
|
||||||
|
cy.dataCy(element).click();
|
||||||
|
});
|
||||||
Cypress.Commands.add('openLeftMenu', (element) => {
|
Cypress.Commands.add('openLeftMenu', (element) => {
|
||||||
if (element) cy.waitForElement(element);
|
if (element) cy.waitForElement(element);
|
||||||
cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
|
cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
|
||||||
|
@ -454,9 +470,9 @@ Cypress.Commands.add('clickButtonWith', (type, value) => {
|
||||||
|
|
||||||
Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
|
Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
|
||||||
cy.waitForElement('[data-cy="descriptor_actions"]');
|
cy.waitForElement('[data-cy="descriptor_actions"]');
|
||||||
cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should('not.be.visible');
|
cy.waitSpinner();
|
||||||
cy.get('.q-btn')
|
cy.get('.q-btn')
|
||||||
.filter((index, el) => Cypress.$(el).find('.q-icon.' + iconClass).length > 0)
|
.filter((index, el) => Cypress.$(el).find(`.q-icon.${iconClass}`).length > 0)
|
||||||
.then(($btn) => {
|
.then(($btn) => {
|
||||||
cy.wrap($btn).click();
|
cy.wrap($btn).click();
|
||||||
});
|
});
|
||||||
|
@ -591,7 +607,7 @@ Cypress.Commands.add('validatePdfDownload', (match, trigger) => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('clicDescriptorAction', (index = 1) => {
|
Cypress.Commands.add('clickDescriptorAction', (index = 1) => {
|
||||||
cy.get(`[data-cy="descriptor_actions"] .q-btn:nth-of-type(${index})`).click();
|
cy.get(`[data-cy="descriptor_actions"] .q-btn:nth-of-type(${index})`).click();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,7 @@ const waitForApiReady = (url, maxRetries = 20, delay = 1000) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
before(() => {
|
before(() => {
|
||||||
|
cy.viewport(1920, 1080);
|
||||||
waitForApiReady('/api/Applications/status');
|
waitForApiReady('/api/Applications/status');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue