Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Benjamin Esteve 2025-04-09 07:26:52 +00:00
commit ef8d45fd21
47 changed files with 640 additions and 291 deletions

View File

@ -18,6 +18,8 @@
"test:e2e:summary": "bash ./test/cypress/summary.sh",
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
"test:front": "vitest",
"test:ui": "vitest --ui",
"test:coverage": "vitest run --coverage",
"test:front:ci": "vitest run",
"commitlint": "commitlint --edit",
"prepare": "npx husky install",
@ -27,6 +29,8 @@
"docs:preview": "vitepress preview docs"
},
"dependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"@quasar/cli": "^2.4.1",
"@quasar/extras": "^1.16.16",
"axios": "^1.4.0",
@ -40,8 +44,6 @@
"validator": "^13.9.0",
"vue": "^3.5.13",
"vue-i18n": "^9.4.0",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
@ -54,6 +56,7 @@
"@quasar/app-vite": "^2.0.8",
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vitest/ui": "3.1.1",
"@vue/compiler-sfc": "^3.5.13",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",

View File

@ -75,7 +75,10 @@ devDependencies:
version: 4.1.2
'@quasar/quasar-app-extension-testing-unit-vitest':
specifier: ^0.4.0
version: 0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13)
version: 0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13)
'@vitest/ui':
specifier: 3.1.1
version: 3.1.1(vitest@3.1.1)
'@vue/compiler-sfc':
specifier: ^3.5.13
version: 3.5.13
@ -132,7 +135,7 @@ devDependencies:
version: 1.86.3
vitest:
specifier: ^3.0.3
version: 3.1.1(@types/node@22.14.0)(sass@1.86.3)
version: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
xunit-viewer:
specifier: ^10.6.1
version: 10.6.1(@babel/runtime@7.27.0)(@codemirror/autocomplete@6.18.6)(@codemirror/language@6.11.0)(@codemirror/lint@6.8.5)(@codemirror/search@6.5.10)(@codemirror/state@6.5.2)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.36.5)(codemirror@6.0.1)(react-dom@19.1.0)(react@19.1.0)
@ -1139,6 +1142,10 @@ packages:
config-chain: 1.1.13
dev: false
/@polka/url@1.0.0-next.28:
resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
dev: true
/@quasar/app-vite@2.2.0(@types/node@22.14.0)(eslint@9.24.0)(pinia@2.3.1)(quasar@2.18.1)(sass@1.86.3)(typescript@5.8.3)(vue-router@4.5.0)(vue@3.5.13):
resolution: {integrity: sha512-MvCfJrCbxUYvoGaK5jPq0h0hjO8mbxYOWngf+dIKrxhwb+1h5ERh6aVYEUuCtMIwTMEVfPkCez4DIfZIoReuDw==}
engines: {node: ^30 || ^28 || ^26 || ^24 || ^22 || ^20 || ^18, npm: '>= 6.14.12', yarn: '>= 1.17.3'}
@ -1262,7 +1269,7 @@ packages:
'@quasar/quasar-ui-qcalendar': 4.1.2
dev: true
/@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13):
/@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13):
resolution: {integrity: sha512-eyzdUdmZiCueNS+5nedjMmzdbpCetSrtdGIwW6KplW1dTzRbLiNvYUjpBOxQGmJCgEhWy9zuswJ7MZ/bTql24Q==}
engines: {node: '>= 12.22.1', npm: '>= 6.14.12', yarn: '>= 1.17.3'}
peerDependencies:
@ -1275,13 +1282,14 @@ packages:
'@vitest/ui':
optional: true
dependencies:
'@vitest/ui': 3.1.1(vitest@3.1.1)
'@vue/test-utils': 2.4.6
happy-dom: 11.2.0
lodash-es: 4.17.21
quasar: 2.18.1
vite-jsconfig-paths: 2.0.1(vite@6.2.5)
vite-tsconfig-paths: 4.3.2(typescript@5.8.3)(vite@6.2.5)
vitest: 3.1.1(@types/node@22.14.0)(sass@1.86.3)
vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
vue: 3.5.13(typescript@5.8.3)
transitivePeerDependencies:
- supports-color
@ -1813,6 +1821,21 @@ packages:
tinyspy: 3.0.2
dev: true
/@vitest/ui@3.1.1(vitest@3.1.1):
resolution: {integrity: sha512-2HpiRIYg3dlvAJBV9RtsVswFgUSJK4Sv7QhpxoP0eBGkYwzGIKP34PjaV00AULQi9Ovl6LGyZfsetxDWY5BQdQ==}
peerDependencies:
vitest: 3.1.1
dependencies:
'@vitest/utils': 3.1.1
fflate: 0.8.2
flatted: 3.3.3
pathe: 2.0.3
sirv: 3.0.1
tinyglobby: 0.2.12
tinyrainbow: 2.0.0
vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
dev: true
/@vitest/utils@3.1.1:
resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==}
dependencies:
@ -4021,6 +4044,10 @@ packages:
picomatch: 4.0.2
dev: true
/fflate@0.8.2:
resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
dev: true
/figures@3.2.0:
resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
engines: {node: '>=8'}
@ -5588,6 +5615,11 @@ packages:
resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
dev: false
/mrmime@2.0.1:
resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
engines: {node: '>=10'}
dev: true
/ms@2.0.0:
resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@ -6964,6 +6996,15 @@ packages:
engines: {node: '>=14'}
dev: true
/sirv@3.0.1:
resolution: {integrity: sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==}
engines: {node: '>=18'}
dependencies:
'@polka/url': 1.0.0-next.28
mrmime: 2.0.1
totalist: 3.0.1
dev: true
/slash@3.0.0:
resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
engines: {node: '>=8'}
@ -7364,6 +7405,11 @@ packages:
resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
engines: {node: '>=0.6'}
/totalist@3.0.1:
resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
engines: {node: '>=6'}
dev: true
/tough-cookie@5.1.2:
resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
engines: {node: '>=16'}
@ -7772,7 +7818,7 @@ packages:
fsevents: 2.3.3
dev: true
/vitest@3.1.1(@types/node@22.14.0)(sass@1.86.3):
/vitest@3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3):
resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
hasBin: true
@ -7807,6 +7853,7 @@ packages:
'@vitest/runner': 3.1.1
'@vitest/snapshot': 3.1.1
'@vitest/spy': 3.1.1
'@vitest/ui': 3.1.1(vitest@3.1.1)
'@vitest/utils': 3.1.1
chai: 5.2.0
debug: 4.4.0(supports-color@8.1.1)

View File

@ -13,13 +13,12 @@ import VnConfirm from './ui/VnConfirm.vue';
import { tMobile } from 'src/composables/tMobile';
import { useArrayData } from 'src/composables/useArrayData';
import { getDifferences, getUpdatedValues } from 'src/filters';
const { push } = useRouter();
const quasar = useQuasar();
const state = useState();
const stateStore = useStateStore();
const { t } = useI18n();
const { validate } = useValidator();
const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
@ -119,7 +118,7 @@ const defaultButtons = computed(() => ({
color: 'primary',
icon: 'save',
label: 'globals.save',
click: async () => await save(),
click: async (evt) => submitForm(evt),
type: 'submit',
},
reset: {
@ -132,6 +131,13 @@ const defaultButtons = computed(() => ({
...$props.defaultButtons,
}));
const submitForm = async (evt) => {
const isFormValid = await myForm.value.validate();
if (isFormValid) {
await save(evt);
}
};
onMounted(async () => {
nextTick(() => (componentIsRendered.value = true));
@ -227,10 +233,9 @@ async function save() {
const method = $props.urlCreate ? 'post' : 'patch';
const url =
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
let response;
if ($props.saveFn) response = await $props.saveFn(body);
else response = await axios[method](url, body);
const response = await Promise.resolve(
$props.saveFn ? $props.saveFn(body) : axios[method](url, body),
);
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
@ -307,11 +312,13 @@ async function onKeyup(evt) {
selectionStart = selectionEnd = selectionStart + 1;
return;
}
await save();
await myForm.value.submit(evt);
}
}
defineExpose({
submitForm,
myForm,
save,
isLoading,
hasChanges,
@ -325,7 +332,7 @@ defineExpose({
<QForm
ref="myForm"
v-if="formData"
@submit.prevent
@submit.prevent="save"
@keyup.prevent="onKeyup"
@reset="reset"
class="q-pa-md"
@ -339,6 +346,7 @@ defineExpose({
name="form"
:data="formData"
:validate="validate"
:validations="validations()"
:filter="filter"
/>
<SkeletonForm v-else />

View File

@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
emit('onDataSaved', formData, requestResponse);
};
const onClick = async (saveAndContinue) => {
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
await formModelRef.value.myForm.validate(true);
isSaveAndContinue.value = saveAndContinue;
await formModelRef.value.save();
if (formModelRef.value) {
await formModelRef.value.submitForm();
}
};
defineExpose({
@ -59,16 +62,23 @@ defineExpose({
ref="formModelRef"
:observe-form-changes="false"
:default-actions="false"
@submit="onClick"
v-bind="$attrs"
@on-data-saved="onDataSaved"
:prevent-submit="false"
>
<template #form="{ data, validate }">
<template #form="{ data, validate, validations }">
<span ref="closeButton" class="close-icon" v-close-popup>
<QIcon name="close" size="sm" />
</span>
<h1 class="title">{{ title }}</h1>
<p>{{ subtitle }}</p>
<slot name="form-inputs" :data="data" :validate="validate" />
<slot
name="form-inputs"
:data="data"
:validate="validate"
:validations="validations"
/>
<div class="q-mt-lg row justify-end">
<QBtn
:label="t('globals.cancel')"
@ -87,12 +97,13 @@ defineExpose({
:flat="showSaveAndContinueBtn"
:label="t('globals.save')"
:title="t('globals.save')"
@click="onClick(false)"
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
color="primary"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_save"
@click="showSaveAndContinueBtn ? onClick(false) : null"
z-max
/>
<QBtn
@ -100,12 +111,13 @@ defineExpose({
:label="t('globals.isSaveAndContinue')"
:title="t('globals.isSaveAndContinue')"
color="primary"
:type="showSaveAndContinueBtn ? 'submit' : 'button'"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_isSaveAndContinue"
@click="showSaveAndContinueBtn ? onClick(true) : null"
z-max
@click="onClick(true)"
/>
</div>
</template>

View File

@ -19,6 +19,7 @@ import { useQuasar, date } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { useFilterParams } from 'src/composables/useFilterParams';
import { dashIfEmpty, toDate } from 'src/filters';
import { useTableHeight } from './filters/useTableHeight';
import CrudModel from 'src/components/CrudModel.vue';
import FormModelPopup from 'components/FormModelPopup.vue';
@ -117,7 +118,7 @@ const $props = defineProps({
},
tableHeight: {
type: String,
default: '90vh',
default: undefined,
},
footer: {
type: Boolean,
@ -166,6 +167,7 @@ const tableRef = ref();
const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app');
const tableHeight = useTableHeight();
const editingRow = ref(null);
const editingField = ref(null);
@ -678,7 +680,7 @@ const rowCtrlClickFunction = computed(() => {
table-header-class="bg-header"
card-container-class="grid-three"
flat
:style="isTableMode && `max-height: ${tableHeight}`"
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode"
@virtual-scroll="handleScroll"
@row-click="(event, row) => handleRowClick(event, row)"
@ -1042,7 +1044,7 @@ const rowCtrlClickFunction = computed(() => {
:model="$attrs['data-key'] + 'Create'"
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
>
<template #form-inputs="{ data }">
<template #form-inputs="{ data, validations }">
<slot name="alter-create" :data="data">
<div :style="createComplement?.containerStyle">
<div
@ -1060,6 +1062,7 @@ const rowCtrlClickFunction = computed(() => {
:key="column.name"
:name="`column-create-${column.name}`"
:data="data"
:validations="validations"
:column-name="column.name"
:label="column.label"
>

View File

@ -0,0 +1,18 @@
import { onMounted, nextTick, ref } from 'vue';
export function useTableHeight() {
const tableHeight = ref('90vh');
onMounted(async () => {
await nextTick();
let height = 100;
Array.from(document.querySelectorAll('[role="toolbar"]'))
.filter((element) => window.getComputedStyle(element).display !== 'none')
.forEach(() => {
height -= 10;
});
tableHeight.value = `${height}vh`;
});
return tableHeight;
}

View File

@ -1,6 +1,6 @@
<script setup>
import { watch } from 'vue';
import { toDateString } from 'src/filters';
import { toDateHourMinSec } from 'src/filters';
const props = defineProps({
value: { type: [String, Number, Boolean, Object], default: undefined },
@ -40,7 +40,7 @@ const updateValue = () => {
break;
case 'object':
if (props.value instanceof Date) {
t = toDateString(props.value);
t = toDateHourMinSec(props.value);
} else {
t = props.value.toString();
}

View File

@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
const date = new Date('2023-01-01');
const wrapper = buildComponent({ value: date });
const span = wrapper.find('span');
expect(span.text()).toBe('2023-01-01');
expect(span.text()).toBe('01/01/2023, 01:00:00');
expect(span.classes()).toContain('json-object');
});

View File

@ -78,7 +78,8 @@ export function useValidator() {
if (min >= 0)
if (Math.floor(value) < min) return t('inputMin', { value: min });
},
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
custom: (value) =>
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
};
};

View File

@ -340,3 +340,6 @@ input::-webkit-inner-spin-button {
.containerShrinked {
width: 70%;
}
.q-item__section--main ~ .q-item__section--side {
padding-inline: 0;
}

View File

@ -88,13 +88,13 @@ const columns = [
auto-load
>
<template #column-itemFk="{ row }">
<span class="link">
<span class="link" @click.stop>
{{ row.itemFk }}
<ItemDescriptorProxy :id="row.itemFk" />
</span>
</template>
<template #column-ticketFk="{ row }">
<span class="link">
<span class="link" @click.stop>
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>

View File

@ -79,7 +79,7 @@ async function acceptPropagate({ isEqualizated }) {
observe-form-changes
@on-data-saved="checkEtChanges"
>
<template #form="{ data, validate }">
<template #form="{ data, validate, validations }">
<VnRow>
<VnInput
:label="t('Social name')"
@ -112,6 +112,7 @@ async function acceptPropagate({ isEqualizated }) {
v-model="data.sageTaxTypeFk"
data-cy="sageTaxTypeFk"
:required="data.isTaxDataChecked"
:rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
/>
<VnSelect
:label="t('Sage transaction type')"
@ -122,6 +123,9 @@ async function acceptPropagate({ isEqualizated }) {
data-cy="sageTransactionTypeFk"
v-model="data.sageTransactionTypeFk"
:required="data.isTaxDataChecked"
:rules="[
(val) => validations.required(data.sageTransactionTypeFk, val),
]"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">

View File

@ -181,7 +181,7 @@ const sumRisk = ({ clientRisks }) => {
<QCard class="vn-one">
<VnTitle
:url="`#/customer/${entityId}/billing-data`"
:text="t('customer.summary.billingData')"
:text="t('customer.summary.payMethodFk')"
/>
<VnLv
:label="t('customer.summary.payMethod')"

View File

@ -787,7 +787,7 @@ onMounted(() => {
<span data-cy="footer-amount">{{ footer?.amount }} / </span>
<span style="color: var(--q-positive)">{{ footer?.checkedAmount }}</span>
</template>
<template #column-create-itemFk="{ data }">
<template #column-create-itemFk="{ data, validations }">
<VnSelect
url="Items/search"
v-model="data.itemFk"
@ -801,7 +801,8 @@ onMounted(() => {
await setBuyUltimate(value, data);
}
"
:required="true"
required
:rules="[(val) => validations.required(true, val)]"
data-cy="itemFk-create-popup"
sort-by="nickname DESC"
>

View File

@ -79,6 +79,30 @@ const columns = computed(() => [
inWhere: true,
},
},
{
align: 'left',
name: 'issued',
label: t('invoiceOut.summary.issued'),
component: 'date',
format: (row) => toDate(row.issued),
columnField: { component: null },
},
{
align: 'left',
name: 'created',
label: t('globals.created'),
component: 'date',
columnField: { component: null },
format: (row) => toDate(row.created),
},
{
align: 'left',
name: 'dued',
label: t('invoiceOut.summary.expirationDate'),
component: 'date',
columnField: { component: null },
format: (row) => toDate(row.dued),
},
{
align: 'left',
name: 'clientFk',
@ -132,22 +156,6 @@ const columns = computed(() => [
cardVisible: true,
format: (row) => toCurrency(row.amount),
},
{
align: 'left',
name: 'created',
label: t('globals.created'),
component: 'date',
columnField: { component: null },
format: (row) => toDate(row.created),
},
{
align: 'left',
name: 'dued',
label: t('invoiceOut.summary.dued'),
component: 'date',
columnField: { component: null },
format: (row) => toDate(row.dued),
},
{
align: 'left',
name: 'customsAgentFk',

View File

@ -22,7 +22,7 @@ const $props = defineProps({
});
</script>
<template>
<QPopupProxy style="max-width: 10px">
<QPopupProxy style="max-width: 10px" data-cy="ItemDescriptor">
<ItemDescriptor
v-if="$props.id"
:id="$props.id"

View File

@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
import { QCheckbox } from 'quasar';
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
import { useArrayData } from 'composables/useArrayData';
import { useValidator } from 'src/composables/useValidator';
@ -250,10 +250,9 @@ onMounted(async () => {
</QItemSection>
</QItem>
<!-- Tags filter -->
<QItem class="row items-center">
<QItemLabel>
{{ t('params.tags') }}
</QItemLabel>
<QItemLabel header>
{{ t('params.tags') }}
<QIcon
name="add_circle"
class="fill-icon-on-hover q-ml-md"
@ -261,7 +260,7 @@ onMounted(async () => {
color="primary"
@click="tagValues.push({})"
/>
</QItem>
</QItemLabel>
<QItem
v-for="(tag, index) in tagValues"
:key="index"
@ -269,6 +268,7 @@ onMounted(async () => {
>
<QItemSection class="col">
<VnSelect
class="full-width"
:label="t('params.tag')"
v-model="tag.selectedTag"
:options="tagOptions"
@ -316,25 +316,19 @@ onMounted(async () => {
/>
</QItem>
<!-- Filter fields -->
<QItem class="row items-center">
<QItemLabel>
{{ t('More fields') }}
</QItemLabel>
<QItemLabel header
>{{ t('More fields') }}
<QIcon
name="add_circle"
class="fill-icon-on-hover q-ml-md"
size="sm"
color="primary"
@click="fieldFiltersValues.push({})"
/>
</QItem>
<QItem
v-for="(fieldFilter, index) in fieldFiltersValues"
:key="index"
class="row items-center"
>
/></QItemLabel>
<QItem v-for="(fieldFilter, index) in fieldFiltersValues" :key="index">
<QItemSection class="col">
<VnSelect
class="full-width"
:label="t('params.tag')"
:model-value="fieldFilter.selectedField"
:options="moreFields"
@ -355,7 +349,7 @@ onMounted(async () => {
/>
</QItemSection>
<QItemSection class="col">
<QCheckbox
<VnCheckbox
v-if="fieldFilter.selectedField?.type === 'boolean'"
v-model="fieldFilter.value"
:label="t('params.value')"
@ -370,13 +364,14 @@ onMounted(async () => {
@keydown.enter="applyFieldFilters(params, searchFn)"
/>
</QItemSection>
<QIcon
name="delete"
class="fill-icon-on-hover q-ml-xs"
size="sm"
color="primary"
@click="removeFieldFilter(index, params, searchFn)"
/>
<QItemSection side
><QIcon
name="delete"
class="fill-icon-on-hover q-ml-xs"
size="sm"
color="primary"
@click="removeFieldFilter(index, params, searchFn)"
/></QItemSection>
</QItem>
<QItem>
<QItemSection>

View File

@ -91,7 +91,7 @@ const totalPrice = computed(() => {
const totalNewPrice = computed(() => {
return rows.value.reduce(
(acc, item) => acc + item.component.newPrice * item.quantity,
0
0,
);
});
@ -210,18 +210,18 @@ onMounted(async () => {
flat
>
<template #body-cell-item="{ row }">
<QTd @click.stop class="link">
<QBtn flat>
<QTd align="center">
<span @click.stop class="link">
{{ row.itemFk }}
<ItemDescriptorProxy :id="row.itemFk" />
</QBtn>
</span>
</QTd>
</template>
<template #body-cell-description="{ row }">
<QTd style="min-width: 120px; max-width: 120px">
<div class="column q-pb-xs" style="min-width: 120px">
<span>{{ row.item.name }}</span>
<FetchedTags :item="row.item" class="full-width" />
<FetchedTags :item="row.item" class="full-width" :columns="6" />
</div>
</QTd>
</template>

View File

@ -1,59 +0,0 @@
<script setup>
import { ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import FormModelPopup from 'components/FormModelPopup.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
import { useState } from 'src/composables/useState';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
const emit = defineEmits(['onRequestCreated']);
const route = useRoute();
const { t } = useI18n();
const state = useState();
const user = state.getUser();
const stateFetchDataRef = ref(null);
const statesOptions = ref([]);
const onStateFkChange = (formData) => (formData.userFk = user.value.id);
</script>
<template>
<FetchData
ref="stateFetchDataRef"
url="States"
auto-load
@on-fetch="(data) => (statesOptions = data)"
/>
<FormModelPopup
:title="t('Create tracking')"
url-create="Tickets/state"
model="CreateTicketTracking"
:form-initial-data="{ ticketFk: route.params.id }"
@on-data-saved="() => emit('onRequestCreated')"
>
<template #form-inputs="{ data }">
<VnRow>
<VnSelect
v-model="data.stateFk"
:label="t('ticketList.state')"
:options="statesOptions"
@update:model-value="onStateFkChange(data)"
hide-selected
option-label="name"
option-value="id"
/>
<VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
</VnRow>
</template>
</FormModelPopup>
</template>
<i18n>
es:
Create tracking: Crear estado
</i18n>

View File

@ -99,6 +99,7 @@ const columns = computed(() => [
align: 'left',
label: t('globals.quantity'),
name: 'quantity',
class: 'shrink',
format: (row) => toCurrency(row.quantity),
},
{
@ -791,7 +792,7 @@ watch(
{{ row?.item?.subName.toUpperCase() }}
</div>
</div>
<FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
<FetchedTags v-if="row.item" :item="row.item" :columns="6" :max-length="6" />
<QPopupProxy v-if="row.id && isTicketEditable">
<VnInput
v-model="row.concept"

View File

@ -1,27 +1,23 @@
<script setup>
import { ref, computed, watch, reactive } from 'vue';
import { ref, reactive, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import TicketCreateTracking from './TicketCreateTracking.vue';
import VnPaginate from 'components/ui/VnPaginate.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
import { useState } from 'src/composables/useState';
import { toDateTimeFormat } from 'src/filters/date.js';
import VnTable from 'src/components/VnTable/VnTable.vue';
const state = useState();
const user = state.getUser();
const route = useRoute();
const { t } = useI18n();
const createTrackingDialogRef = ref(null);
const paginateRef = ref(null);
watch(
() => route.params.id,
async (val) => {
paginateFilter.where.ticketFk = val;
paginateRef.value.fetch();
},
);
const tableRef = ref(null);
const onStateFkChange = (formData) => (formData.userFk = user.value.id);
const paginateFilter = reactive({
include: [
{
@ -56,75 +52,68 @@ const columns = computed(() => [
name: 'state',
field: 'state',
align: 'left',
format: (val) => val.name,
format: (row) => row.state?.name,
},
{
label: t('expedition.worker'),
name: 'worker',
align: 'left',
field: 'user',
},
{
label: t('expedition.created'),
name: 'created',
field: 'created',
align: 'left',
format: (val) => toDateTimeFormat(val),
format: ({ created }) => toDateTimeFormat(created),
},
]);
const openCreateModal = () => createTrackingDialogRef.value.show();
</script>
<template>
<QPage class="column items-center q-pa-md">
<VnPaginate
ref="paginateRef"
data-key="TicketTracking"
:user-filter="paginateFilter"
search-url="table"
url="TicketTrackings"
auto-load
order="created DESC"
:limit="0"
>
<template #body="{ rows }">
<QTable
:rows="rows"
:columns="columns"
row-key="id"
:pagination="{ rowsPerPage: 0 }"
class="full-width q-mt-md"
:no-data-label="t('globals.noResults')"
>
<template #body-cell-worker="{ row }">
<QTd>
<QBtn flat class="link" @click.stop>
{{ row.user?.name }}
<WorkerDescriptorProxy :id="row.user?.worker?.id" />
</QBtn>
</QTd>
</template>
</QTable>
</template>
</VnPaginate>
<QDialog
ref="createTrackingDialogRef"
transition-show="scale"
transition-hide="scale"
>
<TicketCreateTracking @on-request-created="paginateRef.fetch()" />
</QDialog>
<QPageSticky :offset="[20, 20]">
<QBtn
@click="openCreateModal()"
color="primary"
fab
icon="add"
v-shortcut="'+'"
<VnTable
ref="tableRef"
:right-search="false"
:column-search="false"
:disable-option="{ card: true, table: true }"
:search-url="false"
:columns="columns"
data-key="TicketTracking"
:user-filter="paginateFilter"
url="TicketTrackings"
auto-load
order="created DESC"
:limit="0"
:without-header="true"
:create="{
urlCreate: 'Tickets/state',
title: t('Create tracking'),
onDataSaved: () => tableRef.reload(),
formInitialData: {
ticketFk: route.params.id,
},
}"
>
<template #more-create-dialog="{ data }">
<VnSelect
url="States"
v-model="data.stateFk"
:label="t('ticketList.state')"
auto-load
@update:model-value="onStateFkChange(data)"
hide-selected
/>
<QTooltip class="text-no-wrap">
{{ t('tracking.addState') }}
</QTooltip>
</QPageSticky>
</QPage>
<VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
</template>
<template #column-worker="{ row }">
<span class="link" @click.stop>
{{ row.user.name }}
<WorkerDescriptorProxy :id="row.user?.worker?.id" />
</span>
</template>
</VnTable>
</template>
<i18n>
es:
Create tracking: Crear estado
</i18n>

View File

@ -134,7 +134,7 @@ onMounted(() => (stateStore.rightDrawer = true));
auto-load
>
<template #column-itemFk="{ row }">
<span class="link">
<span class="link" @click.stop>
{{ row.itemFk }}
<ItemDescriptorProxy :id="row.itemFk" />
</span>

View File

@ -166,50 +166,44 @@ const yearList = ref(generateYears());
}}
</QCardSection>
</div>
<QList dense class="list q-gutter-y-sm q-my-lg">
<QItem>
<QItemSection>
<VnSelect
:label="t('Year')"
v-model="selectedYear"
:options="yearList"
dense
filled
use-input
:is-clearable="false"
/>
</QItemSection>
<QItemSection>
<VnSelect
:label="t('Contract')"
v-model="selectedBusinessFk"
:options="contractList"
option-value="businessFk"
option-label="businessFk"
dense
filled
use-input
:is-clearable="false"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
<QItemLabel caption>
{{ toDateFormat(scope.opt?.started) }} -
{{
scope.opt?.ended
? toDateFormat(scope.opt?.ended)
: 'Indef.'
}}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QItemSection>
</QItem>
</QList>
<div dense class="column q-gutter-y-sm q-px-md">
<VnSelect
:label="t('Year')"
v-model="selectedYear"
:options="yearList"
dense
filled
use-input
:is-clearable="false"
/>
<VnSelect
:label="t('Contract')"
v-model="selectedBusinessFk"
:options="contractList"
option-value="businessFk"
option-label="businessFk"
dense
filled
use-input
:is-clearable="false"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
<QItemLabel caption>
{{ toDateFormat(scope.opt?.started) }} -
{{
scope.opt?.ended
? toDateFormat(scope.opt?.ended)
: 'Indef.'
}}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</div>
<QList dense class="list q-gutter-y-xs q-my-md">
<QItem v-for="type in absenceTypeList" :key="type.id">
<WorkerEventLabel

View File

@ -11,7 +11,7 @@ const $props = defineProps({
</script>
<template>
<QPopupProxy>
<QPopupProxy data-cy="WorkerDescriptor">
<WorkerDescriptor
v-if="$props.id"
:id="$props.id"

View File

@ -20,6 +20,7 @@ const { notify } = useNotify();
const loadingDocuware = ref(true);
const tableRef = ref();
const dialog = ref();
const getAvailablePdaRef = ref();
const route = useRoute();
const { openConfirmationModal } = useVnConfirm();
const routeId = computed(() => route.params.id);
@ -84,6 +85,7 @@ function reloadData() {
initialData.value.deviceProductionFk = null;
initialData.value.simFk = null;
tableRef.value.reload();
getAvailablePdaRef.value.fetch();
}
async function fetchDocuware() {
@ -135,6 +137,7 @@ async function deallocatePDA(deviceProductionFk) {
);
delete tableRef.value.CrudModelRef.formData[index];
notify(t('PDA deallocated'), 'positive');
await getAvailablePdaRef.value.fetch();
}
function isSigned(row) {
@ -144,6 +147,7 @@ function isSigned(row) {
<template>
<FetchData
ref="getAvailablePdaRef"
url="workers/getAvailablePda"
@on-fetch="(data) => (deviceProductions = data)"
auto-load
@ -234,7 +238,7 @@ function isSigned(row) {
data-cy="workerPda-download"
>
<QTooltip>
{{ t('worker.pda.download') }}
{{ t('globals.downloadPdf') }}
</QTooltip>
</QBtn>
</template>
@ -307,4 +311,5 @@ es:
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Sign PDA: Firmar PDA
PDF sended to signed: PDF enviado para firmar
</i18n>

View File

@ -11,7 +11,7 @@ const $props = defineProps({
</script>
<template>
<QPopupProxy>
<QPopupProxy data-cy="ZoneDescriptor">
<ZoneDescriptor v-if="$props.id" :id="$props.id" :summary="ZoneSummary" />
</QPopupProxy>
</template>

View File

@ -19,6 +19,7 @@ describe('Item summary', () => {
cy.get('.q-menu > .q-list > :nth-child(1) > .q-item__section').click();
cy.dataCy('regularizeStockInput').type('10');
cy.dataCy('Warehouse_select').type('Warehouse One{enter}');
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('Data created');
});
});

View File

@ -0,0 +1,46 @@
/// <reference types="cypress" />
describe('TicketBasicData', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/basic-data');
});
it('Should redirect to customer basic data', () => {
cy.get('.q-page').should('be.visible');
cy.get(':nth-child(2) > div > .text-primary').click();
cy.dataCy('Address_select').click();
cy.get('.q-btn-group ').find('.q-btn__content > .q-icon').click();
cy.get(
'[data-cy="CustomerBasicData-menu-item"] > .q-item__section--main',
).click();
cy.url().should('include', '/customer/1104/basic-data');
});
it.only('stepper', () => {
cy.get('.q-stepper__tab--active').should('have.class', 'q-stepper__tab--active');
cy.get('.q-stepper__nav > .q-btn--standard').click();
cy.get('.q-stepper__tab--done').should('have.class', 'q-stepper__tab--done');
cy.get('.q-stepper__tab--active').should('have.class', 'q-stepper__tab--active');
cy.get('tr:nth-child(1)>:nth-child(1)>span').should('have.class', 'link').click();
cy.dataCy('ItemDescriptor').should('exist');
cy.get('.q-drawer__content > :nth-child(1)').each(() => {
cy.get('span').should('contain.text', 'Price: €');
cy.get('span').should('contain.text', 'New price: €');
cy.get('span').should('contain.text', 'Difference: €');
});
cy.get(
':nth-child(3) > .q-radio > .q-radio__inner > .q-radio__bg > .q-radio__check',
).should('have.class', 'q-radio__check');
cy.get(
'.q-stepper__step-inner > .q-drawer-container > .q-drawer > .q-drawer__content',
).click();
cy.get(':nth-child(2) > :nth-child(1) > .text-weight-bold').click();
cy.get(':nth-child(3) > .q-radio > .q-radio__inner').should(
'have.class',
'q-radio__inner--truthy',
);
cy.get('.q-drawer__content > :nth-child(2)').click();
});
});

View File

@ -0,0 +1,30 @@
/// <reference types="cypress" />
describe('TicketComponents', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/1/components');
});
it('Should load layout', () => {
cy.get('.q-page').should('be.visible');
cy.validateScrollContent([
{ row: 2, col: 2, text: 'Base to commission: €799.20' },
{ row: 2, col: 3, text: 'Total without VAT: €807.20' },
{ row: 3, col: 2, text: 'valor de compra: €425.000' },
{ row: 3, col: 4, text: 'maná auto: €7.998' },
{ row: 4, col: 2, text: 'Price: €5.00' },
{ row: 4, col: 3, text: 'Bonus: €1.00' },
{ row: 4, col: 5, text: 'Packages: 6' },
{ row: 4, col: 4, text: 'Zone: Zone pickup A ' },
{ row: 5, col: 2, text: 'Total price: €16.00' },
]);
cy.get(':nth-child(4) > .link').click();
cy.dataCy('ZoneDescriptor').should('exist');
cy.getRowCol('total').should('have.text', '€250.000€247.000€4.970');
cy.getRowCol('import').should('have.text', '€50.000€49.400€0.994');
cy.getRowCol('components').should('have.text', 'valor de compramargenmaná auto');
cy.getRowCol('serie').should('have.text', 'costeempresacartera_comercial');
});
});

View File

@ -1,7 +1,5 @@
/// <reference types="cypress" />
describe('TicketList', () => {
const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@ -11,7 +9,7 @@ describe('TicketList', () => {
const searchResults = (search) => {
if (search) cy.typeSearchbar().type(search);
cy.dataCy('vn-searchbar').find('input').type('{enter}');
cy.get(firstRow).should('exist');
cy.getRow().should('exist');
};
it('should search results', () => {
@ -24,13 +22,13 @@ describe('TicketList', () => {
cy.window().then((win) => {
cy.stub(win, 'open').as('windowOpen');
});
cy.get(firstRow).should('be.visible').find('.q-btn:first').click();
cy.getRow().should('be.visible').find('.q-btn:first').click();
cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
});
it('should open ticket summary', () => {
searchResults();
cy.get(firstRow).find('.q-btn:last').click();
cy.getRow().find('.q-btn:last').click();
cy.get('.summaryHeader').should('exist');
cy.get('.summaryBody').should('exist');
});
@ -43,8 +41,9 @@ describe('TicketList', () => {
cy.dataCy('Customer ID_input').clear('1');
cy.dataCy('Customer ID_input').type('1101{enter}');
cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
cy.waitSpinner();
cy.intercept('GET', /\/api\/Clients\?filter/).as('clientFilter');
cy.vnTableCreateBtn();
cy.wait('@clientFilter');
cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
cy.dataCy('Address_select').click();
@ -52,8 +51,7 @@ describe('TicketList', () => {
cy.dataCy('Address_select').should('have.value', 'Bruce Wayne');
});
it('Client list create new ticket', () => {
cy.dataCy('vnTableCreateBtn').should('exist');
cy.dataCy('vnTableCreateBtn').click();
cy.vnTableCreateBtn();
const data = {
Customer: { val: 1, type: 'select' },
Warehouse: { val: 'Warehouse One', type: 'select' },

View File

@ -19,7 +19,7 @@ describe('TicketNotes', () => {
cy.checkNotification('Data saved');
cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
cy.dataCy('ticketNotesRemoveNoteBtn').click();
cy.dataCy('VnConfirm_confirm').click();
cy.confirmVnConfirm();
cy.checkNotification('Data saved');
});
});

View File

@ -0,0 +1,21 @@
/// <reference types="cypress" />
describe('TicketPackages', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/package');
});
it('Should load layout', () => {
cy.get('.q-page').should('be.visible');
cy.get('.vn-row > .q-btn > .q-btn__content > .q-icon').click();
cy.dataCy('Package_select').click();
cy.get('.q-menu :nth-child(1) >.q-item__section').click();
cy.dataCy('Quantity_input').clear().type('5');
cy.saveCrudModel();
cy.checkNotification('Data saved');
cy.get('.q-mb-md > .text-primary').click();
cy.confirmVnConfirm();
cy.checkNotification('Data saved');
});
});

View File

@ -0,0 +1,18 @@
/// <reference types="cypress" />
describe('TicketPictures', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/picture');
});
it('Should load layout', () => {
cy.get(':nth-child(1) > .q-card > .content').should('be.visible');
cy.get('.content > .link').should('be.visible').click();
cy.dataCy('ItemDescriptor').should('exist');
cy.dataCy('vnLvColor:');
cy.dataCy('vnLvColor:');
cy.dataCy('vnLvTallos:');
cy.get('.q-mt-md').should('be.visible');
cy.get(':nth-child(1) > .q-card > .img-wrapper').should('be.visible');
});
});

View File

@ -7,8 +7,7 @@ describe('TicketRequest', () => {
});
it('Creates a new request', () => {
cy.dataCy('vnTableCreateBtn').should('exist');
cy.dataCy('vnTableCreateBtn').click();
cy.vnTableCreateBtn();
const data = {
Description: { val: 'Purchase description' },
Atender: { val: 'buyerNick', type: 'select' },

View File

@ -2,9 +2,9 @@
const firstRow = 'tbody > :nth-child(1)';
describe('TicketSale', () => {
describe('Ticket #23', () => {
describe('#23', () => {
beforeEach(() => {
cy.login('developer');
cy.login('salesBoss');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/23/sale');
});
@ -16,10 +16,12 @@ describe('TicketSale', () => {
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
cy.dataCy('ticketEditManaProxy').should('exist');
cy.waitForElement('[data-cy="Price_input"]');
cy.dataCy('Price_input').clear();
cy.dataCy('Price_input').type(price);
cy.dataCy('Price_input').clear().type(price);
cy.intercept('POST', /\/api\/Sales\/\d+\/updatePrice/).as('updatePrice');
cy.dataCy('saveManaBtn').click();
handleVnConfirm();
cy.wait('@updatePrice').its('response.statusCode').should('eq', 200);
cy.get('[data-col-field="price"]')
.find('.q-btn > .q-btn__content')
@ -32,10 +34,14 @@ describe('TicketSale', () => {
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
cy.dataCy('ticketEditManaProxy').should('exist');
cy.waitForElement('[data-cy="Disc_input"]');
cy.dataCy('Disc_input').clear();
cy.dataCy('Disc_input').type(discount);
cy.dataCy('Disc_input').clear().type(discount);
cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
'updateDiscount',
);
cy.dataCy('saveManaBtn').click();
handleVnConfirm();
cy.wait('@updateDiscount').its('response.statusCode').should('eq', 204);
cy.get('[data-col-field="discount"]')
.find('.q-btn > .q-btn__content')
@ -46,6 +52,8 @@ describe('TicketSale', () => {
const concept = Math.floor(Math.random() * 100) + 1;
cy.waitForElement(firstRow);
cy.get('[data-col-field="item"]').click();
cy.intercept('POST', '**/api').as('postRequest');
cy.get('.q-menu')
.find('[data-cy="undefined_input"]')
.type(concept)
@ -58,6 +66,8 @@ describe('TicketSale', () => {
const quantity = Math.floor(Math.random() * 100) + 1;
cy.waitForElement(firstRow);
cy.dataCy('ticketSaleQuantityInput').find('input').clear();
cy.intercept('POST', '**/api').as('postRequest');
cy.dataCy('ticketSaleQuantityInput')
.find('input')
.type(quantity)
@ -71,7 +81,7 @@ describe('TicketSale', () => {
.should('have.value', `${quantity}`);
});
});
describe('Ticket to add claim #24', () => {
describe('#24 add claim', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@ -82,15 +92,15 @@ describe('TicketSale', () => {
selectFirstRow();
cy.dataCy('ticketSaleMoreActionsDropdown').click();
cy.dataCy('createClaimItem').click();
cy.dataCy('VnConfirm_confirm').click();
cy.confirmVnConfirm();
cy.url().should('contain', 'claim/');
// Delete created claim to avoid cluttering the database
cy.dataCy('descriptor-more-opts').click();
cy.dataCy('deleteClaim').click();
cy.dataCy('VnConfirm_confirm').click();
cy.confirmVnConfirm();
});
});
describe('Free ticket #31', () => {
describe('#31 free ticket', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@ -129,7 +139,9 @@ describe('TicketSale', () => {
cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
});
it('should update discount when "Update discount" is clicked', () => {
it.only('should update discount when "Update discount" is clicked', () => {
const discount = Number((Math.random() * 99 + 1).toFixed(2));
selectFirstRow();
cy.dataCy('ticketSaleMoreActionsDropdown').click();
cy.waitForElement('[data-cy="updateDiscountItem"]');
@ -137,9 +149,13 @@ describe('TicketSale', () => {
cy.dataCy('updateDiscountItem').click();
cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
cy.dataCy('ticketSaleDiscountInput').find('input').focus();
cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
'updateDiscount',
);
cy.dataCy('ticketSaleDiscountInput').find('input').type(discount);
cy.dataCy('saveManaBtn').click();
cy.waitForElement('.q-notification__message');
cy.wait('@updateDiscount').its('response.statusCode').should('eq', 204);
cy.checkNotification('Data saved');
cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
});
@ -148,7 +164,7 @@ describe('TicketSale', () => {
selectFirstRow();
cy.dataCy('ticketSaleMoreActionsDropdown').click();
cy.dataCy('createClaimItem').click();
cy.dataCy('VnConfirm_confirm').click();
cy.confirmVnConfirm();
cy.checkNotification('Future ticket date not allowed');
});
@ -173,7 +189,7 @@ describe('TicketSale', () => {
cy.url().should('match', /\/ticket\/31\/log/);
});
});
describe('Ticket to transfer #32', () => {
describe('#32 transfer', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@ -194,9 +210,7 @@ function selectFirstRow() {
cy.get(firstRow).find('.q-checkbox__inner').click();
}
function handleVnConfirm() {
cy.get('[data-cy="VnConfirm_confirm"]').click();
cy.waitForElement('.q-notification__message');
cy.confirmVnConfirm();
cy.get('.q-notification__message').should('be.visible');
cy.checkNotification('Data saved');
}

View File

@ -0,0 +1,53 @@
/// <reference types="cypress" />
function uncheckedSVG(className, state) {
cy.get(`${className} .q-checkbox__svg`).should(
state === 'checked' ? 'not.have.attr' : 'have.attr',
'fill',
'none',
);
}
function checkedSVG(className, state) {
cy.get(`${className} .q-checkbox__svg> .q-checkbox__truthy`).should(
state === 'checked' ? 'not.have.attr' : 'have.attr',
'fill',
'none',
);
}
function clickIconAndCloseDialog(n) {
cy.get(
`:nth-child(1) > :nth-child(6) > :nth-child(${n}) > .q-btn__content > .q-icon`,
).click();
}
describe('TicketSaleTracking', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/1/sale-tracking');
});
it('Should load layout', () => {
cy.get('.q-page').should('be.visible');
// Check checkbox states
uncheckedSVG('.pink', 'checked');
uncheckedSVG('.cyan', 'checked');
uncheckedSVG('.warning', 'checked');
uncheckedSVG('.info', 'checked');
checkedSVG('.yellow', 'unchecked');
cy.get('.q-page').click();
cy.get(
':nth-child(1) > :nth-child(6) > :nth-child(2) > .q-btn__content > .q-icon',
).click();
cy.get('body').type('{esc}');
cy.get(
':nth-child(1) > :nth-child(6) > :nth-child(1) > .q-btn__content > .q-icon',
).click();
cy.get(
'.q-dialog__inner > .q-table__container :nth-child(1) > :nth-child(2) .link.q-btn',
).click();
cy.dataCy('WorkerDescriptor').should('exist');
});
});

View File

@ -0,0 +1,23 @@
/// <reference types="cypress" />
describe('TicketService', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/service');
});
it('Add and remove service', () => {
cy.get('.q-page').should('be.visible');
cy.addBtnClick();
cy.dataCy('Description_icon').click();
cy.dataCy('Description_input').clear().type('test');
cy.saveFormModel();
cy.selectOption('[data-cy="Description_select"]', 'test');
cy.dataCy('Quantity_input').clear().type('1');
cy.dataCy('Price_input').clear().type('2');
cy.saveCrudModel();
cy.checkNotification('Data saved');
cy.get(':nth-child(5) > .q-icon').click();
});
});

View File

@ -0,0 +1,22 @@
/// <reference types="cypress" />
describe('TicketSms', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/32/sms');
});
it('Should load layout', () => {
cy.get('.q-page').should('be.visible');
cy.get('.q-infinite-scroll > :nth-child(1)').should(
'contain.text',
'0004 444444444Lorem ipsum dolor sit amet, consectetur adipiscing elit.2001-01-01 00:00:00OK',
);
cy.get(
':nth-child(1) > .q-item > .q-item__section--top > .column > .q-avatar',
).should('be.visible');
cy.get(
':nth-child(1) > .q-item > .q-item__section--side.justify-center > .center > .q-chip > .q-chip__content',
).should('have.class', 'q-chip__content');
});
});

View File

@ -0,0 +1,25 @@
/// <reference types="cypress" />
describe('Ticket tracking', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/tracking');
});
it('Add new tracking', () => {
cy.get('.q-page').should('be.visible');
cy.getRowCol('worker').find('span').should('have.class', 'link').click();
cy.dataCy('WorkerDescriptor').should('exist');
cy.vnTableCreateBtn();
cy.selectOption('.q-field--float [data-cy="State_select"]', 'OK').click();
cy.saveFormModel();
cy.get(
':last-child > [data-col-field="state"] > [data-cy="vnTableCell_state"]',
).should('have.text', 'OK');
cy.get(':last-child > [data-col-field="worker"]').should(
'have.text',
'developer ',
);
});
});

View File

@ -0,0 +1,27 @@
/// <reference types="cypress" />
function checkRightLabel(index, value, tag = 'Volume: ') {
cy.get(`.q-scrollarea__content > :nth-child(${index}) > :nth-child(2) > span`)
.should('be.visible')
.should('have.text', `${tag}${value}`);
}
describe('TicketVolume', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/ticket/1/volume');
});
it('Check right panel info', () => {
cy.get('.q-page').should('be.visible');
checkRightLabel(2, '0.028');
checkRightLabel(3, '0.014');
checkRightLabel(4, '1.526');
});
it('Descriptors', () => {
cy.get(':nth-child(1) > [data-col-field="itemFk"]')
.find('span')
.should('have.class', 'link')
.click();
cy.dataCy('ItemDescriptor').should('exist');
});
});

View File

@ -0,0 +1,3 @@
Cypress.Commands.add('saveCrudModel', () =>
cy.dataCy('crudModelDefaultSaveBtn').should('exist').click(),
);

View File

@ -0,0 +1,3 @@
Cypress.Commands.add('saveFormModel', () =>
cy.dataCy('FormModelPopup_save').should('exist').click(),
);

View File

@ -0,0 +1,3 @@
Cypress.Commands.add('confirmVnConfirm', () =>
cy.dataCy('VnConfirm_confirm').should('exist').click(),
);

View File

@ -0,0 +1,3 @@
Cypress.Commands.add('clickOption', (index = 1) =>
cy.get(`.q-menu :nth-child(${index}) >.q-item__section`).click(),
);

View File

@ -0,0 +1,16 @@
Cypress.Commands.add('getRow', (index = 1) =>
cy.get(`.vnTable .q-virtual-scroll__content tr:nth-child(${index})`),
);
Cypress.Commands.add('getRowCol', (field, index = 1) =>
cy.get(
`.vnTable .q-virtual-scroll__content > :nth-child(${index}) > [data-col-field="${field}"]`,
),
);
Cypress.Commands.add('vnTableCreateBtn', () =>
cy.dataCy('vnTableCreateBtn').should('exist').click(),
);
Cypress.Commands.add('waitTableScrollLoad', () =>
cy.waitForElement('[data-q-vs-anchor]'),
);

View File

@ -29,7 +29,12 @@
// import { registerCommands } from '@quasar/quasar-app-extension-testing-e2e-cypress';
import moment from 'moment';
import waitUntil from './waitUntil';
// Importar dinámicamente todos los archivos con el sufijo .commands.js dentro de la carpeta src/test/cypress/integration
const requireCommands = require.context('../integration', true, /\.commands\.js$/);
// Iterar sobre cada archivo y requerirlo
requireCommands.keys().forEach(requireCommands);
// Common comma
Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, waitUntil);
Cypress.Commands.add('resetDB', () => {
@ -606,6 +611,11 @@ Cypress.Commands.add('checkQueryParams', (expectedParams = {}) => {
});
});
Cypress.Commands.add('waitTableScrollLoad', () =>
cy.waitForElement('[data-q-vs-anchor]'),
);
Cypress.Commands.add('validateScrollContent', (validations) => {
validations.forEach(({ row, col, text }) => {
cy.get(`.q-scrollarea__content > :nth-child(${row}) > :nth-child(${col})`).should(
'have.text',
text,
);
});
});

View File

@ -17,6 +17,7 @@ if (process.env.CI) {
// https://vitejs.dev/config/
export default defineConfig({
test: {
globals: true,
reporters,
outputFile,
environment: 'happy-dom',