wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

This commit is contained in:
Jorge Penadés 2024-04-23 09:53:38 +02:00
parent f3c1608403 833f5e48a8
commit a3ce0440e8
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ui/VnNotes.vue
View File

@ -32,7 +32,7 @@ async function insert() {
<template>
<QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
<QCardSection horizontal>
<VnAvatar :descriptor="false" :worker-id="1" size="md" />
<VnAvatar :worker-id="currentUser.id" size="md" />
<div class="full-width row justify-between q-pa-xs">
<VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
{{ t('globals.now') }}

2
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -62,7 +62,7 @@ const setData = (entity) => {
<CardDescriptor
module="Worker"
data-key="workerData"
:url="`Workers/summary`"
url="Workers/summary"
:filter="filter"
:title="data.title"
:subtitle="data.subtitle"

11
test/cypress/integration/VnLocation.spec.js
View File

@ -1,5 +1,6 @@
const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
describe('VnLocation', () => {
const dialogInputs = '.q-dialog label input';
describe('Create', () => {
const inputLocation =
'.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
@ -39,13 +40,9 @@ describe('VnLocation', () => {
cy.get(
':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
).click();
cy.get(' .q-card > h1').should('have.text', 'New postcode');
cy.get(
'.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input'
).clear('12');
cy.get(
'.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input'
).type('1234453');
cy.get('.q-card > h1').should('have.text', 'New postcode');
cy.get(dialogInputs).eq(0).clear('12');
cy.get(dialogInputs).eq(0).type('1234453');
cy.selectOption(
'.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
'Valencia'

3
test/cypress/integration/claim/claimPhoto.spec.js
View File

@ -21,7 +21,8 @@ describe('ClaimPhoto', () => {
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
it('should open first image dialog change to second and close', () => {
it.skip('should open first image dialog change to second and close', () => {
/* skiped fix on https://redmine.verdnatura.es/issues/7113 */
cy.get(
':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
).click();