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

refactor: improve layout and styling in ExtraCommunity.vue #1669

Merged
pablone merged 2 commits from warmFixExtraComunityFieldsDisplay into test 2025-04-02 12:18:10 +00:00
Conversation 0 Commits 2 Files Changed 3 +20 -21
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pages/Travel/ExtraCommunity.vue
View File

@ -505,7 +505,6 @@ watch(route, () => {
:props="props" :props="props"
@click="stopEventPropagation($event, col)" @click="stopEventPropagation($event, col)"
:style="col.style" :style="col.style"
style="padding-left: 5px"
> >
<component <component
:is="tableColumnComponents[col.name].component" :is="tableColumnComponents[col.name].component"
@ -581,19 +580,20 @@ watch(route, () => {
<QBtn dense flat class="link">{{ entry.id }} </QBtn> <QBtn dense flat class="link">{{ entry.id }} </QBtn>
<EntryDescriptorProxy :id="entry.id" /> <EntryDescriptorProxy :id="entry.id" />
</QTd> </QTd>
<QTd> <QTd :colspan="2">
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn> <div style="display: flex">
<SupplierDescriptorProxy :id="entry.supplierFk" /> <span class="link">
</QTd> {{ entry.supplierName }}
<QTd class="text-center"> <SupplierDescriptorProxy :id="entry.supplierFk" />
<QIcon </span>
v-if="entry.isCustomInspectionRequired" <QIcon
name="warning" v-if="entry.isCustomInspectionRequired"
color="negative" name="warning"
size="md" color="negative"
:title="t('extraCommunity.requiresInspection')" size="md"
> :title="t('extraCommunity.requiresInspection')"
</QIcon> />
</div>
</QTd> </QTd>
<QTd class="text-right"> <QTd class="text-right">
<span>{{ toCurrency(entry.invoiceAmount) }}</span> <span>{{ toCurrency(entry.invoiceAmount) }}</span>
@ -639,9 +639,7 @@ watch(route, () => {
&:nth-child(1) { &:nth-child(1) {
max-width: 65px; max-width: 65px;
} }
&:nth-child(4) { padding: 0 5px 0;
padding: 0;
}
} }
thead > tr > th { thead > tr > th {
padding: 3px; padding: 3px;

4
test/cypress/integration/vnComponent/VnShortcut.spec.js
View File

@ -1,6 +1,6 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
// https://redmine.verdnatura.es/issues/8848
describe('VnShortcuts', () => { describe.skip('VnShortcuts', () => {
const modules = { const modules = {
item: 'a', item: 'a',
customer: 'c', customer: 'c',

5
test/cypress/integration/worker/workerList.spec.js
View File

@ -1,4 +1,5 @@
describe('WorkerList', () => { // https://redmine.verdnatura.es/issues/8848
describe.skip('WorkerList', () => {
const inputName = '.q-drawer .q-form input[aria-label="First Name"]'; const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
const searchBtn = '.q-drawer button:nth-child(3)'; const searchBtn = '.q-drawer button:nth-child(3)';
const descriptorTitle = '.descriptor .title span'; const descriptorTitle = '.descriptor .title span';
@ -13,7 +14,7 @@ describe('WorkerList', () => {
cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker'); cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
cy.get(searchBtn).click(); cy.get(searchBtn).click();
cy.wait('@worker').then(() => cy.wait('@worker').then(() =>
cy.get(descriptorTitle).should('include.text', 'Jessica') cy.get(descriptorTitle).should('include.text', 'Jessica'),
); );
}); });
}); });