From defd26fe914cccc519c180731b8dd26786a984dd Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 26 Jun 2024 12:25:01 +0000 Subject: [PATCH 1/7] feat: define Sticky Button --- src/components/VnTable/VnTable.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 493f1480e..cb691de69 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -66,6 +66,7 @@ const route = useRoute(); const router = useRouter(); const quasar = useQuasar(); +const filterPanel = ref(null); const DEFAULT_MODE = 'card'; const TABLE_MODE = 'table'; const mode = ref(DEFAULT_MODE); @@ -191,7 +192,16 @@ defineExpose({ show-if-above > + Date: Wed, 26 Jun 2024 12:26:05 +0000 Subject: [PATCH 2/7] feat: remove button from panel --- src/components/ui/VnFilterPanel.vue | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 3c1a4c8a5..f6241ffe8 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -55,6 +55,7 @@ const $props = defineProps({ }, }); +defineExpose({ search }); const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']); const arrayData = useArrayData($props.dataKey, { @@ -248,23 +249,6 @@ function formatValue(value) { - Date: Fri, 5 Jul 2024 09:41:12 +0200 Subject: [PATCH 3/7] perf: remove unnecessary import --- src/components/CrudModel.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index fa7761c5f..a55bde6f2 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue'; import VnConfirm from 'components/ui/VnConfirm.vue'; import SkeletonTable from 'components/ui/SkeletonTable.vue'; import { tMobile } from 'src/composables/tMobile'; -import VnSubToolbar from './ui/VnSubToolbar.vue'; const { push } = useRouter(); const quasar = useQuasar(); From 7201fd6d210126b45263aaeac47c08d956332112 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 5 Jul 2024 09:41:36 +0200 Subject: [PATCH 4/7] fix: remove warnings --- src/components/ui/VnImg.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue index 8d747963b..985c9cc53 100644 --- a/src/components/ui/VnImg.vue +++ b/src/components/ui/VnImg.vue @@ -28,7 +28,7 @@ const $props = defineProps({ const show = ref(false); const token = useSession().getTokenMultimedia(); const timeStamp = ref(`timestamp=${Date.now()}`); -import noImage from '/public/no-user.png'; +import noImage from '/no-user.png'; import { useRole } from 'src/composables/useRole'; const url = computed(() => { const isEmployee = useRole().isEmployee(); From 60481861eecd642ef6b1301424ea65449df32356 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 5 Jul 2024 09:46:18 +0200 Subject: [PATCH 5/7] test: fix myentry.spec.js --- .../cypress/integration/entry/myEntry.spec.js | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js index fc80c93f8..bd0e55c37 100644 --- a/test/cypress/integration/entry/myEntry.spec.js +++ b/test/cypress/integration/entry/myEntry.spec.js @@ -1,20 +1,20 @@ -// describe('WagonTypeCreate', () => { -// beforeEach(() => { -// cy.viewport(1920, 1080); -// cy.login('customer'); -// cy.visit(`/#/entry/my`, { -// onBeforeLoad(win) { -// cy.stub(win, 'open'); -// }, -// }); -// cy.waitForElement('.q-page', 6000); -// }); +describe('My entry when is supplier', () => { + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('supplier'); + cy.visit(`/#/entry/my`, { + onBeforeLoad(win) { + cy.stub(win, 'open'); + }, + }); + cy.waitForElement('.q-page', 6000); + }); -// it('should create edit and remove new dms', () => { -// cy.get( -// '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' -// ).click(); -// cy.get('.q-card__actions > .q-btn').click(); -// cy.window().its('open').should('be.called'); -// }); -// }); + it('should open buyLabel when is supplier', () => { + cy.get( + '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' + ).click(); + cy.get('.q-card__actions > .q-btn').click(); + cy.window().its('open').should('be.called'); + }); +}); From da3a60174134844e38f95216cb3fd8d5def74e61 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 5 Jul 2024 10:02:07 +0200 Subject: [PATCH 6/7] feat: move Qbtn --- src/components/VnTable/VnTable.vue | 8 -------- src/components/ui/VnFilterPanel.vue | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 13b12a05b..f4018cba5 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -205,14 +205,6 @@ defineExpose({ show-if-above > -