Merge branch 'dev' into Fix-InvoiceOutLostCode
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
a0f1e91237
|
@ -122,7 +122,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} down"
|
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
|
||||||
junit(
|
junit(
|
||||||
testResults: 'junit/e2e.xml',
|
testResults: 'junit/e2e.xml',
|
||||||
allowEmptyResults: true
|
allowEmptyResults: true
|
||||||
|
|
|
@ -31,6 +31,7 @@ export default defineConfig({
|
||||||
requestTimeout: 10000,
|
requestTimeout: 10000,
|
||||||
responseTimeout: 30000,
|
responseTimeout: 30000,
|
||||||
pageLoadTimeout: 60000,
|
pageLoadTimeout: 60000,
|
||||||
|
defaultBrowser: 'chromium',
|
||||||
fixturesFolder: 'test/cypress/fixtures',
|
fixturesFolder: 'test/cypress/fixtures',
|
||||||
screenshotsFolder: 'test/cypress/screenshots',
|
screenshotsFolder: 'test/cypress/screenshots',
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
|
@ -38,17 +39,10 @@ export default defineConfig({
|
||||||
downloadsFolder: 'test/cypress/downloads',
|
downloadsFolder: 'test/cypress/downloads',
|
||||||
video: false,
|
video: false,
|
||||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||||
experimentalRunAllSpecs: false,
|
experimentalRunAllSpecs: true,
|
||||||
watchForFileChanges: false,
|
watchForFileChanges: true,
|
||||||
reporter: 'cypress-mochawesome-reporter',
|
reporter,
|
||||||
reporterOptions: {
|
reporterOptions,
|
||||||
charts: true,
|
|
||||||
reportPageTitle: 'Cypress Inline Reporter',
|
|
||||||
reportFilename: '[status]_[datetime]-report',
|
|
||||||
embeddedScreenshots: true,
|
|
||||||
reportDir: 'test/cypress/reports',
|
|
||||||
inlineAssets: true,
|
|
||||||
},
|
|
||||||
component: {
|
component: {
|
||||||
componentFolder: 'src',
|
componentFolder: 'src',
|
||||||
testFiles: '**/*.spec.js',
|
testFiles: '**/*.spec.js',
|
||||||
|
|
|
@ -787,7 +787,7 @@ worker:
|
||||||
notes: Notas
|
notes: Notas
|
||||||
operator:
|
operator:
|
||||||
numberOfWagons: Número de vagones
|
numberOfWagons: Número de vagones
|
||||||
train: tren
|
train: Tren
|
||||||
itemPackingType: Tipo de embalaje
|
itemPackingType: Tipo de embalaje
|
||||||
warehouse: Almacén
|
warehouse: Almacén
|
||||||
sector: Sector
|
sector: Sector
|
||||||
|
|
|
@ -46,8 +46,18 @@ async function setAdvancedSummary(data) {
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
|
<VnInput
|
||||||
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
|
:label="t('Name')"
|
||||||
|
clearable
|
||||||
|
v-model="data.firstName"
|
||||||
|
:required="true"
|
||||||
|
/>
|
||||||
|
<VnInput
|
||||||
|
:label="t('Last name')"
|
||||||
|
clearable
|
||||||
|
v-model="data.lastName"
|
||||||
|
:required="true"
|
||||||
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
|
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
|
||||||
|
|
|
@ -54,9 +54,8 @@ watch(
|
||||||
selected.value = [];
|
selected.value = [];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ immediate: true, deep: true }
|
{ immediate: true, deep: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -105,6 +104,7 @@ watch(
|
||||||
:options="trainsData"
|
:options="trainsData"
|
||||||
hide-selected
|
hide-selected
|
||||||
v-model="row.trainFk"
|
v-model="row.trainFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -115,12 +115,14 @@ watch(
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="code"
|
option-value="code"
|
||||||
v-model="row.itemPackingTypeFk"
|
v-model="row.itemPackingTypeFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('worker.operator.warehouse')"
|
:label="t('worker.operator.warehouse')"
|
||||||
:options="warehousesData"
|
:options="warehousesData"
|
||||||
hide-selected
|
hide-selected
|
||||||
v-model="row.warehouseFk"
|
v-model="row.warehouseFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -175,6 +177,7 @@ watch(
|
||||||
:label="t('worker.operator.isOnReservationMode')"
|
:label="t('worker.operator.isOnReservationMode')"
|
||||||
v-model="row.isOnReservationMode"
|
v-model="row.isOnReservationMode"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
src/pages/Worker/Card/WorkerPBX.vue
|
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
import FormModel from 'src/components/FormModel.vue';
|
import FormModel from 'src/components/FormModel.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
const { t } = useI18n();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -26,3 +26,8 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
It must be a 4-digit number and must not end in 00: Debe ser un número de 4 cifras y no terminar en 00
|
||||||
|
</i18n>
|
||||||
|
|
|
@ -140,6 +140,7 @@ function reloadData() {
|
||||||
id="deviceProductionFk"
|
id="deviceProductionFk"
|
||||||
hide-selected
|
hide-selected
|
||||||
data-cy="pda-dialog-select"
|
data-cy="pda-dialog-select"
|
||||||
|
:required="true"
|
||||||
>
|
>
|
||||||
<template #option="scope">
|
<template #option="scope">
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe('Client list', () => {
|
describe.skip('Client list', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.viewport(1280, 720);
|
cy.viewport(1280, 720);
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
describe('WorkerCreate', () => {
|
describe.skip('WorkerCreate', () => {
|
||||||
const externalRadio = '.q-radio:nth-child(2)';
|
const externalRadio = '.q-radio:nth-child(2)';
|
||||||
const developerBossId = 120;
|
const developerBossId = 120;
|
||||||
const payMethodCross =
|
const payMethodCross =
|
||||||
|
|
|
@ -112,7 +112,7 @@ function selectItem(selector, option, ariaControl, hasWrite = true) {
|
||||||
.find((item) => item.innerText.includes(option));
|
.find((item) => item.innerText.includes(option));
|
||||||
if (matchingItem) return cy.wrap(matchingItem).click();
|
if (matchingItem) return cy.wrap(matchingItem).click();
|
||||||
|
|
||||||
if (hasWrite) cy.get(selector).clear().type(option, { delay: 0 });
|
if (hasWrite) cy.get(selector).clear().type(option);
|
||||||
return selectItem(selector, option, ariaControl, false);
|
return selectItem(selector, option, ariaControl, false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue