diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue index 254eb9cf9d1..a8209bdf71d 100644 --- a/src/components/common/SendEmailDialog.vue +++ b/src/components/common/SendEmailDialog.vue @@ -60,7 +60,7 @@ async function confirm() { v-model="address" is-outlined autofocus - data-cy="SendEmailNotifiactionDialogInput" + data-cy="SendEmailNotificationDialogInput" /> diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue index 9b06b24e61b..c7be68e9ea5 100644 --- a/src/components/common/VnLogFilter.vue +++ b/src/components/common/VnLogFilter.vue @@ -10,6 +10,7 @@ import { useFilterParams } from 'src/composables/useFilterParams'; import FetchData from '../FetchData.vue'; import { useValidator } from 'src/composables/useValidator'; import { useCapitalize } from 'src/composables/useCapitalize'; +import VnAvatar from '../ui/VnAvatar.vue'; const $props = defineProps({ dataKey: { @@ -99,7 +100,6 @@ function getActions() { :columns="columns" :redirect="false" :hiddenTags="['originFk', 'creationDate']" - :exprBuilder search-url="logs" :showTagChips="false" > diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 7ea91edca44..a6c23be2e5a 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -177,6 +177,8 @@ async function fetch() { .value { color: var(--vn-text-color); overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } .header { @@ -208,27 +210,21 @@ async function fetch() { } .vn-card-group { - display: flex; - flex-direction: column; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + gap: 16px; } .vn-card-content { display: flex; flex-direction: column; + overflow: hidden; + white-space: nowrap; text-overflow: ellipsis; > div { max-height: 70px; } } - -@media (min-width: 1010px) { - .vn-card-group { - flex-direction: row; - } - .vn-card-content { - flex: 1; - } -} es: Travel: EnvĂ­o diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 039d3ca9e0c..634b8e50aee 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -113,7 +113,7 @@ const columns = computed(() => [ }, { align: 'left', - name: 'shipped', + name: 'shippedDate', cardVisible: true, label: t('ticketList.shipped'), columnFilter: { @@ -123,7 +123,7 @@ const columns = computed(() => [ }, { align: 'left', - name: 'shipped', + name: 'shippedHour', component: 'time', columnFilter: false, label: t('ticketList.hour'), diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index 9eb8ce8cbfc..2e44df7aa15 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -205,6 +205,7 @@ ticketList: toLines: Go to lines addressNickname: Address nickname ref: Reference + hour: Hour rounding: Rounding noVerifiedData: No verified data purchaseRequest: Purchase request diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue index 0f09c0a9737..9576e7e847b 100644 --- a/src/pages/Worker/Card/WorkerDescriptor.vue +++ b/src/pages/Worker/Card/WorkerDescriptor.vue @@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => { - - diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js index 7058e154ca7..9744486e0ba 100644 --- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js +++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js @@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => { cy.visit('/#/invoice-in/6/summary'); cy.selectDescriptorOption(5); - cy.dataCy('SendEmailNotifiactionDialogInput_input').type( + cy.dataCy('SendEmailNotificationDialogInput_input').type( '{selectall}jorgito@gmail.mx', ); cy.clickConfirm(); diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js index 63e828f556d..49eed32c7db 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js @@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => { }); }); - it('should transfer the invoice ', () => { + it.skip('should transfer the invoice ', () => { cy.typeSearchbar('T1111111{enter}'); cy.dataCy('descriptor-more-opts').click(); cy.get(selectMenuOption(1)).click(); @@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => { cy.dataCy('descriptor-more-opts').click(); cy.get(selectMenuOption(3)).click(); cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click(); - cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible'); + cy.dataCy('SendEmailNotificationDialogInput').should('be.visible'); cy.get(confirmSend).click(); cy.checkNotification('Notification sent'); }); @@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => { cy.dataCy('descriptor-more-opts').click(); cy.get(selectMenuOption(3)).click(); cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click(); - cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible'); + cy.dataCy('SendEmailNotificationDialogInput').should('be.visible'); cy.get(confirmSend).click(); cy.checkNotification('Notification sent'); });