diff --git a/Jenkinsfile b/Jenkinsfile index c5424ee27..a52a9e91d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,6 +113,7 @@ pipeline { } steps { script { + sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh "docker-compose ${env.COMPOSE_PARAMS} up -d" diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9e46c54e3..5b667555e 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -694,8 +694,10 @@ worker: machine: Machine business: tableVisibleColumns: + id: ID started: Start Date ended: End Date + hourlyLabor: Time sheet company: Company reasonEnd: Reason for Termination department: Department @@ -703,6 +705,7 @@ worker: calendarType: Work Calendar workCenter: Work Center payrollCategories: Contract Category + workerBusinessAgreementName: Agreement occupationCode: Contribution Code rate: Rate businessType: Contract Type diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index fd42d37c7..3f004485d 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -770,8 +770,10 @@ worker: concept: Concepto business: tableVisibleColumns: + id: Id started: Fecha inicio ended: Fecha fin + hourlyLabor: Ficha company: Empresa reasonEnd: Motivo finalización department: Departamento @@ -782,6 +784,7 @@ worker: occupationCode: Cotización rate: Tarifa businessType: Contrato + workerBusinessAgreementName: Convenio amount: Salario basicSalary: Salario transportistas notes: Notas diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue index 15f8cc20c..6e67c31ed 100644 --- a/src/pages/Entry/Card/EntryBuys.vue +++ b/src/pages/Entry/Card/EntryBuys.vue @@ -62,9 +62,10 @@ const columns = [ name: 'workerFk', component: 'select', attrs: { - url: 'Workers/search', + url: 'TicketRequests/getItemTypeWorker', fields: ['id', 'nickname'], optionLabel: 'nickname', + sortBy: 'nickname ASC', optionValue: 'id', }, visible: false, diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue index 8c60918a8..6bce6aa04 100644 --- a/src/pages/Entry/EntryFilter.vue +++ b/src/pages/Entry/EntryFilter.vue @@ -248,7 +248,7 @@ const entryFilterPanel = ref(); en: params: - isExcludedFromAvailable: Inventory + isExcludedFromAvailable: Is excluded isOrdered: Ordered isReceived: Received isConfirmed: Confirmed diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index 888dd205c..41f78617c 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -19,6 +19,7 @@ const { t } = useI18n(); const quasar = useQuasar(); const state = useState(); const user = state.getUser(); +const footer = ref({ bought: 0, reserve: 0 }); const columns = computed(() => [ { align: 'left', @@ -38,16 +39,14 @@ const columns = computed(() => [ cardVisible: true, create: true, attrs: { - url: 'Workers/activeWithInheritedRole', - fields: ['id', 'name', 'nickname'], - where: { role: 'buyer' }, - optionFilter: 'firstName', + url: 'TicketRequests/getItemTypeWorker', + fields: ['id', 'nickname'], optionLabel: 'nickname', + sortBy: 'nickname ASC', optionValue: 'id', - useLike: false, }, columnFilter: false, - width: '70px', + width: '50px', }, { align: 'center', @@ -58,6 +57,7 @@ const columns = computed(() => [ component: 'number', summation: true, width: '50px', + format: ({ reserve }, dashIfEmpty) => dashIfEmpty(round(reserve)), }, { align: 'center', @@ -65,6 +65,7 @@ const columns = computed(() => [ name: 'bought', summation: true, cardVisible: true, + style: ({ reserve, bought }) => boughtStyle(bought, reserve), columnFilter: false, }, { @@ -95,7 +96,6 @@ const columns = computed(() => [ }, }, ], - dataCy: 'table-actions', }, ]); @@ -137,20 +137,20 @@ function openDialog() { } function setFooter(data) { - const footer = { - bought: 0, - reserve: 0, - }; + footer.value = { bought: 0, reserve: 0 }; data.forEach((row) => { - footer.bought += row?.bought; - footer.reserve += row?.reserve; + footer.value.bought += row?.bought; + footer.value.reserve += row?.reserve; }); - tableRef.value.footer = footer; } function round(value) { return Math.round(value * 100) / 100; } + +function boughtStyle(bought, reserve) { + return reserve < bought ? { color: 'var(--q-negative)' } : ''; +} - @@ -286,7 +276,7 @@ function round(value) { justify-content: center; } .column { - min-width: 40%; + min-width: 35%; margin-top: 5%; display: flex; flex-direction: column; diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue index 1a37994d9..4f002ecb9 100644 --- a/src/pages/Entry/EntryStockBoughtDetail.vue +++ b/src/pages/Entry/EntryStockBoughtDetail.vue @@ -14,7 +14,7 @@ const $props = defineProps({ required: true, }, dated: { - type: Date, + type: [Date, String], required: true, }, }); diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index d358601d3..18602f043 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -185,6 +185,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; data-key="InvoiceInSummary" :url="`InvoiceIns/${entityId}/summary`" @on-fetch="(data) => init(data)" + module-name="InvoiceIn" > diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue index 7d8890c2b..1fb8bc287 100644 --- a/src/pages/Item/Card/ItemLastEntries.vue +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -11,7 +11,6 @@ import { toCurrency } from 'filters/index'; import { useArrayData } from 'composables/useArrayData'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue'; - const { t } = useI18n(); const route = useRoute(); const from = ref(); @@ -41,7 +40,7 @@ const itemLastEntries = ref([]); const columns = computed(() => [ { - label: 'Nv', + label: 'NV', name: 'ig', align: 'center', }, @@ -70,6 +69,7 @@ const columns = computed(() => [ field: 'reference', align: 'center', format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3), + style: (row) => highlightedRow(row), }, { label: t('lastEntries.printedStickers'), @@ -84,6 +84,7 @@ const columns = computed(() => [ field: 'stickers', align: 'center', format: (val) => dashIfEmpty(val), + style: (row) => highlightedRow(row), }, { label: 'Packing', @@ -102,12 +103,14 @@ const columns = computed(() => [ name: 'stems', field: 'stems', align: 'center', + style: (row) => highlightedRow(row), }, { label: t('lastEntries.quantity'), name: 'quantity', field: 'quantity', align: 'center', + style: (row) => highlightedRow(row), }, { label: t('lastEntries.cost'), @@ -120,12 +123,14 @@ const columns = computed(() => [ name: 'weight', field: 'weight', align: 'center', + style: (row) => highlightedRow(row), }, { label: t('lastEntries.cube'), name: 'cube', field: 'packagingFk', align: 'center', + style: (row) => highlightedRow(row), }, { label: t('lastEntries.supplier'), @@ -208,6 +213,14 @@ onMounted(async () => { function getBadgeClass(groupingMode, expectedGrouping) { return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge'; } + +function highlightedRow(row) { + return row?.isInventorySupplier + ? { + 'background-color': 'var(--vn-section-hover-color)', + } + : ''; +}