Compare commits

...

624 Commits

Author SHA1 Message Date
Alex Moreno 8b61d1a4c7 Merge pull request 'feat(ExtraCommunity): refs #8105 add data-cy attribute for testing and create integration tests' (!1786) from 8105-travels_bySupplier into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1786
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-05-09 08:01:24 +00:00
Alex Moreno 8f3621efc6 Merge branch 'dev' into 8105-travels_bySupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-09 08:00:05 +00:00
Jon Elias 50f1b5b326 Merge pull request 'fix: fixed label and increased test coverage' (!1777) from Fix-VnBankDetail into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1777
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-05-09 07:59:48 +00:00
Jon Elias 7cacdbdf94 Merge branch 'dev' into Fix-VnBankDetail
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-09 07:54:25 +00:00
Alex Moreno 7afd6b3dcd Merge branch 'dev' into 8105-travels_bySupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-09 06:39:10 +00:00
Alex Moreno 51402f9f3f test: enable OrderCatalog tests by removing skip
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-09 08:09:52 +02:00
Alex Moreno a4c4d987c7 Merge pull request 'test: refs #8862 add Cypress isolation tests for various ticket and zone components' (!1698) from 8862-testIsolationFalse into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1698
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-05-09 06:05:14 +00:00
Alex Moreno b1bde7be97 fix: refs #8862 skip OrderCatalog tests to prevent isolation issues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-09 07:18:01 +02:00
Alex Moreno 5c927cec4b Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-05-09 05:08:19 +00:00
Pau Rovira ab0d2e60b7 Merge pull request 'feat: #8406 upgraded CrudModel' (!1627) from 8406-crudModelUpdate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1627
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-05-08 14:44:15 +00:00
Pau Rovira 0502abfca5 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-08 14:17:54 +00:00
Alex Moreno b1ef9b1bd3 Merge pull request 'feat: refs #7248 modify VnNotes' (!1336) from 7248-tablesObservation into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1336
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-05-08 13:04:24 +00:00
Benjamin Esteve 68d1f3cb18 Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-08 12:58:01 +00:00
Alex Moreno debae747db Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-08 10:53:36 +00:00
Alex Moreno 671f0c1e67 Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-08 10:21:53 +00:00
Javier Segarra cbb36d0ec7 fix: minor bug related with vnTable selectAll
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-08 10:28:03 +02:00
Alex Moreno beeeedbb84 feat(ExtraCommunity): refs #8105 add data-cy attribute for testing and create integration tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-08 10:21:32 +02:00
Benjamin Esteve 34fc2d403d Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-08 07:07:24 +00:00
Alex Moreno fca1c77791 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-08 08:26:20 +02:00
Alex Moreno 5bb452186e fix: refs #7248 update user filter property name in VehicleNotes component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 15:04:02 +02:00
Benjamin Esteve 148e49b153 Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-05-07 11:32:03 +00:00
Alex Moreno 7dd6cc71e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation 2025-05-07 13:29:54 +02:00
Alex Moreno d611a7387c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-07 13:06:35 +02:00
Benjamin Esteve cfe64d644e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 11:35:54 +02:00
Alex Moreno 9d643a5a32 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-07 10:54:35 +02:00
Benjamin Esteve 91c627324a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 10:23:56 +02:00
Alex Moreno 8ae5d8b238 Merge pull request 'chore: run eslint fix and prettier write' (!1782) from run_eslint_and_prettier into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1782
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-05-07 08:22:01 +00:00
Benjamin Esteve 5cad6103a5 feat: refs #8862 enable test isolation for multiple spec files
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 10:13:03 +02:00
Alex Moreno d5fc3423d6 Merge branch '7248-tablesObservation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 09:56:04 +02:00
Alex Moreno e064f9e706 fix: refs #7248 rename workerFk to userFk in CustomerDefaulter component 2025-05-07 09:55:48 +02:00
Alex Moreno cb47858f65 Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-05-07 07:49:56 +00:00
Alex Moreno 686edc0b51 Revert "fix: refs #7248 update exprBuilder for workerFk and calculate total amount in CustomerBalanceDueTotal"
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
This reverts commit 5f9d498700.
2025-05-07 09:49:17 +02:00
Alex Moreno b3c2df5940 test: skip VnShortcuts test suite and ensure spinner waits in beforeEach
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-07 09:40:34 +02:00
Alex Moreno de89eb437f chore: run eslint fix and prettier write
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 07:51:55 +02:00
Alex Moreno 876f40b4a3 Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-07 05:36:55 +00:00
Alex Moreno f8b1966c2a Merge pull request 'feat: refs #8767 enable download and corrective invoice tests' (!1778) from 8767-invoiceInDescriptor_e2e into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1778
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-05-06 12:33:58 +00:00
Benjamin Esteve 53cea184cc Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-06 10:40:01 +00:00
Alex Moreno 00010c1db3 feat: refs #8767 enable download and corrective invoice tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-06 11:56:42 +02:00
Jon Elias 7f7c86def2 Merge branch 'dev' into Fix-VnBankDetail
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-06 09:34:21 +00:00
Jon Elias 5e17117db3 fix: fixed label and increased test coverage
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-06 11:24:45 +02:00
Alex Moreno 00b7d7e4b7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-06 11:09:29 +02:00
Alex Moreno 494369c8f7 Merge branch 'dev' of https: refs #8862//gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-06 09:38:43 +02:00
Pau Rovira f0309a7b74 Merge pull request 'feat: #7449 added new button on claimLines, prevented claimAction to import lines with 0 quantity' (!1550) from 7449-claimBeginningQuantity into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1550
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-05-06 05:11:02 +00:00
Pau Rovira 6a85fb3a26 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-05 12:44:45 +00:00
Alex Moreno 23669e118f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-05-05 14:44:32 +02:00
Pau Rovira e54dbc3514 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-05 12:43:56 +00:00
Javier Segarra 0b4b0295fa Merge pull request 'perf_vnCheckboxMenu' (!1769) from perf_vnCheckboxMenu into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1769
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-05-05 12:09:39 +00:00
Javier Segarra e19b93b506 Merge branch 'dev' into perf_vnCheckboxMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-05 10:58:24 +00:00
Jon Elias 9759e79ea0 Merge pull request '#8050: Created WorkerManagement section' (!1681) from 8050-AddWorkerManagement into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1681
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-05-05 07:54:36 +00:00
Jon Elias 35b31adff6 Merge branch 'dev' into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-05 07:41:12 +00:00
Pau Rovira 6767e11b1d Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-05 07:10:59 +00:00
Pau Rovira b213ffca3e Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-05 05:54:10 +00:00
Javier Segarra 525942fc24 test: enable 'filters by custom value dialog' test case
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-05-02 18:02:35 +02:00
Javier Segarra 88b44614f8 test: skip OrderCatalog and add viewPort for TicketList 2025-05-02 17:53:08 +02:00
Javier Segarra 0ace433223 test: change warehouse value
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-02 12:08:33 +02:00
Javier Segarra c25459087c perf: remove variables
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-02 11:18:20 +02:00
Javier Segarra 4e45845cff fix: bug 2025-05-02 11:09:33 +02:00
Javier Segarra 1182004029 perf: reset value when onFetch
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-05-02 09:16:51 +02:00
Javier Segarra 87b5727e79 fix: simplify dependencies 2025-05-02 09:16:23 +02:00
Javier Segarra 41680c574f Merge pull request '#7347 - Supplier Consumption layout updates' (!1451) from 7347_supplierConsumption into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1451
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-30 17:33:31 +00:00
Javier Segarra 303a1c3be9 refactor: refs #7347 update checkbox and icon implementation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-30 17:26:52 +02:00
Javier Segarra 0e561c3d41 Merge branch 'dev' of https: refs #7347//gitea.verdnatura.es/verdnatura/salix-front into 7347_supplierConsumption
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-30 17:16:53 +02:00
Javier Segarra f6d23fc8bf refactor: refs #7347 reorganize imports, clean up and header style 2025-04-30 17:15:57 +02:00
Alex Moreno 334d39eeef Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-30 12:21:21 +00:00
Alex Moreno 5f9d498700 fix: refs #7248 update exprBuilder for workerFk and calculate total amount in CustomerBalanceDueTotal
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-30 10:53:04 +02:00
Javier Segarra bfb5c021bd fix: reset error message when onClick
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-30 10:52:23 +02:00
Alex Moreno fc35312d31 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-30 10:01:45 +02:00
Alex Moreno 98c73f8462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation 2025-04-30 09:38:45 +02:00
Alex Moreno 07774817b4 Merge pull request 'warmFix_arrayData_setOptions' (!1762) from warmFix_arrayData_setOptions into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1762
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-30 06:07:49 +00:00
Alex Moreno 08bac8aa89 Merge branch 'dev' into warmFix_arrayData_setOptions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-30 05:22:30 +00:00
Javier Segarra 253b30822c Merge branch 'dev' into 7347_supplierConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-29 17:38:12 +00:00
Javier Segarra 6bffb4614a Merge pull request '#8949 - Perf: VnCheckboxMenu' (!1749) from fix_vnMultiCheck into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1749
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-29 16:52:35 +00:00
Javier Segarra acc80aa036 Merge pull request 'fix: use popup evt to handle loading' (!1738) from fix_vnselect_scroll into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1738
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-29 13:31:36 +00:00
Javier Segarra 7e81508065 feat: emit update:selected event on header selection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-29 15:30:06 +02:00
Javier Segarra 561bc557c5 fix: refs #7347 minor bug
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 15:14:29 +02:00
Javier Segarra 7cf10d391c Merge branch 'dev' into fix_vnselect_scroll
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-29 12:22:54 +00:00
Javier Segarra 9611ea47cf feat: refs #7347 updates
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 13:13:21 +02:00
Javier Segarra 9533b26040 Merge branch 'dev' into fix_vnMultiCheck
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 10:46:08 +00:00
Alex Moreno b9f421c208 Merge branch 'dev' into warmFix_arrayData_setOptions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-29 09:03:44 +00:00
Alex Moreno 2dfdfc2987 test: skip e2e invoiceOutList
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-29 11:03:18 +02:00
Alex Moreno 6d53e304ab Merge branch 'dev' into warmFix_arrayData_setOptions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 08:31:15 +00:00
Alex Moreno c334c58691 fix: revert
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-04-29 10:27:37 +02:00
Pau Rovira 0efa72e4a8 Merge branch '8406-crudModelUpdate' of https://gitea.verdnatura.es/verdnatura/salix-front into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-29 10:25:00 +02:00
Pau Rovira 81d50bb118 fix: refs #8406 removed duplicated filter 2025-04-29 10:24:58 +02:00
Alex Moreno 5759c2aeeb fix(useArrayData): ensure userOptions are applied correctly
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-29 10:20:09 +02:00
Javier Segarra 408bd274b4 Merge branch 'dev' of https: refs #7347//gitea.verdnatura.es/verdnatura/salix-front into 7347_supplierConsumption 2025-04-29 09:18:02 +02:00
Alex Moreno 160ff54a66 Merge branch 'dev' of https: refs #8862//gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-29 09:04:28 +02:00
Javier Segarra 75d0c57203 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnMultiCheck
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 09:02:54 +02:00
Javier Segarra 3c23b6b247 refactor: rename multi-check handlers for clarity and improve selection logic 2025-04-29 09:02:50 +02:00
Pau Rovira 8a2e301bb7 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-29 06:16:24 +00:00
Pau Rovira 004890a3a9 Merge branch '8406-crudModelUpdate' of https://gitea.verdnatura.es/verdnatura/salix-front into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-29 08:14:50 +02:00
Pau Rovira 7424d7eb9a fix: refs #8406 remove unused code 2025-04-29 08:14:42 +02:00
Pau Rovira 7f8f0870cb Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-29 06:10:40 +00:00
Pau Rovira 3787631dc8 Merge branch '7449-claimBeginningQuantity' of https://gitea.verdnatura.es/verdnatura/salix-front into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-29 08:07:52 +02:00
Pau Rovira 64decbfdbc fix: refs #7449 translations 2025-04-29 08:07:49 +02:00
Javier Segarra 67cc6b4d6c Merge branch 'fix_vnselect_scroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnselect_scroll
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-28 13:24:34 +02:00
Javier Segarra 614bb73f94 Merge branch 'dev' into fix_vnselect_scroll 2025-04-28 13:24:12 +02:00
Alex Moreno 8e935daad4 Merge branch 'dev' into warmFix_arrayData_setOptions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-28 10:19:44 +00:00
Pablo Natek 9528048b5f Merge pull request 'fix(VnTable): replace click event with mousedown for editable rows' (!1753) from fixTextSelectionOnInputOnVntable into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1753
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-28 10:06:18 +00:00
Javier Segarra 34aa128246 refactor: replace VnMultiCheck with VnCheckboxMenu component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-28 11:54:47 +02:00
Javier Segarra 91a8b9dcff refactor: remove unused slot from VnCheckbox component 2025-04-28 11:54:29 +02:00
Alex Moreno 5e27f56796 fix(useArrayData): ensure options are set correctly on mount
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-28 11:28:13 +02:00
Pau Rovira 743ac89d27 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-28 07:42:57 +00:00
Javier Segarra 05f2f0e101 Merge branch 'dev' into fix_vnMultiCheck
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-28 07:30:51 +00:00
Pau Rovira 4cc46e5181 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-28 07:07:45 +00:00
Pablo Natek 70ceee988c fix(VnTable): replace click event with mousedown for editable rows
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-27 16:16:33 +02:00
Jon Elias 6273aea7ff Merge pull request '#8028: Modified arrayData to fix inject warning' (!1747) from 8028-WarningInject into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1747
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-25 11:33:46 +00:00
Pau Rovira bb59be3023 Merge branch 'dev' of https: refs #8406//gitea.verdnatura.es/verdnatura/salix-front into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-25 13:16:49 +02:00
Pau Rovira 971194c0f6 Merge branch 'dev' of https: refs #8406//gitea.verdnatura.es/verdnatura/salix-front into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-25 13:15:29 +02:00
Pau Rovira e10abbef92 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-25 10:40:20 +00:00
Javier Segarra 82a1d451ef fix: update campaign consumption message format to include record count
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-25 10:12:17 +02:00
Alex Moreno eb0b2ea477 Merge branch 'dev' into fix_vnselect_scroll 2025-04-25 08:03:05 +00:00
Jon Elias 397e378856 Merge branch 'dev' into 8028-WarningInject
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-25 07:48:13 +00:00
Javier Segarra aab22f750d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnMultiCheck
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-25 09:44:22 +02:00
Javier Segarra 28c59f16b9 fix: remove unused promise prop from CustomerNotificationsCampaignConsumption 2025-04-25 09:43:56 +02:00
Javier Segarra 2fb7947278 feat: add error handling and append slot to VnMultiCheck component 2025-04-25 09:43:43 +02:00
Alex Moreno f145351cf1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 09:39:26 +02:00
Jon Elias d71b928802 Merge branch 'dev' into 8028-WarningInject
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-25 06:47:09 +00:00
Alex Moreno bac21ac062 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 08:28:28 +02:00
Jon Elias d568fc3100 refactor: refs #8028 modified arrayData to fix inject warning
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 16:18:38 +02:00
Alex Moreno 16eecb324f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-24 15:08:30 +02:00
Alex Moreno 1ceb6b1aef refactor: refs #7248 remove unused state management and simplify body structure in ClaimNotes component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 12:51:23 +02:00
Alex Moreno 4f12a31b1a Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-24 10:38:13 +00:00
Jorge Penadés 5b4ff55a1d Merge pull request 'fix: refs #8936 change default value of preventSubmit to false' (!1743) from 8936-preventSubmit into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1743
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-24 09:27:08 +00:00
Jorge Penadés 43b23f62a5 fix: refs #8936 change default value of preventSubmit to false
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-24 10:20:06 +02:00
Alex Moreno 9c6ffc76cb Merge branch 'dev' of https: refs #7248//gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 09:39:08 +02:00
Alex Moreno 442f3dbd48 Merge branch 'dev' of https: refs #7248//gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-24 09:38:31 +02:00
Jon Elias 82736beef0 Merge pull request '#8254: New autofill component' (!1741) from 8254-CreateAutofillComponent into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1741
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-24 07:20:59 +00:00
Jon Elias 71fddf14c5 Merge branch 'dev' into 8254-CreateAutofillComponent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-24 07:06:40 +00:00
Alex Moreno 172b2d1574 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-24 08:45:27 +02:00
Jon Elias e96da2fa59 Merge branch 'dev' into 8254-CreateAutofillComponent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 06:39:32 +00:00
Jon Elias e824a53fa3 feat: refs #8254 new autofill component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 08:24:20 +02:00
Javier Segarra ebc2357685 perf: change limit
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 20:14:24 +02:00
Javier Segarra 2c8d3ac0e0 Merge pull request 'feat: add VnMultiCheck component for multi-selection functionality' (!1734) from vnTable_multi_check into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1734
2025-04-23 17:53:04 +00:00
Javier Segarra 0016ee8e12 Merge branch 'vnTable_multi_check' of https://gitea.verdnatura.es/verdnatura/salix-front into vnTable_multi_check
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 19:25:16 +02:00
Javier Segarra a0ceabb527 fix: revert test to allow removal of all items in ItemFixedPrice tests 2025-04-23 19:25:14 +02:00
Javier Segarra a3420a0a83 Merge branch 'dev' into vnTable_multi_check 2025-04-23 19:24:45 +02:00
Javier Segarra 2c9f756871 fix: update checkbox selector for editing and removing items in ItemFixedPrice tests 2025-04-23 19:24:13 +02:00
Javier Segarra 0c0d21e53e feat: add multi-check support to VnTable and VnMultiCheck components 2025-04-23 19:24:07 +02:00
Javier Segarra af8909177e Merge branch 'dev' into vnTable_multi_check
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-23 13:41:41 +00:00
Javier Segarra c8a9661d50 fix: enhance layout and styling for TicketNotes, TicketPackage components
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 15:09:26 +02:00
Javier Segarra 7ec9c44130 fix: remove v-bind 2025-04-23 15:09:09 +02:00
Pau Rovira 092a29d555 Merge branch '8406-crudModelUpdate' of https://gitea.verdnatura.es/verdnatura/salix-front into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-23 13:53:37 +02:00
Pau Rovira 8e08f65173 feat: refs #8406 add empty row on loading InvoiceInVat 2025-04-23 13:53:34 +02:00
Javier Segarra 2b5a0c7408 Merge branch 'dev' into fix_vnselect_scroll
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-23 11:13:28 +00:00
Javier Segarra ccf3157043 fix: use popup evt to handle loading
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-23 13:13:04 +02:00
Alex Moreno 508a82ee75 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 12:12:34 +02:00
Pau Rovira e4003c6116 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-23 10:09:52 +00:00
Pau Rovira aedcda4799 refactor: refs #8406 simplified code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 11:19:55 +02:00
Alex Moreno 02b5141c01 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 11:17:49 +02:00
Alex Moreno efa0be5bc5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 11:17:16 +02:00
Jose Antonio Tubau dad798abaf Merge pull request '#7638 - showAllCmrs' (!1642) from 7638-showAllCmrs into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1642
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-23 08:14:57 +00:00
Jose Antonio Tubau 74fc843406 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 08:00:54 +00:00
Benjamin Esteve adfd9eba6f Merge pull request 'feat: refs #8828 add warehouse filtering for tickets and travels' (!1678) from 8828-filterVnSelectWarehouses into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1678
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-23 07:19:41 +00:00
Benjamin Esteve 17211b5e4e Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 07:04:39 +00:00
Pau Rovira 10d8db6de3 feat: refs #8406 make tabulation to ignore selection checkbox
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 08:58:23 +02:00
Jon Elias 355d1c47a8 Merge branch 'dev' into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 06:10:37 +00:00
Pau Rovira d36be31927 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 05:20:47 +00:00
Javier Segarra f683d78e0e feat: enhance i18n support for campaign consumption and select all functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 18:02:54 +02:00
Javier Segarra 7bbabb9761 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into vnTable_multi_check 2025-04-22 17:51:19 +02:00
Javier Segarra b13bcea331 feat: add VnMultiCheck component for multi-selection functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 17:43:29 +02:00
Jorge Penadés 259a8f7df2 Merge pull request 'fix(VnFilter): refs #8277 update columnFilter event handling on component mount' (!1733) from 8277-fixSupplierFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1733
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-22 14:31:59 +00:00
Pau Rovira 5c6fc94dd6 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 11:43:13 +00:00
Benjamin Esteve 6b472341a1 fix: refs #8828 correct response index in ticket filter interception
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 13:40:30 +02:00
Jorge Penadés 177a9aab6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-fixSupplierFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 12:12:37 +02:00
Benjamin Esteve 83f6a05244 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 12:12:28 +02:00
Benjamin Esteve 21689eaaa2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-22 12:12:24 +02:00
Benjamin Esteve 5a8efa4322 Merge branch 'dev' into 8828-filterVnSelectWarehouses 2025-04-22 10:08:15 +00:00
Javier Segarra d482752be9 Merge pull request 'feat: #8443 created vehicle events' (!1379) from 8443-vehicleEvent into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1379
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-22 09:55:27 +00:00
Jorge Penadés 8e62102cc1 fix(VnFilter): refs #8277 update event handling for columnFilter in onBeforeMount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 11:49:13 +02:00
Jorge Penadés 96a517028a fix(EntryPreAccount): refs #8277 correct translation key for Canary Islands in i18n
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-22 11:38:29 +02:00
Jorge Penadés 53bbdf52cf fix(VnFilter): refs #8277 update columnFilter event handling on component mount
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 11:35:47 +02:00
Jon Elias c7a5a2241f perf: refs #8050 worker management card mode
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 10:03:31 +02:00
Benjamin Esteve 5eeae1143c refactor: refs #8828 update filter logic to use boolean
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-22 10:03:22 +02:00
Benjamin Esteve cb76d7e93b Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 09:53:29 +02:00
Benjamin Esteve 766aa24a89 Merge branch 'dev' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-22 09:53:26 +02:00
Jon Elias 7c33bb66c2 Merge branch 'dev' of https: refs #8050//gitea.verdnatura.es/verdnatura/salix-front into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 08:23:12 +02:00
Alex Moreno 87f4a21f97 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 06:02:35 +00:00
Pau Rovira d89d6c018a Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 05:55:58 +00:00
Jorge Penadés 508cf2f684 Merge pull request '#8277 createEntryControl' (!1370) from 8277-createEntryControl into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-17 16:45:29 +00:00
Jorge Penadés 23ceaf9c9b fix(itemTax): refs #8277 update tax type from 'General VAT' to 'IVA General' for accuracy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-17 18:10:46 +02:00
Jorge Penadés 200b1ab329 refactor(EntryPreAccount): refs #8277 rename accountType to fiscalCode and update related data fetching
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 16:27:00 +02:00
Jorge Penadés 412e04b1ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 15:53:06 +02:00
Alex Moreno 95bbe04e32 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 15:02:45 +02:00
Pau Rovira 35914be54a Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 11:31:28 +00:00
Pau Rovira f6759da796 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 10:52:34 +00:00
Pau Rovira 58057a8ac2 fix: refs #8443 fixed broken route
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-17 12:50:37 +02:00
Jorge Penadés 0009ed8fdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-04-17 12:26:26 +02:00
Alex Moreno d4a0939c28 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 11:00:00 +02:00
Alex Moreno 6265c44c67 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:51:42 +02:00
Jorge Penadés 7e04a794cb chore: refs #8277 rename received
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:49:35 +02:00
Alex Moreno 3815a9772e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:44:35 +02:00
Pau Rovira 0fa1b6ee9d Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 08:40:11 +00:00
Jorge Penadés 785f27fd77 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-17 10:34:05 +02:00
Alex Moreno 33c421e29f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:31:28 +02:00
Jorge Penadés 3d573fc871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:30:36 +02:00
Pau Rovira 6d5c5c1bb9 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 08:29:04 +00:00
Pau Rovira 297ef023e4 Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:20:36 +02:00
Alex Moreno f99271289d chore: remove console.log
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 08:51:04 +02:00
Alex Moreno 9b1eaf949a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 08:03:20 +02:00
Jorge Penadés 4c8681d124 refactor: refs #8277 update daysAgo logic to use dynamic maxDays and defaultDays from API response
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 18:30:04 +02:00
Jorge Penadés b5b69055bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 17:54:01 +02:00
Jose Antonio Tubau a2991281a7 Merge pull request 'refactor: refs #8413 vnInputDate component and improve date formatting logic' (!1700) from 8413-addDateYearAutofillVnInputDate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1700
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 15:03:39 +00:00
Jose Antonio Tubau 66da64eb78 Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 14:21:22 +00:00
Jose Antonio Tubau 210ff8427b Merge pull request '#8442 - createVehicleDms' (!1614) from 8422-createVehicleDms into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1614
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 14:20:23 +00:00
Jose Antonio Tubau 57a31e4f0b Merge branch '8413-addDateYearAutofillVnInputDate' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 16:16:16 +02:00
Jose Antonio Tubau fba386f8c4 refactor: refs #8413 remove redundant test for error color on invalid date input in VnInputDate component 2025-04-16 16:15:38 +02:00
Jorge Penadés 3ff9cdd8fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 15:45:09 +02:00
Jose Antonio Tubau 5f0eabd626 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 15:26:33 +02:00
Jose Antonio Tubau 7bc53b131a Merge branch 'dev' into 8422-createVehicleDms 2025-04-16 15:26:31 +02:00
Jose Antonio Tubau 5053dbe1eb Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:21:14 +00:00
Jose Antonio Tubau 0e66e3362f test: refs #8413 add validation for error color on invalid date input in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 15:20:45 +02:00
Pau Rovira d838d9b55a feat: refs #8406 "add" button on a bottom bar in CrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 14:58:18 +02:00
Jon Elias a6d2ee8ab2 Merge pull request '#8647 #8028 fix vitest warnings' (!1467) from 8647_fix_warnings into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1467
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-16 11:18:09 +00:00
Jose Antonio Tubau 290586e642 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 11:15:58 +00:00
Jose Antonio Tubau a3a6f1aa2b test: refs #8413 add data-cy attributes for form submit and stop buttons in InvoiceOutGlobalForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:14:52 +02:00
Jon Elias 124d7f01a5 perf: refs #8050 test e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 12:57:55 +02:00
Jon Elias 0aa8fd6775 Merge branch '8050-AddWorkerManagement' of https://gitea.verdnatura.es/verdnatura/salix-front into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 12:48:06 +02:00
Jon Elias cd1c1d2e99 test: refs #8050 perf test 2025-04-16 12:48:05 +02:00
Jose Antonio Tubau 917ef597bb refactor: refs #8413 update date input test cases to use dot separators for date formatting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 12:47:16 +02:00
Jon Elias 39228ed257 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:46:09 +00:00
Jon Elias fba4fbb759 Merge pull request '#7868: Added department.notificationEmail instead of user email' (!1717) from 7868-CustomerSample into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-16 10:43:23 +00:00
Jon Elias deb1fdca13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8050-AddWorkerManagement 2025-04-16 12:35:07 +02:00
Jon Elias ebabbce34c Merge branch 'dev' into 7868-CustomerSample
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:31:45 +00:00
Jon Elias 2ef4a8c5de fix: refs #8647 fixed inputDateTime modelValue warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 11:42:58 +02:00
Benjamin Esteve 03cced3ac6 Merge branch '8862-testIsolationFalse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 10:44:43 +02:00
Benjamin Esteve 1cf9d08a90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse 2025-04-16 10:44:39 +02:00
Jose Antonio Tubau eaab97072c feat: refs #8413 update input background color based on date validation in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 10:11:23 +02:00
Jon Elias 75780f1ad2 fix: refs #8647 warning in VnInputDateTime
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:50:24 +02:00
Jon Elias 1a954cae60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-16 09:49:23 +02:00
Jorge Penadés f02013bc17 Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 09:47:29 +02:00
Jon Elias 4add424471 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:43:13 +02:00
Jon Elias 4f1c49afb3 refactor: refs #8647 undo paginate changes 2025-04-16 09:43:11 +02:00
Pau Rovira 06f6095d75 fix: refs #7449 e2e tests fix
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:21:24 +02:00
Alex Moreno 787f76b401 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-16 09:20:14 +02:00
Benjamin Esteve 803e62342a Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 06:43:47 +00:00
Pau Rovira 6b509ac669 Merge branch 'dev' of https: refs #7449//gitea.verdnatura.es/verdnatura/salix-front into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 08:09:22 +02:00
Pau Rovira d510c49670 feat: refs #7449 added padding to claimLines fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 08:08:09 +02:00
Javier Segarra 55a0a53915 Merge pull request '#8582 - test: e2e monitorTicket' (!1391) from e2e_monitor into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1391
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 21:04:47 +00:00
Jorge Penadés d51b03a941 fix: refs #8277 update preAccount function to handle agricultural entries and adjust notification checks
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 18:50:13 +02:00
Jorge Penadés 00063ae20a fix: refs #8277 update entry account options to use 'code' for value and sorting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 16:27:25 +02:00
Jon Elias 7c7e492b6c feat: refs #7868 added department.notificationEmail instead of user email
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 16:25:05 +02:00
Jose Antonio Tubau b625258856 fix: refs #8413 ensure date input submits correctly in tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 16:05:03 +02:00
Jon Elias a4a9da9885 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 13:42:21 +00:00
Jorge Penadés 494948cb20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 14:43:30 +02:00
Jon Elias 65a3582e79 test: refs #8647 skip failling e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 14:38:39 +02:00
Pau Rovira d8ba342d7c Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 14:36:42 +02:00
Alex Moreno 00ed2b2f6e Merge branch '8862-testIsolationFalse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 14:11:24 +02:00
Alex Moreno 1a27833081 test: refs #8862 disable test isolation for InvoiceOut list spec 2025-04-15 14:11:22 +02:00
Benjamin Esteve 690bfcb547 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 14:03:00 +02:00
Benjamin Esteve eb8ffc6e16 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-15 14:02:26 +02:00
Benjamin Esteve 48eb945b36 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:56:38 +00:00
Jose Antonio Tubau f9f9caa493 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-15 11:40:33 +00:00
Benjamin Esteve 8dd6926ab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 13:33:27 +02:00
Pau Rovira 1a3e717620 Merge pull request 'feat: #8655 added button for scrolling up' (!1523) from 8655-scrollUpButton into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1523
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 11:26:06 +00:00
Benjamin Esteve ca5576f0e1 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:06:26 +00:00
Benjamin Esteve 608086bd8d test: refs #8862 enable test isolation for Cmr list spec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 12:59:10 +02:00
Benjamin Esteve 395c3a8ec9 test: refs #8862 enable test isolation for multiple account and invoice specs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 12:29:49 +02:00
Benjamin Esteve 8d6a15eefd test: refs #8862 enable test isolation for InvoiceInDescriptor and VnLog specs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 12:12:16 +02:00
Pau Rovira 5b3ef29294 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 09:55:59 +00:00
Benjamin Esteve 2bfd2b09f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:37:17 +02:00
Benjamin Esteve b7cfabd1a2 test: refs #8862 add Cypress integration tests for ticket and zone functionalities
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-15 11:36:37 +02:00
Benjamin Esteve 19550188b8 test: refs #8862 enable test isolation for VnLocation tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:16:15 +02:00
Jon Elias 1b20b0de60 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:14:25 +02:00
Jon Elias 42b8e908fa test: refs #8647 skip intermitent failling e2e 2025-04-15 11:14:24 +02:00
Jon Elias 1ea8c0fc4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-15 11:13:26 +02:00
Guillermo Bonet 04e1f7a1b5 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:02:04 +02:00
Jose Antonio Tubau 005693550e Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 10:39:34 +02:00
Jose Antonio Tubau db06227b14 refactor: refs #8422 add document and import translations for DMS in global locales 2025-04-15 10:39:33 +02:00
Benjamin Esteve e32858374e Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 10:31:27 +02:00
Benjamin Esteve 1a35c6e60b Merge branch 'dev' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-15 10:31:25 +02:00
Jose Antonio Tubau 0e3247ceac Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 08:23:38 +00:00
Benjamin Esteve d477b6c477 test: refs #8862 enable test isolation for TicketSale tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 10:23:15 +02:00
Benjamin Esteve 4d9912e9b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 09:13:50 +02:00
Benjamin Esteve 97c63c2689 refactor: refs #8862 enable test isolation for Cmr list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 09:08:44 +02:00
Jon Elias dd74664eb6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 06:58:01 +00:00
Alex Moreno e03e6b2305 build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 08:30:03 +02:00
Jose Antonio Tubau 76c6bd3048 refactor: refs #8422 update document ID prompt for clarity in Spanish and English locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 08:22:31 +02:00
Jorge Penadés 070899b974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 17:08:08 +02:00
Jorge Penadés 3d1da8345c refactor: refs #8277 simplify QBadge usage in invoice creation component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 17:02:39 +02:00
Jorge Penadés a02174af7b refactor: refs #8277 update QBadge styling for company column in invoice creation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 15:07:10 +02:00
Jose Antonio Tubau 46c0e4bc74 test: refs #8422 skip download DMS test to prevent execution during current test run
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 13:43:52 +02:00
Pau Rovira 36d306e827 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-14 11:38:13 +00:00
Jose Antonio Tubau e52c6afe4c Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:15:11 +00:00
Javier Segarra d399afcd89 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 10:39:54 +00:00
Jose Antonio Tubau b26be0bf6d feat: refs #8422 add testDmsAction command to handle create and delete actions with improved logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:27:15 +02:00
Jose Antonio Tubau be877fa2b8 refactor: refs #8422 add testDmsAction command for streamlined DMS operations in Cypress tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:07:58 +02:00
Jorge Penadés e680cbc25d refactor: refs #8277 update invoice creation logic and adjust data filtering options
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:04:13 +02:00
Jon Elias 239e008aba Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:24:47 +02:00
Jon Elias 38bd00e82a test: refs #8647 fix skipped tests 2025-04-14 11:24:45 +02:00
Benjamin Esteve 907afc84e4 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:16:47 +00:00
Jon Elias db85936963 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 11:14:41 +02:00
Jon Elias 516e89d445 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:14:00 +00:00
Pau Rovira 2e8192ef7b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 09:13:39 +00:00
Javier Segarra b162dd7672 test: remove filter by column
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:09:21 +02:00
Jorge Penadés 09d88e25ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 10:47:45 +02:00
Jon Elias 57955ec2d5 fix: refs #8647 vndms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 10:33:13 +02:00
Javier Segarra d1440c1083 Merge branch 'dev' into e2e_monitor 2025-04-14 10:16:43 +02:00
Jon Elias 3782e7e8d7 fix: refs #8647 skip tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:49:44 +02:00
Benjamin Esteve 220e2dccd6 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:07:00 +02:00
Benjamin Esteve 8ea4163f05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-14 09:06:39 +02:00
Benjamin Esteve 7a05b8e768 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 06:51:27 +00:00
Jon Elias 797ce5922d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 08:04:31 +02:00
Pau Rovira 3bcafc5734 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-14 07:19:15 +02:00
Jorge Penadés fb638542bb refactor: refs #8277 remove redundant axios import from helper in EntryPreAccount tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 17:17:01 +02:00
Jorge Penadés 648d60c81f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 16:30:22 +02:00
Jose Antonio Tubau b45c97e3c1 test: refs #8422 remove 'only' from download DMS test to ensure all tests run
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 14:01:05 +02:00
Jon Elias a547188498 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 13:44:44 +02:00
Jon Elias df39cd4eca perf: refs #8647 paginate 2025-04-11 13:44:43 +02:00
Jon Elias 88099a9f34 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-11 11:33:25 +00:00
Benjamin Esteve 3a8f6455d3 refactor: refs #8862 update timeout settings for Cypress tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:43:27 +02:00
Benjamin Esteve f3f1ec8039 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:38:25 +02:00
Jose Antonio Tubau ec906daf41 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:20:03 +02:00
Jose Antonio Tubau 800e5e18d4 test: refs #8422 update download DMS test to verify file download response 2025-04-11 12:20:01 +02:00
Benjamin Esteve 01744012bc Merge branch '8862-testIsolationFalse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:13:11 +02:00
Benjamin Esteve 0f17aa13ae refactor: refs #8862 update timeout settings for Cypress tests 2025-04-11 12:13:08 +02:00
Jose Antonio Tubau 2159ce0897 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:02:48 +00:00
Jon Elias 27691943d3 perf: refs #8647 warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:56:53 +02:00
Benjamin Esteve d5a2c880cc Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 09:53:28 +00:00
Jon Elias be3c48b9f1 refactor: refs #8647 solved inject warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 11:50:39 +02:00
Jose Antonio Tubau 4b5fb2453a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:20:47 +02:00
Benjamin Esteve 55e074754e Merge branch '8828-filterVnSelectWarehouses' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:14:47 +02:00
Benjamin Esteve b6b9e1d97d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-11 11:14:17 +02:00
Jorge Penadés 3fa1f2961d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 10:54:45 +02:00
Jose Antonio Tubau 6dddad95c9 fix: refs #8422 correct spelling of 'PopUp' in checkRedirectionFromPopup command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:43:49 +02:00
Jon Elias a4e4c882ee refactor: refs #8647 deleted many warnings and skipped only true failing e2e in local branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:17:11 +02:00
Benjamin Esteve b21720c79c Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 07:05:17 +00:00
Jose Antonio Tubau 9a0211787a refactor: refs #8422 implement checkRedirectionFromPopup command and refactor tests for improved readability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 09:01:47 +02:00
Jon Elias e4da145a5e refactor: refs #8647 skip front failing test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:53:43 +02:00
Jose Antonio Tubau e84107dcbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:26:15 +02:00
Jose Antonio Tubau 6dc9f3ca07 refactor: refs #8413 vnInputDate component and improve date formatting logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:15:03 +02:00
Jon Elias 2678ac5def feat: refs #8647 unskipp e2e to test which of them are really failling and fixed VnDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 08:01:46 +02:00
Jorge Penadés 85fa1543c1 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 18:10:45 +02:00
Jorge Penadés 7ee32158c7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-10 18:09:47 +02:00
Benjamin Esteve b22d693a44 test: refs #8862 add Cypress isolation tests for various ticket and zone components
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 12:57:09 +02:00
Jorge Penadés 9434cdf851 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-10 11:34:09 +02:00
Jorge Penadés a0e3aab4e0 feat(EntryPreAccount): refs #8277 add company color badge to invoice entry table
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-10 11:33:19 +02:00
Alex Moreno c0ce2af459 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 07:40:45 +00:00
Jon Elias aefb7b7dcb feat: refs #8647 vitest fail on warning
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-10 09:34:18 +02:00
Javier Segarra fd36bd7c7e Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 22:44:12 +02:00
Javier Segarra 80fb1eaf6a test: enhance monitor client actions and ticket tests with Cypress intercepts 2025-04-09 22:38:30 +02:00
Javier Segarra 5f2e2421a8 refactor: streamline visibility checks in monitor tests and update login role 2025-04-09 20:57:26 +02:00
Javier Segarra e7bb829bf5 test: perf clientAndActions 2025-04-09 20:35:47 +02:00
Jon Elias a74e1102ed test: refs #8647 deleted all warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 15:32:53 +02:00
Jon Elias d31c2d55eb test: refs #8647 fix warnings arraydata and vnselect
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 14:00:52 +02:00
Jon Elias da1321ee34 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 13:04:36 +02:00
Jon Elias 3350f9d6a7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-09 13:04:25 +02:00
Jorge Penadés be41253d1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-09 11:25:47 +02:00
Benjamin Esteve 0e0323a9e8 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 07:27:00 +00:00
Jorge Penadés 35b09c829e fix(EntryPreAccount): refs #8277 remove unused save-url property from table component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 18:00:37 +02:00
Javier Segarra e809e598f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-04-08 12:54:06 +02:00
Benjamin Esteve fddeece32f Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 09:08:46 +00:00
Jorge Penadés 87d4e02c9d fix(entryPreAccount): refs #8277 update test cases to use correct row ID for document inheritance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 11:01:37 +02:00
Jorge Penadés 4151423a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 10:42:52 +02:00
Benjamin Esteve 971d27d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 09:13:56 +02:00
Alex Moreno 358afed7a4 Merge branch 'dev' into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 06:58:54 +00:00
Jorge Penadés 966f52d3e3 chore: refs #8277 replace end-point name
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 17:15:52 +02:00
Jorge Penadés e8af2b6a74 test: refs #8277 add unit tests for EntryPreAccount component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 16:55:15 +02:00
Jorge Penadés e127c4cec9 fix: refs #8277 improve tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 16:18:30 +02:00
Javier Segarra 0440115d5a Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 15:35:49 +02:00
Alex Moreno ac969d18a6 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:14:48 +00:00
Benjamin Esteve 7d813ab549 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:12:13 +00:00
Alex Moreno 4eb2fe9cee Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 11:32:08 +00:00
Alex Moreno ee2cbb7ae5 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 11:23:45 +00:00
Jorge Penadés 5b80c22bae fix: refs #8277 update tooltip text and add data-cy attributes for Cypress tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:49:25 +02:00
Benjamin Esteve 25ad79639e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:22:27 +02:00
Jorge Penadés 5c2c78a894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:07:52 +02:00
Benjamin Esteve aa6cd82da3 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 11:56:00 +02:00
Benjamin Esteve e0e4a549c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-07 11:51:17 +02:00
Jose Antonio Tubau bdcd8cad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 11:21:58 +02:00
Benjamin Esteve b6f7dbd1eb Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:09:13 +00:00
Benjamin Esteve eaa896852c fix: refs #8828 update warehouse selection in ticket list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 10:15:37 +02:00
Jose Antonio Tubau 2715502aba fix: refs #8422 ensure checkbox state toggles correctly in route extended list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:25:16 +02:00
Benjamin Esteve 87a4e1d469 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:25:11 +02:00
Benjamin Esteve b2e022ed56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-07 09:25:00 +02:00
Javier Segarra 7c4c708342 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 05:52:06 +00:00
Jorge Penadés f79d7e0d9f refactor: refs #8277 rename entry control to pre-account in components and localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 17:14:42 +02:00
Pau Rovira 0a299b0fe5 feat: refs #8443 used data-cy for select in test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 15:04:57 +02:00
Jon Elias 71bcda8fe0 Merge branch 'dev' into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 11:24:17 +00:00
Javier Segarra 0a90c62369 test: changes requested
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 13:08:14 +02:00
Javier Segarra bcad2dea1b Merge branch 'dev' into e2e_monitor 2025-04-04 13:07:46 +02:00
Jorge Penadés cd7f9e15fc refactor: refs #8277 rename dmsType to dmsTypeFk in EntryPreAccount.vue
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-04 12:55:02 +02:00
Jose Antonio Tubau 6ddcf57b08 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 10:06:34 +00:00
Jorge Penadés a1f93a87b2 refactor: refs #8277 rename entry control to pre-account in localization and routing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-04 12:00:32 +02:00
Benjamin Esteve 9f9ae26d55 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 09:43:34 +00:00
Jon Elias 746a4ef3f8 Merge branch 'dev' into 8050-AddWorkerManagement
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 08:55:35 +00:00
Jon Elias ce576d4f7e feat: refs #8050 added WorkerManagement section and its e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 06:31:03 +02:00
Jorge Penadés ec19ecdc98 refactor: refs #8277 update account type labels and filter fields in EntryControl.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 18:09:26 +02:00
Jose Antonio Tubau a1e21d156b refactor: refs #8422 update RouteAutonomous tests to improve readability and maintainability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 15:06:50 +02:00
Jose Antonio Tubau 5e2a74125f Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 14:10:47 +02:00
Jose Antonio Tubau 7aeb75d4e1 refactor: refs #8422 simplify DMS creation test by using fillInForm utility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 13:02:15 +02:00
Benjamin Esteve 84dbf9691e feat: refs #8828 add warehouse filtering for tickets and travels
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 12:25:11 +02:00
Jorge Penadés 304dc7db49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 10:34:09 +02:00
Jose Antonio Tubau dab3a2ce09 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 10:28:47 +02:00
Jose Antonio Tubau 070def57bb refactor: refs #8422 update vehicle DMS tests and add download verification 2025-04-03 10:28:40 +02:00
Pau Rovira 5703798781 fix: refs #8406 fixed front test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 09:56:46 +02:00
Pau Rovira c075f39576 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-03 06:52:24 +00:00
Pau Rovira 87c1c16d26 feat: refs #8406 added new insertion with tabulation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-03 08:38:03 +02:00
Jose Antonio Tubau 5cc599a0e6 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 05:17:49 +00:00
Javier Segarra 7706d77f55 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 20:30:14 +00:00
Javier Segarra 2afa0765b9 refactor: remove unused fields from monitorTicket test cases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 19:18:48 +02:00
Jorge Penadés e65ad67bd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 16:26:03 +02:00
Javier Segarra 088c401723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 14:26:09 +02:00
Javier Segarra 19751ee3fb test: monitorTicket remove count rows and check checkbox 2025-04-02 14:26:05 +02:00
Jose Antonio Tubau 0d056d3ed6 fix: refs #8422 router/module/route.js
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 13:52:49 +02:00
Javier Segarra c2d56ee002 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 12:29:36 +02:00
Javier Segarra d29a27999a test: fix monitorTicket
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 12:29:08 +02:00
Jorge Penadés ce23d6f723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 09:31:58 +02:00
Javier Segarra 20ccdb133c refactor: add spinner wait to monitor ticket row count
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:38:45 +02:00
Javier Segarra 32fa5248d0 refactor: update monitor ticket tests to improve filtering logic and remove unused intercepts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:11:10 +02:00
Jorge Penadés 758ab77f6c refactor(EntryControl): refs #8277 add hasFile property to upload file data structure
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 18:04:15 +02:00
Jorge Penadés a92cbeb95d refactor(EntryControl): refs #8277 update dmsFk assignment to undefined for clarity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 17:44:49 +02:00
Javier Segarra da31d6db3b refactor: streamline filter panel tests with parameterized test cases
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 16:41:17 +02:00
Jorge Penadés 3120ca93e6 refactor(EntryControl): refs #8277 update file handling and improve dialog management
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 16:31:08 +02:00
Jose Antonio Tubau 5b0090adc9 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 15:18:12 +02:00
Javier Segarra f80a14370e Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-01 13:12:40 +00:00
Pau Rovira 49391140d8 Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 11:01:24 +02:00
Jorge Penadés dd908c49ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:28:33 +02:00
Jorge Penadés ec7a578bbc refactor(EntryControl): refs #8277 clean up supplierRef assignment and update comments
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:18:33 +02:00
Jose Antonio Tubau f6360e29af Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:57:54 +02:00
Jose Antonio Tubau f0ef9b42c9 refactor: refs #8422 removed error-related changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:56:02 +02:00
Javier Segarra 2f47bb10aa fix: update client actions test to expect zero table rows
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 01:19:11 +02:00
Javier Segarra 477ab36487 Merge branch 'dev' into e2e_monitor 2025-04-01 01:12:27 +02:00
Jorge Penadés 3545d8f5a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 16:45:05 +02:00
Pau Rovira 7d6b3e27b4 refactor: refs #8443 improved code
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-31 13:03:27 +02:00
Javier Segarra 789b0d22cc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 10:36:57 +00:00
Pau Rovira 70c8780782 fix: refs #8443 code and form view fixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:25:25 +02:00
Jorge Penadés 61a9676c32 feat: refs #8277 changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 12:14:16 +01:00
Jorge Penadés 1117d3d07a feat: refs #8277 add invoice confirmation dialog and total amount calculation in EntryControl 2025-03-28 09:49:44 +01:00
Jorge Penadés 232cb7b4f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-03-28 09:45:54 +01:00
Pau Rovira 6434a37598 feat: refs #8655 simplified code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 09:36:20 +01:00
Jose Antonio Tubau dbdccc4774 refactor: refs #8422 improve error handling and notifications in DMS components 2025-03-28 08:56:26 +01:00
Javier Segarra cf8923a2d4 refactor: streamline table interaction methods and update test cases 2025-03-28 02:20:51 +01:00
Javier Segarra 269427e08c Merge branch 'dev' into e2e_monitor 2025-03-28 01:32:52 +01:00
Jose Antonio Tubau 96ed69acd2 refactor: refs #8422 update document ID error messages and improve notifications in DMS forms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 15:10:31 +01:00
Jose Antonio Tubau f07ce9a0a1 chore: refs #8422 update localizations 2025-03-27 15:10:16 +01:00
Jorge Penadés 00e6c79013 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-27 14:49:45 +01:00
Jorge Penadés ec328935c0 feat: refs #8277 add isBooked parameter to EntryControl for enhanced filtering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 14:48:09 +01:00
Alex Moreno c9bea020fa Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 13:00:38 +00:00
Javier Segarra b1bd730fbf Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 10:02:32 +01:00
Javier Segarra 92fba2e0c4 test: comments requested 2025-03-27 10:02:29 +01:00
Javier Segarra 65a089e562 fix: correct spelling of clicDescriptorAction to clickDescriptorAction in tests 2025-03-27 10:02:13 +01:00
Jorge Penadés d69211acaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 16:13:49 +01:00
Jose Antonio Tubau ac19803fcd refactor: refs #7638 add cmrFk order
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 13:28:51 +01:00
Jose Antonio Tubau af612f9379 test: refs #7638 add route, agency, and carrier pop-up redirection tests in CmrList component 2025-03-26 13:28:18 +01:00
Jose Antonio Tubau f2e4fff69a refactor: refs #7638 add localization support for Cmr and Route components in English and Spanish
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 12:57:14 +01:00
Jose Antonio Tubau ee1fcf75fb refactor: refs #7638 enhance CmrList component with additional fields and improved formatting 2025-03-26 12:57:02 +01:00
Jorge Penadés d2d38c1d3e Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 10:44:58 +01:00
Jorge Penadés 8be9feb41f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-26 10:44:39 +01:00
Javier Segarra 38d16b56a9 feat: remove FetchData 2025-03-26 10:12:13 +01:00
Pau Rovira 4e0922e989 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:34:32 +00:00
Pau Rovira d12cd08e08 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 07:34:07 +00:00
Pau Rovira 47779437d3 feat: refs #8443 added EntityCalendar and EntityCalendarGrid
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 08:32:29 +01:00
Javier Segarra e42f4797b1 refactor: refs #8647 remove :data-cy in VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:00:07 +01:00
Javier Segarra 227dec72b3 Merge branch 'dev' into 8647_fix_warnings 2025-03-25 18:58:20 +01:00
Jorge Penadés 1badf92b1c feat: refs #8277 enhance pre-accounting process and integrate user warehouse data
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 17:28:13 +01:00
Jorge Penadés 998cde58a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 16:19:33 +01:00
Jorge Penadés a1840f14df feat: refs #8277 add confirmation dialog for pre-accounting entries and update localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 16:19:16 +01:00
Jorge Penadés 6fd7e6e875 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:40:54 +01:00
Jorge Penadés 06f721ae02 fix: refs #8277 validate supplier and company consistency in preAccount function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:35:50 +01:00
Jorge Penadés 26e6427277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 16:27:35 +01:00
Jorge Penadés 41c2c56013 chore: refs #8277 notes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 15:48:24 +01:00
Jorge Penadés 890667c8a6 fix: refs #8277 add 'fit' class to supplier select component in EntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 15:24:21 +01:00
Jorge Penadés 18abb3e331 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:39:02 +01:00
Pau Rovira ca2e507401 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:49:07 +00:00
Pau Rovira f4d347eef1 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 11:46:56 +01:00
Pau Rovira d2b414c883 fix: refs #8655 centered button for phone display 2025-03-24 11:46:54 +01:00
Javier Segarra 0404c00a05 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 11:15:36 +01:00
Javier Segarra 351f291086 test: remove timeout 2025-03-24 11:15:25 +01:00
Pau Rovira 5b42e97d83 Merge branch 'dev' into 8406-crudModelUpdate
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 10:07:01 +00:00
Pau Rovira e874375276 feat: refs #8406 upgraded CrudModel 2025-03-24 11:05:36 +01:00
Jose Antonio Tubau 1b86d34976 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 10:36:10 +01:00
Javier Segarra 303b9cb5a5 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:32:27 +01:00
Javier Segarra 48689374bc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 01:43:42 +01:00
Javier Segarra b26b8b6ddd test: enhance Monitor pages 2025-03-24 01:43:27 +01:00
Javier Segarra fd68071a2e feat: add custom Cypress commands for table row manipulation 2025-03-24 01:43:00 +01:00
Javier Segarra d8bea48b26 fix: restore viewport setting for API readiness in tests 2025-03-24 01:42:43 +01:00
Javier Segarra 4a5171aa6e fix: remove exclusive test flag from 'clear scopeDays' test 2025-03-24 00:18:29 +01:00
Javier Segarra d3d80149e0 Merge branch 'dev' into e2e_monitor 2025-03-24 00:11:11 +01:00
Pau Rovira 018084c7c4 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:33:05 +00:00
Pau Rovira 75a99caf51 feat: refs #8443 changed VehicleEvents to use native loopback for events fetch 2025-03-21 12:32:01 +01:00
Jorge Penadés dbb8d2a115 feat: refs #8277 add pre-account functionality and update daysAgo handling in EntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 12:25:14 +01:00
Pau Rovira 7d5f51349a Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:06:09 +00:00
Jorge Penadés b528bb4ed1 fix: refs #8277 update daysAgo handling to use watch for reactive updates and set max limit to 365
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:15:15 +01:00
Jorge Penadés 456eb0a8e4 fix: refs #8277 update daysAgo limit to 365 days in localization files
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 09:04:39 +01:00
Jorge Penadés 0315b1c8fc Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 08:51:50 +01:00
Jorge Penadés 9b3fc52377 feat: refs #8277 add agricultural and account type fields, enhance filtering options, and update localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 18:05:17 +01:00
Pau Rovira 2ac3b280af Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 12:37:05 +00:00
Jose Antonio Tubau cb99c50f33 fix: refs #8422 vehicleDms tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-20 13:34:14 +01:00
Jose Antonio Tubau de9f1bca9a Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 09:25:20 +01:00
Jorge Penadés ba38c42140 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 08:57:29 +01:00
Jorge Penadés 234269bdef feat: refs #8277 add entry type selection and localization to EntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 08:57:13 +01:00
Pau Rovira 70a15bff30 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 06:35:13 +00:00
Pau Rovira 8995d7d454 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-20 07:34:10 +01:00
Pau Rovira 8a8ce72c4c feat: refs #8655 added hover to scroll button 2025-03-20 07:34:06 +01:00
Jose Antonio Tubau 5d356428d3 refactor: refs #8422 enhance error handling in save function and update selectors in tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 15:54:47 +01:00
Jorge Penadés e00fae2412 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-03-18 14:26:37 +01:00
Jose Antonio Tubau 22d912ba76 Merge branch 'dev' into 8422-createVehicleDms 2025-03-18 14:24:26 +01:00
Pau Rovira 90b534ccdc Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 10:34:43 +00:00
Pau Rovira da8366d05b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 06:58:28 +00:00
Javier Segarra 6bee0ead8c fix: refs #8647 allow searchUrl prop to accept both String and Boolean types
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 14:39:48 +01:00
Javier Segarra 74c1e53c89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-16 13:58:40 +01:00
Javier Segarra 57e80040fa test: check params from and to
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-16 12:36:22 +01:00
Javier Segarra e0def231b1 fix: remove deprecated filter
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 12:23:20 +01:00
Javier Segarra 23eff4937c feat: add data-cy 2025-03-16 12:22:55 +01:00
Javier Segarra cfccc74710 test: improve monitorTest 2025-03-16 12:19:26 +01:00
Javier Segarra 4c4d7c9dbe test: check url scopeDays para value 2025-03-16 11:08:18 +01:00
Javier Segarra ee4eafc639 test: validate scopeDays 2025-03-16 10:57:04 +01:00
Javier Segarra 8417411efc test: ctrl click 2025-03-16 10:44:04 +01:00
Javier Segarra 7510611c0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-16 10:16:00 +01:00
Jose Antonio Tubau 6c7ea26a41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:57:33 +01:00
Pau Rovira 55394c2a2e Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:37:23 +01:00
Pau Rovira bc69b33028 refactor: refs #8655 removed unused function 2025-03-14 13:37:20 +01:00
Pau Rovira 08b0eb3c74 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 12:07:24 +00:00
Pau Rovira 4db882cc03 feat: refs #8655 made VnTable to use VnScroll button
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:06:05 +01:00
Javier Segarra a6f7db154e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-14 12:34:59 +01:00
Javier Segarra fc61c13ec4 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 12:04:46 +00:00
Pau Rovira 20c531bc04 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:42:20 +00:00
Javier Segarra b4d21d5a52 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 22:55:59 +00:00
Jose Antonio Tubau ca6c0cff29 refactor: refs #8422 update form input handling to select all text before typing
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:32:45 +01:00
Jose Antonio Tubau 7ab2e28dc7 fix: refs #8422 update filter structure in VnDmsList component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:30:14 +01:00
Jose Antonio Tubau 21196fcc3b test: refs #8422 add temporary upload folder configuration 2025-03-12 08:30:02 +01:00
Jose Antonio Tubau f4b72c5d75 refactor: refs #8422 add notifications for data save and delete actions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 13:02:20 +01:00
Pau Rovira 429772ce88 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:34:22 +00:00
Pau Rovira 29adddcedf Merge branch '7449-claimBeginningQuantity' of https://gitea.verdnatura.es/verdnatura/salix-front into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 12:33:26 +01:00
Pau Rovira d4fe1e6a6d feat: refs #7449 added save button to claimNotes & added e2e tests 2025-03-11 12:33:23 +01:00
Javier Segarra 6778a309dd test: refs #8647 solve fail test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 10:52:02 +01:00
Javier Segarra 6dbaf841a4 test: refs #8647 try to solve the problem 2025-03-10 13:02:41 +01:00
Javier Segarra dcd4c327a0 fix: refs #8647 solve warning 2025-03-10 13:02:14 +01:00
Javier Segarra 04a3c48cd6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 12:34:34 +01:00
Javier Segarra 92a7f2c33c test: refs #8647 revert filter string
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:33:31 +01:00
Javier Segarra dcceee3c3a Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:30:26 +01:00
Javier Segarra aefffa4a42 test: refs #8647 revert saveFn string 2025-03-10 12:30:24 +01:00
Pau Rovira 48ebca9568 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 10:09:25 +00:00
Pau Rovira adb78c7433 fix: refs #8655 fixed e2e tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:44:58 +01:00
Pau Rovira ff4e0103e7 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 08:31:04 +00:00
Jorge Penadés 82d9d6016f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 09:27:00 +01:00
Pau Rovira 40aaca9791 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-07 08:21:14 +00:00
Pau Rovira a0860522f5 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 05:46:16 +00:00
Pau Rovira ddd9d61214 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 05:31:10 +00:00
Jose Antonio Tubau cc2e9f7890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 13:49:21 +01:00
Pau Rovira 95fb833927 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:06:52 +00:00
Jorge Penadés 13a904290c refactor: refs #8647 simplify filter handling logic in VnSelect component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:12:26 +01:00
Jorge Penadés 73b73cba62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 12:03:46 +01:00
Pau Rovira ed01b774a3 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 10:45:04 +00:00
Jorge Penadés 8edb9ec644 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:37:02 +01:00
Jorge Penadés de0ce51f10 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:18:26 +01:00
Jorge Penadés 7433c3c551 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 11:17:55 +01:00
Pau Rovira cee6e0d0b1 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:40:59 +00:00
Pau Rovira f33f09ca6f Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:00:58 +00:00
Pau Rovira 6e9e5c7564 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 12:21:33 +00:00
Pau Rovira 83b9b602a0 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 10:46:31 +00:00
Jose Antonio Tubau b259988f90 test: refs #8422 add test for vehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 11:14:20 +01:00
Jose Antonio Tubau c5284e54c7 refactor: refs #8422 enhance DMS import functionality and improve localization 2025-03-05 11:13:45 +01:00
Pau Rovira 2ecfbbdd19 Merge branch 'dev' into 7449-claimBeginningQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 06:50:40 +00:00
Pau Rovira d7ba8868a6 feat: refs #7449 added new button on claimLines, prevented claimAction to import lines with 0 quantity 2025-03-05 07:49:42 +01:00
Jose Antonio Tubau 3570556c47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 07:42:02 +01:00
Pau Rovira 1101db707e Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 06:02:52 +00:00
Pau Rovira 640d989090 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-04 09:28:27 +00:00
Pau Rovira a5f287d782 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-03 14:05:28 +00:00
Pau Rovira 9bf0b4c077 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 13:12:54 +01:00
Pau Rovira 8ffc3e8f2d feat: refs #8443 added notifications and translations
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 13:08:19 +01:00
Pau Rovira ecdd1a95df Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 09:45:54 +00:00
Pau Rovira 27866e7090 fix: refs #8655 fixed button problems & added translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:49:32 +01:00
Javier Segarra 97c673b5f3 test: check fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-01 03:13:11 +01:00
Javier Segarra e0ad4fc2f1 Merge branch 'dev' into e2e_monitor 2025-03-01 02:43:53 +01:00
Javier Segarra 0ee939d568 feat: refs #8647 updates
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 19:27:09 +01:00
Javier Segarra 539fc81ffa Merge branch 'dev' into 8647_fix_warnings 2025-02-28 19:04:30 +01:00
Pau Rovira 69452e2627 feat: refs #8655 added button for scrolling up
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:25:09 +01:00
Javier Segarra 2acbe53788 feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:59:06 +01:00
Javier Segarra f0b3ae3ada feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:58:17 +01:00
Javier Segarra ba31e98b8a fix: refs #8647 remove comment 2025-02-28 13:58:07 +01:00
Jorge Penadés ccf7e5dfad fix: refs #8647 remove unused townFilter from CreateNewPostcodeForm component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:07:27 +01:00
Jorge Penadés 2dab2866e7 fix: refs #8647 remove unused filterTowns fn
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 13:02:46 +01:00
Jorge Penadés 30afbd84d6 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 12:43:38 +01:00
Jorge Penadés 55d51ddf22 fix: refs #8647 add filter function prop to VnSelect component and refactor bank entity filter logic 2025-02-28 12:43:35 +01:00
Javier Segarra d23b22ca55 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:40:55 +01:00
Javier Segarra 9961f5cda0 test: refs #8647 fix warning 2025-02-28 10:40:52 +01:00
Jorge Penadés 561db9f7c8 fix: refs #8647 add default value for summary prop in WorkerDescriptor component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:26:39 +01:00
Javier Segarra 287c61f507 test: refs #8647 fix warning 2025-02-28 10:15:23 +01:00
Jorge Penadés abf2a5bb5d fix: refs #8647 set default value for id prop in InvoiceInDescriptorProxy component 2025-02-28 10:08:29 +01:00
Javier Segarra f64c2a2854 test: refs #8647 fix warning 2025-02-28 10:07:45 +01:00
Jorge Penadés c2d8c76512 fix: refs #8647 set default value for id prop in SupplierDescriptorProxy component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 10:07:32 +01:00
Jorge Penadés 4518ebdc35 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:57:09 +01:00
Jorge Penadés 1c44aceccf fix: refs #8647 set default value for model in VnDate component 2025-02-28 09:57:06 +01:00
Javier Segarra 092e6e427f Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:42:15 +01:00
Javier Segarra a6777cc183 test: refs #8647 fix warning 2025-02-28 09:42:11 +01:00
Jorge Penadés 942004d710 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 09:28:47 +01:00
Jorge Penadés 1edf57da7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-02-28 09:28:35 +01:00
Javier Segarra 29cd014ec8 test: refs #8647 fix warning 2025-02-28 09:26:57 +01:00
Javier Segarra 642e2c7d5c Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 20:41:38 +01:00
Javier Segarra b08778aed7 fix: refs #8647 warnings common 2025-02-27 20:41:32 +01:00
Javier Segarra dcc4f390c6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-test Build queued... Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 19:16:01 +00:00
Javier Segarra cf397a38ce fix: refs #8647 some swarning
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:16:43 +01:00
Pau Rovira 33c268ddb9 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 12:03:23 +00:00
Javier Segarra bc3334529b test: refs #8647 improve_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 21:54:35 +01:00
Javier Segarra cc2c5e7567 feat: refs #8647 hidde filter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 10:02:28 +01:00
Javier Segarra 6e279120ea Merge branch 'dev' into 8647_fix_warnings 2025-02-22 13:40:18 +01:00
Javier Segarra 2ae8dc4124 Merge branch '6321_improve_handleResults' into 8647_fix_warnings 2025-02-22 13:40:08 +01:00
Javier Segarra 07d86251cb test: refs #8647 mock keyShortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 13:50:04 +01:00
Javier Segarra d881730f27 feat: refs #8647 init 2025-02-21 13:49:39 +01:00
Pau Rovira ff24971df9 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 06:49:50 +00:00
Javier Segarra edfa2d68df fix: refs #7347 remove duplicated css class
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 09:51:58 +01:00
Javier Segarra f1a57ceba1 feat: refs #6321 init 2025-02-19 14:09:00 +01:00
Javier Segarra a7d271bafd test: add describe for each test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:53:39 +01:00
Javier Segarra 55841d795f test: init e2e_monitorTicket
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:41:06 +01:00
Jorge Penadés 7a84e406e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 13:16:25 +01:00
Pau Rovira 398f76c6e7 feat: refs #8443 added select in form for vehicle state
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 07:49:12 +01:00
Jorge Penadés 1facb04d7a feat: refs #8277 update EntryControl component with new column definitions and filters
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-12 18:24:41 +01:00
Jorge Penadés 0c8e13db8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 14:31:31 +01:00
Pau Rovira 30f42cbde7 Merge branch '8443-vehicleEvent' of https://gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 12:32:32 +01:00
Pau Rovira bb70969d60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent 2025-02-12 12:29:52 +01:00
Pau Rovira 80b0efac5a Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 11:29:34 +00:00
Pau Rovira a261de39b4 feat: refs #8443 created vehicle events
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 12:26:43 +01:00
Jorge Penadés 0c362d336b Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 09:54:50 +01:00
Jorge Penadés fa7705d2fc feat: refs #8277 add control labels and update column definitions in EntryControl component 2025-02-12 09:53:43 +01:00
Javier Segarra 91f317dfe6 style: refs #7347 updates
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 23:31:43 +01:00
Jorge Penadés b87e4f52cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-11 14:19:26 +01:00
Jose Antonio Tubau 8f0a4da245 feat: refs #8422 add Vehicle DMS import functionality and routing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 13:58:14 +01:00
Jorge Penadés c153352311 Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-11 09:36:00 +01:00
Jorge Penadés 7a1eb9bec6 feat: refs #8277 add Entry Control page and update localization files 2025-02-11 09:28:56 +01:00
Robert Ferrús be69781e17 Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 06:05:37 +00:00
Robert Ferrús 523cacbffe Merge branch 'dev' into 7248-tablesObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:35:23 +00:00
Robert Ferrús 9c8aaf65d1 feat: refs #7248 modify VnNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:32:01 +01:00
316 changed files with 9450 additions and 1838 deletions

View File

@ -26,7 +26,7 @@ if (branchName) {
const splitedMsg = msg.split(':'); const splitedMsg = msg.split(':');
if (splitedMsg.length > 1) { if (splitedMsg.length > 1) {
const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':'); const finalMsg = `${splitedMsg[0]}: ${referenceTag}${splitedMsg.slice(1).join(':')}`;
writeFileSync(msgPath, finalMsg); writeFileSync(msgPath, finalMsg);
} }
} }

View File

@ -1,6 +1,9 @@
import { defineConfig } from 'cypress'; import { defineConfig } from 'cypress';
let urlHost, reporter, reporterOptions, timeouts; let urlHost;
let reporter;
let reporterOptions;
let timeouts;
if (process.env.CI) { if (process.env.CI) {
urlHost = 'front'; urlHost = 'front';
@ -44,6 +47,7 @@ export default defineConfig({
supportFile: 'test/cypress/support/index.js', supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos', videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads', downloadsFolder: 'test/cypress/downloads',
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
video: false, video: false,
specPattern: 'test/cypress/integration/**/*.spec.js', specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true, experimentalRunAllSpecs: true,
@ -60,5 +64,6 @@ export default defineConfig({
...timeouts, ...timeouts,
includeShadowDom: true, includeShadowDom: true,
waitForAnimations: true, waitForAnimations: true,
testIsolation: false,
}, },
}); });

View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<title><%= productName %></title> <title><%= productName %></title>
@ -12,7 +12,12 @@
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
/> />
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" /> <link
rel="icon"
type="image/png"
sizes="128x128"
href="icons/favicon-128x128.png"
/>
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" /> <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" /> <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" /> <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />

View File

@ -1,6 +1,6 @@
{ {
"name": "salix-front", "name": "salix-front",
"version": "25.16.0", "version": "25.18.0",
"description": "Salix frontend", "description": "Salix frontend",
"productName": "Salix", "productName": "Salix",
"author": "Verdnatura", "author": "Verdnatura",

View File

@ -1,4 +1,3 @@
/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config // https://github.com/michael-ciniawsky/postcss-load-config
import autoprefixer from 'autoprefixer'; import autoprefixer from 'autoprefixer';

View File

@ -13,7 +13,7 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path'; import path from 'path';
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`; const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
export default configure(function (/* ctx */) { export default configure((/* ctx */) => {
return { return {
eslint: { eslint: {
// fix: true, // fix: true,

View File

@ -1,8 +1,6 @@
{ {
"@quasar/testing-unit-vitest": { "@quasar/testing-unit-vitest": {
"options": [ "options": ["scripts"]
"scripts"
]
}, },
"@quasar/qcalendar": {} "@quasar/qcalendar": {}
} }

View File

@ -2,6 +2,7 @@
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import { useQuasar, Dark } from 'quasar'; import { useQuasar, Dark } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnScroll from './components/common/VnScroll.vue';
const quasar = useQuasar(); const quasar = useQuasar();
const { availableLocales, locale, fallbackLocale } = useI18n(); const { availableLocales, locale, fallbackLocale } = useI18n();
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
<template> <template>
<RouterView /> <RouterView />
<VnScroll />
</template> </template>
<style lang="scss"> <style lang="scss">

View File

@ -67,7 +67,7 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); await expect(result).rejects.toEqual(expect.objectContaining(error));
}); });
it('should call to the Notify plugin with a message from the response property', async () => { it('should call to the Notify plugin with a message from the response property', async () => {
@ -83,7 +83,7 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); await expect(result).rejects.toEqual(expect.objectContaining(error));
}); });
}); });
}); });

View File

@ -11,8 +11,8 @@ export default function (component, key, value) {
}; };
break; break;
case 'undefined': case 'undefined':
throw new Error('unknown prop: ' + key); throw new Error(`unknown prop: ${key}`);
default: default:
throw new Error('unhandled type: ' + typeof prop); throw new Error(`unhandled type: ${typeof prop}`);
} }
} }

View File

@ -9,7 +9,7 @@ export default {
const keyBindingMap = routes const keyBindingMap = routes
.filter((route) => route.meta.keyBinding) .filter((route) => route.meta.keyBinding)
.reduce((map, route) => { .reduce((map, route) => {
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path; map[`Key${route.meta.keyBinding.toUpperCase()}`] = route.path;
return map; return map;
}, {}); }, {});

View File

@ -1,4 +1,3 @@
/* eslint-disable eslint/export */
export * from './defaults/qTable'; export * from './defaults/qTable';
export * from './defaults/qInput'; export * from './defaults/qInput';
export * from './defaults/qSelect'; export * from './defaults/qSelect';

View File

@ -24,12 +24,9 @@ export default boot(({ app }) => {
switch (response?.status) { switch (response?.status) {
case 422: case 422:
if (error.name == 'ValidationError') if (error.name == 'ValidationError')
message += message += ` "${responseError.details.context}.${Object.keys(
' "' + responseError.details.codes,
responseError.details.context + ).join(',')}"`;
'.' +
Object.keys(responseError.details.codes).join(',') +
'"';
break; break;
case 500: case 500:
message = 'errors.statusInternalServerError'; message = 'errors.statusInternalServerError';

View File

@ -20,7 +20,6 @@ const postcodeFormData = reactive({
provinceFk: null, provinceFk: null,
townFk: null, townFk: null,
}); });
const townFilter = ref({});
const countriesRef = ref(false); const countriesRef = ref(false);
const provincesOptions = ref([]); const provincesOptions = ref([]);
@ -33,11 +32,11 @@ function onDataSaved(formData) {
newPostcode.town = town.value.name; newPostcode.town = town.value.name;
newPostcode.townFk = town.value.id; newPostcode.townFk = town.value.id;
const provinceObject = provincesOptions.value.find( const provinceObject = provincesOptions.value.find(
({ id }) => id === formData.provinceFk ({ id }) => id === formData.provinceFk,
); );
newPostcode.province = provinceObject?.name; newPostcode.province = provinceObject?.name;
const countryObject = countriesRef.value.opts.find( const countryObject = countriesRef.value.opts.find(
({ id }) => id === formData.countryFk ({ id }) => id === formData.countryFk,
); );
newPostcode.country = countryObject?.name; newPostcode.country = countryObject?.name;
emit('onDataSaved', newPostcode); emit('onDataSaved', newPostcode);
@ -67,21 +66,11 @@ function setTown(newTown, data) {
} }
async function onCityCreated(newTown, formData) { async function onCityCreated(newTown, formData) {
newTown.province = provincesOptions.value.find( newTown.province = provincesOptions.value.find(
(province) => province.id === newTown.provinceFk (province) => province.id === newTown.provinceFk,
); );
formData.townFk = newTown; formData.townFk = newTown;
setTown(newTown, formData); setTown(newTown, formData);
} }
async function filterTowns(name) {
if (name !== '') {
townFilter.value.where = {
name: {
like: `%${name}%`,
},
};
}
}
</script> </script>
<template> <template>
@ -107,7 +96,6 @@ async function filterTowns(name) {
<VnSelectDialog <VnSelectDialog
:label="t('City')" :label="t('City')"
@update:model-value="(value) => setTown(value, data)" @update:model-value="(value) => setTown(value, data)"
@filter="filterTowns"
:tooltip="t('Create city')" :tooltip="t('Create city')"
v-model="data.townFk" v-model="data.townFk"
url="Towns/location" url="Towns/location"

View File

@ -25,7 +25,7 @@ const autonomiesRef = ref([]);
const onDataSaved = (dataSaved, requestResponse) => { const onDataSaved = (dataSaved, requestResponse) => {
requestResponse.autonomy = autonomiesRef.value.opts.find( requestResponse.autonomy = autonomiesRef.value.opts.find(
(autonomy) => autonomy.id == requestResponse.autonomyFk (autonomy) => autonomy.id == requestResponse.autonomyFk,
); );
emit('onDataSaved', dataSaved, requestResponse); emit('onDataSaved', dataSaved, requestResponse);
}; };

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { computed, ref, useAttrs, watch } from 'vue'; import { computed, ref, useAttrs, watch, nextTick } from 'vue';
import { useRouter, onBeforeRouteLeave } from 'vue-router'; import { useRouter, onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
@ -42,7 +42,15 @@ const $props = defineProps({
}, },
dataRequired: { dataRequired: {
type: Object, type: Object,
default: () => {}, default: () => ({}),
},
dataDefault: {
type: Object,
default: () => ({}),
},
insertOnLoad: {
type: Boolean,
default: false,
}, },
defaultSave: { defaultSave: {
type: Boolean, type: Boolean,
@ -65,7 +73,7 @@ const $props = defineProps({
default: null, default: null,
}, },
beforeSaveFn: { beforeSaveFn: {
type: Function, type: [String, Function],
default: null, default: null,
}, },
goTo: { goTo: {
@ -87,6 +95,7 @@ const formData = ref();
const saveButtonRef = ref(null); const saveButtonRef = ref(null);
const watchChanges = ref(); const watchChanges = ref();
const formUrl = computed(() => $props.url); const formUrl = computed(() => $props.url);
const rowsContainer = ref(null);
const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']); const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@ -122,9 +131,11 @@ async function fetch(data) {
const rows = keyData ? data[keyData] : data; const rows = keyData ? data[keyData] : data;
resetData(rows); resetData(rows);
emit('onFetch', rows); emit('onFetch', rows);
$props.insertOnLoad && await insert();
return rows; return rows;
} }
function resetData(data) { function resetData(data) {
if (!data) return; if (!data) return;
if (data && Array.isArray(data)) { if (data && Array.isArray(data)) {
@ -135,9 +146,16 @@ function resetData(data) {
formData.value = JSON.parse(JSON.stringify(data)); formData.value = JSON.parse(JSON.stringify(data));
if (watchChanges.value) watchChanges.value(); //destroy watcher if (watchChanges.value) watchChanges.value(); //destroy watcher
watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true }); watchChanges.value = watch(formData, (nVal) => {
} hasChanges.value = false;
const filteredNewData = nVal.filter(row => !isRowEmpty(row) || row[$props.primaryKey]);
const filteredOriginal = originalData.value.filter(row => row[$props.primaryKey]);
const changes = getDifferences(filteredOriginal, filteredNewData);
hasChanges.value = !isEmpty(changes);
}, { deep: true });
}
async function reset() { async function reset() {
await fetch(originalData.value); await fetch(originalData.value);
hasChanges.value = false; hasChanges.value = false;
@ -165,7 +183,9 @@ async function onSubmit() {
}); });
} }
isLoading.value = true; isLoading.value = true;
await saveChanges($props.saveFn ? formData.value : null); await saveChanges($props.saveFn ? formData.value : null);
} }
async function onSubmitAndGo() { async function onSubmitAndGo() {
@ -174,6 +194,10 @@ async function onSubmitAndGo() {
} }
async function saveChanges(data) { async function saveChanges(data) {
formData.value = formData.value.filter(row =>
row[$props.primaryKey] || !isRowEmpty(row)
);
if ($props.saveFn) { if ($props.saveFn) {
$props.saveFn(data, getChanges); $props.saveFn(data, getChanges);
isLoading.value = false; isLoading.value = false;
@ -203,14 +227,32 @@ async function saveChanges(data) {
}); });
} }
async function insert(pushData = $props.dataRequired) { async function insert(pushData = { ...$props.dataRequired, ...$props.dataDefault }) {
const $index = formData.value.length formData.value = formData.value.filter(row => !isRowEmpty(row));
? formData.value[formData.value.length - 1].$index + 1
: 0; const lastRow = formData.value.at(-1);
formData.value.push(Object.assign({ $index }, pushData)); const isLastRowEmpty = lastRow ? isRowEmpty(lastRow) : false;
hasChanges.value = true;
if (formData.value.length && isLastRowEmpty) return;
const $index = formData.value.length ? formData.value.at(-1).$index + 1 : 0;
const nRow = Object.assign({ $index }, pushData);
formData.value.push(nRow);
const hasChange = Object.keys(nRow).some(key => !isChange(nRow, key));
if (hasChange) hasChanges.value = true;
} }
function isRowEmpty(row) {
return Object.keys(row).every(key => isChange(row, key));
}
function isChange(row,key){
return !row[key] || key == '$index' || Object.hasOwn($props.dataRequired || {}, key);
}
async function remove(data) { async function remove(data) {
if (!data.length) if (!data.length)
return quasar.notify({ return quasar.notify({
@ -227,10 +269,8 @@ async function remove(data) {
newData = newData.filter( newData = newData.filter(
(form) => !preRemove.some((index) => index == form.$index), (form) => !preRemove.some((index) => index == form.$index),
); );
const changes = getChanges(); formData.value = newData;
if (!changes.creates?.length && !changes.updates?.length) hasChanges.value = JSON.stringify(removeIndexField(formData.value)) !== JSON.stringify(removeIndexField(originalData.value));
hasChanges.value = false;
fetch(newData);
} }
if (ids.length) { if (ids.length) {
quasar quasar
@ -248,9 +288,8 @@ async function remove(data) {
newData = newData.filter((form) => !ids.some((id) => id == form[pk])); newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
fetch(newData); fetch(newData);
}); });
} else {
reset();
} }
emit('update:selected', []); emit('update:selected', []);
} }
@ -261,7 +300,7 @@ function getChanges() {
const pk = $props.primaryKey; const pk = $props.primaryKey;
for (const [i, row] of formData.value.entries()) { for (const [i, row] of formData.value.entries()) {
if (!row[pk]) { if (!row[pk]) {
creates.push(row); creates.push(Object.assign(row, { ...$props.dataRequired }));
} else if (originalData.value[i]) { } else if (originalData.value[i]) {
const data = getDifferences(originalData.value[i], row); const data = getDifferences(originalData.value[i], row);
if (!isEmpty(data)) { if (!isEmpty(data)) {
@ -287,6 +326,33 @@ function isEmpty(obj) {
return !Object.keys(obj).length; return !Object.keys(obj).length;
} }
function removeIndexField(data) {
if (Array.isArray(data)) {
return data.map(({ $index, ...rest }) => rest);
} else if (typeof data === 'object' && data !== null) {
const { $index, ...rest } = data;
return rest;
}
}
async function handleTab(event) {
event.preventDefault();
const { shiftKey, target } = event;
const focusableSelector = `tbody tr td:not(:first-child) :is(a, button, input, textarea, select, details):not([disabled])`;
const focusableElements = rowsContainer.value?.querySelectorAll(focusableSelector);
const currentIndex = Array.prototype.indexOf.call(focusableElements, target);
const index = shiftKey ? currentIndex - 1 : currentIndex + 1;
const isLast = target === focusableElements[focusableElements.length - 1];
const isFirst = currentIndex === 0;
if ((shiftKey && !isFirst) || (!shiftKey && !isLast))
focusableElements[index]?.focus();
else if (isLast) {
await insert();
await nextTick();
}
}
async function reload(params) { async function reload(params) {
const data = await vnPaginateRef.value.fetch(params); const data = await vnPaginateRef.value.fetch(params);
fetch(data); fetch(data);
@ -312,12 +378,14 @@ watch(formUrl, async () => {
v-bind="$attrs" v-bind="$attrs"
> >
<template #body v-if="formData"> <template #body v-if="formData">
<div ref="rowsContainer" @keydown.tab="handleTab">
<slot <slot
name="body" name="body"
:rows="formData" :rows="formData"
:validate="validate" :validate="validate"
:filter="filter" :filter="filter"
></slot> ></slot>
</div>
</template> </template>
</VnPaginate> </VnPaginate>
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar"> <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
@ -347,8 +415,16 @@ watch(formUrl, async () => {
<QBtnDropdown <QBtnDropdown
v-if="$props.goTo && $props.defaultSave" v-if="$props.goTo && $props.defaultSave"
@click="onSubmitAndGo" @click="onSubmitAndGo"
:label="tMobile('globals.saveAndContinue')" :label="
:title="t('globals.saveAndContinue')" tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:disable="!hasChanges" :disable="!hasChanges"
color="primary" color="primary"
icon="save" icon="save"

View File

@ -0,0 +1,154 @@
<script setup>
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import useWeekdaysOrder from 'src/composables/getWeekdays';
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
date.formatDate(dateToFormat, format);
const props = defineProps({
year: {
type: Number,
required: true,
},
month: {
type: Number,
required: true,
},
monthDate: {
type: Object,
default: null,
},
daysMap: {
type: Object,
default: null,
},
});
const emit = defineEmits(['onDateSelected']);
const { locale } = useI18n();
const weekdayStore = useWeekdayStore();
const weekDays = useWeekdaysOrder();
const calendarRef = ref(null);
const today = ref(formatDate(Date.vnNew()));
const todayTimestamp = computed(() => {
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
return date.getTime();
});
const _monthDate = computed(() => formatDate(props.monthDate));
const calendarHeaderTitle = computed(() => {
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
});
const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
const getEventByTimestamp = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
return props.daysMap?.[stamp] || null;
};
const handleDateClick = (timestamp) => {
const event = getEventByTimestamp(timestamp);
const { year, month, day } = timestamp;
const date = new Date(year, month - 1, day);
emit('onDateSelected', {
date,
isNewMode: !event,
event: event?.[0] || null,
});
};
const getEventAttrs = (timestamp) => {
return {
class: '--event',
label: timestamp.day,
};
};
defineExpose({ getEventByTimestamp, handleDateClick });
</script>
<template>
<QCalendarMonthWrapper
style="height: 290px; width: 290px"
transparent-background
view-customization="workerCalendar"
>
<template #header>
<span class="full-width text-center text-body1 q-py-sm">{{
calendarHeaderTitle
}}</span>
</template>
<template #calendar>
<QCalendarMonth
ref="calendarRef"
:model-value="_monthDate"
show-work-weeks
no-outside-days
no-active-date
:weekdays="weekDays"
short-weekday-label
:locale="locale"
:now="today"
@click-date="handleDateClick($event.scope.timestamp)"
mini-mode
>
<template #day="{ scope: { timestamp } }">
<slot
name="day"
:timestamp="timestamp"
:getEventAttrs="getEventAttrs"
>
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@click="handleDateClick(timestamp)"
rounded
dense
flat
class="calendar-event"
:class="{ '--today': isToday(timestamp) }"
/>
</slot>
</template>
</QCalendarMonth>
</template>
</QCalendarMonthWrapper>
</template>
<style lang="scss">
.calendar-event {
display: flex;
justify-content: center;
width: 32px;
height: 32px;
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
color: white;
&.--today {
border: 2px solid $info;
}
&.--event {
background-color: $positive;
color: black;
}
&:hover {
opacity: 0.8;
}
}
</style>

View File

@ -0,0 +1,126 @@
<script setup>
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
import { useStateStore } from 'stores/useStateStore';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import { useArrayData } from 'src/composables/useArrayData';
const props = defineProps({
dataKey: {
type: String,
required: true,
},
calendarComponent: {
type: Object,
required: true,
},
additionalProps: {
type: Object,
default: () => ({}),
},
});
const stateStore = useStateStore();
const weekdayStore = useWeekdayStore();
const nMonths = ref(4);
const _date = ref(Date.vnNew());
const firstDay = ref(Date.vnNew());
const lastDay = ref(Date.vnNew());
const months = ref([]);
const arrayData = useArrayData(props.dataKey);
onMounted(async () => {
const initialDate = Date.vnNew();
initialDate.setDate(1);
initialDate.setHours(0, 0, 0, 0);
date.value = initialDate;
await nextTick();
stateStore.rightDrawer = true;
});
onUnmounted(() => arrayData.destroy());
const emit = defineEmits([
'update:firstDay',
'update:lastDay',
'update:events',
'onDateSelected',
]);
const date = computed({
get: () => _date.value,
set: (value) => {
if (!(value instanceof Date)) return;
_date.value = value;
const stamp = value.getTime();
firstDay.value = new Date(stamp);
firstDay.value.setDate(1);
lastDay.value = new Date(stamp);
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
lastDay.value.setDate(0);
months.value = [];
for (let i = 0; i < nMonths.value; i++) {
const monthDate = new Date(stamp);
monthDate.setMonth(value.getMonth() + i);
months.value.push(monthDate);
}
emit('update:firstDay', firstDay.value);
emit('update:lastDay', lastDay.value);
emit('refresh-events');
},
});
const headerTitle = computed(() => {
if (!months.value?.length) return '';
const getMonthName = (date) =>
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
});
const step = (direction) => {
const newDate = new Date(date.value);
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
date.value = newDate;
};
defineExpose({
firstDay,
lastDay,
});
</script>
<template>
<QCard style="height: max-content">
<div class="calendars-header">
<QBtn
icon="arrow_left"
size="sm"
flat
class="full-height"
@click="step(-1)"
/>
<span>{{ headerTitle }}</span>
<QBtn
icon="arrow_right"
size="sm"
flat
class="full-height"
@click="step(1)"
/>
</div>
<div class="calendars-container">
<component
:is="calendarComponent"
v-for="(month, index) in months"
:key="index"
:month="month.getMonth() + 1"
:year="month.getFullYear()"
:month-date="month"
v-bind="additionalProps"
@on-date-selected="(data) => emit('onDateSelected', data)"
/>
</div>
</QCard>
</template>

View File

@ -156,6 +156,9 @@ const selectTravel = ({ id }) => {
option-label="name" option-label="name"
option-value="id" option-value="id"
v-model="travelFilterParams.warehouseOutFk" v-model="travelFilterParams.warehouseOutFk"
:where="{
isOrigin: true,
}"
/> />
<VnSelect <VnSelect
:label="t('globals.warehouseIn')" :label="t('globals.warehouseIn')"
@ -164,6 +167,9 @@ const selectTravel = ({ id }) => {
option-label="name" option-label="name"
option-value="id" option-value="id"
v-model="travelFilterParams.warehouseInFk" v-model="travelFilterParams.warehouseInFk"
:where="{
isDestiny: true,
}"
/> />
<VnInputDate <VnInputDate
:label="t('globals.shipped')" :label="t('globals.shipped')"

View File

@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
const { notify } = useNotify(); const { notify } = useNotify();
const route = useRoute(); const route = useRoute();
const myForm = ref(null); const myForm = ref(null);
const attrs = useAttrs();
const $props = defineProps({ const $props = defineProps({
url: { url: {
type: String, type: String,
@ -99,8 +98,12 @@ const $props = defineProps({
type: Function, type: Function,
default: () => {}, default: () => {},
}, },
preventSubmit: {
type: Boolean,
default: false,
},
}); });
const emit = defineEmits(['onFetch', 'onDataSaved']); const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
const modelValue = computed( const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`, () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value; ).value;
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
); );
} }
async function onKeyup(evt) { async function onKeyup(evt) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) { if (evt.key === 'Enter' && !$props.preventSubmit) {
const input = evt.target; const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) { if (input.type == 'textarea' && evt.shiftKey) {
let { selectionStart, selectionEnd } = input; let { selectionStart, selectionEnd } = input;
@ -330,6 +333,7 @@ defineExpose({
<template> <template>
<div class="column items-center full-width"> <div class="column items-center full-width">
<QForm <QForm
v-on="$attrs"
ref="myForm" ref="myForm"
v-if="formData" v-if="formData"
@submit.prevent="save" @submit.prevent="save"
@ -376,8 +380,16 @@ defineExpose({
data-cy="saveAndContinueDefaultBtn" data-cy="saveAndContinueDefaultBtn"
v-if="$props.goTo" v-if="$props.goTo"
@click="saveAndGo" @click="saveAndGo"
:label="tMobile('globals.saveAndContinue')" :label="
:title="t('globals.saveAndContinue')" tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:disable="!hasChanges" :disable="!hasChanges"
color="primary" color="primary"
icon="save" icon="save"
@ -406,6 +418,7 @@ defineExpose({
</QBtnDropdown> </QBtnDropdown>
<QBtn <QBtn
v-else v-else
data-cy="saveDefaultBtn"
:label="tMobile('globals.save')" :label="tMobile('globals.save')"
color="primary" color="primary"
icon="save" icon="save"

View File

@ -181,7 +181,7 @@ const searchModule = () => {
<template> <template>
<QList padding class="column-max-width"> <QList padding class="column-max-width">
<template v-if="$props.source === 'main'"> <template v-if="$props.source === 'main'">
<template v-if="$route?.matched[1]?.name === 'Dashboard'"> <template v-if="route?.matched[1]?.name === 'Dashboard'">
<QItem class="q-pb-md"> <QItem class="q-pb-md">
<VnInput <VnInput
v-model="search" v-model="search"
@ -262,7 +262,7 @@ const searchModule = () => {
</template> </template>
<template v-for="item in items" :key="item.name"> <template v-for="item in items" :key="item.name">
<template v-if="item.name === $route?.matched[1]?.name"> <template v-if="item.name === route?.matched[1]?.name">
<QItem class="header"> <QItem class="header">
<QItemSection avatar v-if="item.icon"> <QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" /> <QIcon :name="item.icon" />

View File

@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
'no-visible': !stateQuery.isLoading().value, 'no-visible': !stateQuery.isLoading().value,
}" }"
size="sm" size="sm"
data-cy="loading-spinner" data-cy="navBar-spinner"
/> />
<QSpace /> <QSpace />
<div id="searchbar" class="searchbar"></div> <div id="searchbar" class="searchbar"></div>

View File

@ -26,7 +26,7 @@ async function redirect() {
if (route?.params?.id) if (route?.params?.id)
return (window.location.href = await getUrl( return (window.location.href = await getUrl(
`${section}/${route.params.id}/summary` `${section}/${route.params.id}/summary`,
)); ));
return (window.location.href = await getUrl(section + '/index')); return (window.location.href = await getUrl(section + '/index'));
} }

View File

@ -55,7 +55,7 @@ const refund = async () => {
(data) => ( (data) => (
(rectificativeTypeOptions = data), (rectificativeTypeOptions = data),
(invoiceParams.cplusRectificationTypeFk = data.filter( (invoiceParams.cplusRectificationTypeFk = data.filter(
(type) => type.description == 'I Por diferencias' (type) => type.description == 'I Por diferencias',
)[0].id) )[0].id)
) )
" "
@ -68,7 +68,7 @@ const refund = async () => {
(data) => ( (data) => (
(siiTypeInvoiceOutsOptions = data), (siiTypeInvoiceOutsOptions = data),
(invoiceParams.siiTypeInvoiceOutFk = data.filter( (invoiceParams.siiTypeInvoiceOutFk = data.filter(
(type) => type.code == 'R4' (type) => type.code == 'R4',
)[0].id) )[0].id)
) )
" "

View File

@ -40,6 +40,9 @@ const onDataSaved = (data) => {
url="Warehouses" url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)" @on-fetch="(data) => (warehousesOptions = data)"
auto-load auto-load
:where="{
isInventory: true,
}"
/> />
<FormModelPopup <FormModelPopup
url-create="Items/regularize" url-create="Items/regularize"

View File

@ -52,7 +52,7 @@ watch(
} else filter.value.where = {}; } else filter.value.where = {};
await provincesFetchDataRef.value.fetch({}); await provincesFetchDataRef.value.fetch({});
emit('onProvinceFetched', provincesOptions.value); emit('onProvinceFetched', provincesOptions.value);
} },
); );
</script> </script>

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { markRaw, computed } from 'vue'; import { markRaw, computed, onBeforeMount } from 'vue';
import { QCheckbox, QToggle } from 'quasar'; import { QToggle } from 'quasar';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import VnInput from 'components/common/VnInput.vue'; import VnInput from 'components/common/VnInput.vue';
@ -150,6 +150,16 @@ const showFilter = computed(
const onTabPressed = async () => { const onTabPressed = async () => {
if (model.value) enterEvent['keyup.enter'](); if (model.value) enterEvent['keyup.enter']();
}; };
onBeforeMount(() => {
const columnFilter = $props.column?.columnFilter;
const component = columnFilter?.component;
const defaultComponent = components[component];
const events = { update: updateEvent, enter: enterEvent };
if (!columnFilter || defaultComponent) return;
$props.column.columnFilter.event = events[columnFilter.event];
});
</script> </script>
<template> <template>
<div v-if="showFilter" class="full-width" style="overflow: hidden"> <div v-if="showFilter" class="full-width" style="overflow: hidden">

View File

@ -16,7 +16,7 @@ const $props = defineProps({
required: true, required: true,
}, },
searchUrl: { searchUrl: {
type: String, type: [String, Boolean],
default: 'table', default: 'table',
}, },
vertical: { vertical: {

View File

@ -33,6 +33,9 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
import VnTableFilter from './VnTableFilter.vue'; import VnTableFilter from './VnTableFilter.vue';
import { getColAlign } from 'src/composables/getColAlign'; import { getColAlign } from 'src/composables/getColAlign';
import RightMenu from '../common/RightMenu.vue'; import RightMenu from '../common/RightMenu.vue';
import VnScroll from '../common/VnScroll.vue';
import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
import VnCheckbox from '../common/VnCheckbox.vue';
const arrayData = useArrayData(useAttrs()['data-key']); const arrayData = useArrayData(useAttrs()['data-key']);
const $props = defineProps({ const $props = defineProps({
@ -65,7 +68,7 @@ const $props = defineProps({
default: null, default: null,
}, },
create: { create: {
type: Object, type: [Boolean, Object],
default: null, default: null,
}, },
createAsDialog: { createAsDialog: {
@ -112,6 +115,10 @@ const $props = defineProps({
type: Object, type: Object,
default: () => ({}), default: () => ({}),
}, },
multiCheck: {
type: Object,
default: () => ({}),
},
crudModel: { crudModel: {
type: Object, type: Object,
default: () => ({}), default: () => ({}),
@ -156,6 +163,7 @@ const CARD_MODE = 'card';
const TABLE_MODE = 'table'; const TABLE_MODE = 'table';
const mode = ref(CARD_MODE); const mode = ref(CARD_MODE);
const selected = ref([]); const selected = ref([]);
const selectAll = ref(false);
const hasParams = ref(false); const hasParams = ref(false);
const CrudModelRef = ref({}); const CrudModelRef = ref({});
const showForm = ref(false); const showForm = ref(false);
@ -168,6 +176,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders); const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app'); const app = inject('app');
const tableHeight = useTableHeight(); const tableHeight = useTableHeight();
const vnScrollRef = ref(null);
const editingRow = ref(null); const editingRow = ref(null);
const editingField = ref(null); const editingField = ref(null);
@ -189,6 +198,17 @@ const tableModes = [
}, },
]; ];
const onVirtualScroll = ({ to }) => {
handleScroll();
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
if (virtualScrollContainer) {
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
if (vnScrollRef.value) {
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
}
}
};
onBeforeMount(() => { onBeforeMount(() => {
const urlParams = route.query[$props.searchUrl]; const urlParams = route.query[$props.searchUrl];
hasParams.value = urlParams && Object.keys(urlParams).length !== 0; hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@ -313,6 +333,7 @@ function stopEventPropagation(event) {
function reload(params) { function reload(params) {
selected.value = []; selected.value = [];
selectAll.value = false;
CrudModelRef.value.reload(params); CrudModelRef.value.reload(params);
} }
@ -327,16 +348,13 @@ function handleOnDataSaved(_) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value }); if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_); else $props.create.onDataSaved(_);
} }
function handleScroll() { function handleScroll() {
if ($props.crudModel.disableInfiniteScroll) return; if ($props.crudModel.disableInfiniteScroll) return;
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle'); const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
const { scrollHeight, scrollTop, clientHeight } = tMiddle; const { scrollHeight, scrollTop, clientHeight } = tMiddle;
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40; const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate(); if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
} }
function handleSelection({ evt, added, rows: selectedRows }, rows) { function handleSelection({ evt, added, rows: selectedRows }, rows) {
if (evt?.shiftKey && added) { if (evt?.shiftKey && added) {
const rowIndex = selectedRows[0].$index; const rowIndex = selectedRows[0].$index;
@ -628,6 +646,17 @@ const rowCtrlClickFunction = computed(() => {
}; };
return () => {}; return () => {};
}); });
const handleHeaderSelection = (evt, data) => {
if (evt === 'updateSelected' && selectAll.value) {
selected.value = tableRef.value.rows;
} else if (evt === 'selectAll') {
selected.value = data;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
</script> </script>
<template> <template>
<RightMenu v-if="$props.rightSearch" :overlay="overlay"> <RightMenu v-if="$props.rightSearch" :overlay="overlay">
@ -653,7 +682,15 @@ const rowCtrlClickFunction = computed(() => {
:class="$attrs['class'] ?? 'q-px-md'" :class="$attrs['class'] ?? 'q-px-md'"
:limit="$attrs['limit'] ?? 100" :limit="$attrs['limit'] ?? 100"
ref="CrudModelRef" ref="CrudModelRef"
@on-fetch="(...args) => emit('onFetch', ...args)" @on-fetch="
(...args) => {
if ($props.multiCheck.expand) {
selectAll = false;
selected = [];
}
emit('onFetch', ...args);
}
"
:search-url="searchUrl" :search-url="searchUrl"
:disable-infinite-scroll="isTableMode" :disable-infinite-scroll="isTableMode"
:before-save-fn="removeTextValue" :before-save-fn="removeTextValue"
@ -683,13 +720,33 @@ const rowCtrlClickFunction = computed(() => {
flat flat
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`" :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode" :virtual-scroll="isTableMode"
@virtual-scroll="handleScroll" @virtual-scroll="onVirtualScroll"
@row-click="(event, row) => handleRowClick(event, row)" @row-click="(event, row) => handleRowClick(event, row)"
@update:selected="emit('update:selected', $event)" @update:selected="emit('update:selected', $event)"
@selection="(details) => handleSelection(details, rows)" @selection="(details) => handleSelection(details, rows)"
:hide-selected-banner="true" :hide-selected-banner="true"
:data-cy :data-cy
> >
<template #header-selection>
<div class="flex items-center no-wrap" style="display: flex">
<VnCheckbox
v-model="selectAll"
@click="handleHeaderSelection('updateSelected', $event)"
/>
<VnCheckboxMenu
v-if="selectAll && $props.multiCheck.expand"
:searchUrl="searchUrl"
v-model="selectAll"
:url="$attrs['url']"
@update:selected="
handleHeaderSelection('updateSelected', $event)
"
@select:all="handleHeaderSelection('selectAll', $event)"
/>
</div>
</template>
<template #top-left v-if="!$props.withoutHeader"> <template #top-left v-if="!$props.withoutHeader">
<slot name="top-left"> </slot> <slot name="top-left"> </slot>
</template> </template>
@ -741,6 +798,7 @@ const rowCtrlClickFunction = computed(() => {
withFilters withFilters
" "
:column="col" :column="col"
:data-cy="`column-filter-${col.name}`"
:show-title="true" :show-title="true"
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"
v-model="params[columnName(col)]" v-model="params[columnName(col)]"
@ -1087,6 +1145,11 @@ const rowCtrlClickFunction = computed(() => {
</template> </template>
</FormModelPopup> </FormModelPopup>
</QDialog> </QDialog>
<VnScroll
ref="vnScrollRef"
v-if="isTableMode"
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
/>
</template> </template>
<i18n> <i18n>
en: en:

View File

@ -30,6 +30,7 @@ function columnName(col) {
v-bind="$attrs" v-bind="$attrs"
:search-button="true" :search-button="true"
:disable-submit-event="true" :disable-submit-event="true"
:data-key="$attrs['data-key']"
:search-url :search-url
> >
<template #body="{ params, orders, searchFn }"> <template #body="{ params, orders, searchFn }">

View File

@ -58,7 +58,7 @@ async function getConfig(url, filter) {
const response = await axios.get(url, { const response = await axios.get(url, {
params: { filter: filter }, params: { filter: filter },
}); });
return response.data && response.data.length > 0 ? response.data[0] : null; return response?.data && response?.data?.length > 0 ? response.data[0] : null;
} }
async function fetchViewConfigData() { async function fetchViewConfigData() {

View File

@ -11,6 +11,9 @@ describe('VnTable', () => {
propsData: { propsData: {
columns: [], columns: [],
}, },
attrs: {
'data-key': 'test',
},
}); });
vm = wrapper.vm; vm = wrapper.vm;

View File

@ -6,7 +6,7 @@ export default function (initialFooter, data) {
}); });
return acc; return acc;
}, },
{ ...initialFooter } { ...initialFooter },
); );
return footer; return footer;
} }

View File

@ -11,13 +11,7 @@ describe('CrudModel', () => {
beforeAll(() => { beforeAll(() => {
wrapper = createWrapper(CrudModel, { wrapper = createWrapper(CrudModel, {
global: { global: {
stubs: [ stubs: ['vnPaginate', 'vue-i18n'],
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
mocks: { mocks: {
validate: vi.fn(), validate: vi.fn(),
}, },
@ -29,7 +23,7 @@ describe('CrudModel', () => {
dataKey: 'crudModelKey', dataKey: 'crudModelKey',
model: 'crudModel', model: 'crudModel',
url: 'crudModelUrl', url: 'crudModelUrl',
saveFn: '', saveFn: vi.fn(),
}, },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
@ -199,11 +193,11 @@ describe('CrudModel', () => {
}); });
it('should set originalData and formatData with data and generate watchChanges', async () => { it('should set originalData and formatData with data and generate watchChanges', async () => {
data = { data = [{
name: 'Tony', name: 'Tony',
lastName: 'Stark', lastName: 'Stark',
age: 42, age: 42,
}; }];
vm.resetData(data); vm.resetData(data);
@ -231,7 +225,7 @@ describe('CrudModel', () => {
expect(vm.isLoading).toBe(false); expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false); expect(vm.hasChanges).toBe(false);
await wrapper.setProps({ saveFn: '' }); await wrapper.setProps({ saveFn: null });
}); });
it("should use default url if there's not saveFn", async () => { it("should use default url if there's not saveFn", async () => {
@ -247,7 +241,7 @@ describe('CrudModel', () => {
await vm.saveChanges(data); await vm.saveChanges(data);
expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data); expect(postMock).toHaveBeenCalledWith(`${vm.url}/crud`, data);
expect(vm.isLoading).toBe(false); expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false); expect(vm.hasChanges).toBe(false);
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData))); expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));

View File

@ -142,14 +142,14 @@ describe('getRoutes', () => {
const fn = (props) => getRoutes(props, getMethodA, getMethodB); const fn = (props) => getRoutes(props, getMethodA, getMethodB);
it('should call getMethodB when source is card', () => { it('should call getMethodB when source is card', () => {
let props = { source: 'methodB' }; const props = { source: 'methodB' };
fn(props); fn(props);
expect(getMethodB).toHaveBeenCalled(); expect(getMethodB).toHaveBeenCalled();
expect(getMethodA).not.toHaveBeenCalled(); expect(getMethodA).not.toHaveBeenCalled();
}); });
it('should call getMethodA when source is main', () => { it('should call getMethodA when source is main', () => {
let props = { source: 'methodA' }; const props = { source: 'methodA' };
fn(props); fn(props);
expect(getMethodA).toHaveBeenCalled(); expect(getMethodA).toHaveBeenCalled();
@ -157,7 +157,7 @@ describe('getRoutes', () => {
}); });
it('should call getMethodA when source is not exists or undefined', () => { it('should call getMethodA when source is not exists or undefined', () => {
let props = { source: 'methodC' }; const props = { source: 'methodC' };
expect(() => fn(props)).toThrowError('Method not defined'); expect(() => fn(props)).toThrowError('Method not defined');
expect(getMethodA).not.toHaveBeenCalled(); expect(getMethodA).not.toHaveBeenCalled();
@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
vm = mount('card').vm; vm = mount('card').vm;
}); });
it('should get routes for card source', async () => { it('should get routes for card source', () => {
vm.getRoutes(); vm.getRoutes();
}); });
}); });
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
}); });
it('should get routes for main source', () => { it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes(); vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled(); expect(navigation.getModules).toHaveBeenCalled();
}); });

View File

@ -0,0 +1,93 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnInput from 'src/components/common/VnInput.vue';
import FetchData from '../FetchData.vue';
import VnSelectDialog from './VnSelectDialog.vue';
import CreateBankEntityForm from '../CreateBankEntityForm.vue';
const $props = defineProps({
iban: {
type: String,
default: null,
},
bankEntityFk: {
type: Number,
default: null,
},
disableElement: {
type: Boolean,
default: false,
},
});
const filter = {
fields: ['id', 'bic', 'name'],
order: 'bic ASC',
};
const { t } = useI18n();
const emit = defineEmits(['updateBic']);
const iban = ref($props.iban);
const bankEntityFk = ref($props.bankEntityFk);
const bankEntities = ref([]);
const autofillBic = async (bic) => {
if (!bic) return;
const bankEntityId = parseInt(bic.substr(4, 4));
const ibanCountry = bic.substr(0, 2);
if (ibanCountry != 'ES') return;
const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
bankEntityFk.value = existBank ? bankEntityId : null;
emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
};
const getBankEntities = (data) => {
bankEntityFk.value = data.id;
};
</script>
<template>
<FetchData
url="BankEntities"
:filter="filter"
auto-load
@on-fetch="(data) => (bankEntities = data)"
/>
<VnInput
:label="t('IBAN')"
clearable
v-model="iban"
@update:model-value="autofillBic($event)"
:disable="disableElement"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
<VnSelectDialog
:label="t('Swift / BIC')"
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
:options="bankEntities"
hide-selected
option-label="bic"
option-value="id"
v-model="bankEntityFk"
@update:model-value="$emit('updateBic', { iban, bankEntityFk })"
:disable="disableElement"
>
<template #form>
<CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection v-if="scope.opt">
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectDialog>
</template>

View File

@ -15,7 +15,7 @@ let root = ref(null);
watchEffect(() => { watchEffect(() => {
matched.value = currentRoute.value.matched.filter( matched.value = currentRoute.value.matched.filter(
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon (matched) => !!matched?.meta?.title || !!matched?.meta?.icon,
); );
breadcrumbs.value.length = 0; breadcrumbs.value.length = 0;
if (!matched.value[0]) return; if (!matched.value[0]) return;

View File

@ -0,0 +1,104 @@
<script setup>
import { ref } from 'vue';
import VnCheckbox from './VnCheckbox.vue';
import axios from 'axios';
import { toRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
const route = useRoute();
const { t } = useI18n();
const model = defineModel({ type: [Boolean] });
const props = defineProps({
url: {
type: String,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const menuRef = ref(null);
const errorMessage = ref(null);
const rows = ref(0);
const onClick = async () => {
errorMessage.value = null;
const { filter } = JSON.parse(route.query[props.searchUrl]);
filter.limit = 0;
const params = {
params: { filter: JSON.stringify(filter) },
};
try {
const { data } = await axios.get(props.url, params);
rows.value = data;
} catch (error) {
const response = error.response;
if (response.data.error.name === 'UserError') {
errorMessage.value = t('tooManyResults');
} else {
errorMessage.value = response.data.error.message;
}
}
};
defineEmits(['update:selected', 'select:all']);
</script>
<template>
<QIcon
style="margin-left: -10px"
data-cy="btnMultiCheck"
name="expand_more"
@click="onClick"
class="cursor-pointer"
color="primary"
size="xs"
>
<QMenu
fit
anchor="bottom start"
self="top left"
ref="menuRef"
data-cy="menuMultiCheck"
>
<QList separator>
<QItem
data-cy="selectAll"
v-ripple
clickable
@click="
$refs.menuRef.hide();
$emit('select:all', toRaw(rows));
"
>
<QItemSection>
<QItemLabel>
<span v-text="t('Select all')" />
</QItemLabel>
<QItemLabel overline caption>
<span
v-if="errorMessage"
class="text-negative"
v-text="errorMessage"
/>
<span
v-else
v-text="t('records', { rows: rows?.length ?? 0 })"
/>
</QItemLabel>
</QItemSection>
</QItem>
<slot name="more-options"></slot>
</QList>
</QMenu>
</QIcon>
</template>
<i18n lang="yml">
en:
tooManyResults: Too many results. Please narrow down your search.
records: '{rows} records'
es:
Select all: Seleccionar todo
tooManyResults: Demasiados registros. Restringe la búsqueda.
records: '{rows} registros'
</i18n>

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
const model = defineModel({ type: [String, Number], required: true }); const model = defineModel({ type: [String, Number], default: '' });
</script> </script>
<template> <template>
<QDate v-model="model" :today-btn="true" :options="$attrs.options" /> <QDate v-model="model" :today-btn="true" :options="$attrs.options" />

View File

@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import axios from 'axios'; import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify();
const emit = defineEmits(['onDataSaved']); const emit = defineEmits(['onDataSaved']);
const $props = defineProps({ const $props = defineProps({
@ -61,8 +63,11 @@ function onFileChange(files) {
function mapperDms(data) { function mapperDms(data) {
const formData = new FormData(); const formData = new FormData();
const { files } = data; let files = data.files;
if (files) formData.append(files?.name, files); if (files) {
files = Array.isArray(files) ? files : [files];
files.forEach((file) => formData.append(file?.name, file));
}
const dms = { const dms = {
hasFile: !!data.hasFile, hasFile: !!data.hasFile,
@ -83,11 +88,16 @@ function getUrl() {
} }
async function save() { async function save() {
try {
const body = mapperDms(dms.value); const body = mapperDms(dms.value);
const response = await axios.post(getUrl(), body[0], body[1]); const response = await axios.post(getUrl(), body[0], body[1]);
emit('onDataSaved', body[1].params, response); emit('onDataSaved', body[1].params, response);
notify(t('globals.dataSaved'), 'positive');
delete dms.value.files; delete dms.value.files;
return response; return response;
} catch (e) {
throw e;
}
} }
function defaultData() { function defaultData() {

View File

@ -14,10 +14,12 @@ import VnDms from 'src/components/common/VnDms.vue';
import VnConfirm from 'components/ui/VnConfirm.vue'; import VnConfirm from 'components/ui/VnConfirm.vue';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
import { useSession } from 'src/composables/useSession'; import { useSession } from 'src/composables/useSession';
import useNotify from 'src/composables/useNotify.js';
const route = useRoute(); const route = useRoute();
const quasar = useQuasar(); const quasar = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify();
const rows = ref([]); const rows = ref([]);
const dmsRef = ref(); const dmsRef = ref();
const formDialog = ref({}); const formDialog = ref({});
@ -90,7 +92,6 @@ const dmsFilter = {
], ],
}, },
}, },
where: { [$props.filter]: route.params.id },
}; };
const columns = computed(() => [ const columns = computed(() => [
@ -255,9 +256,16 @@ function deleteDms(dmsFk) {
}, },
}) })
.onOk(async () => { .onOk(async () => {
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`); try {
await axios.post(
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
);
const index = rows.value.findIndex((row) => row.id == dmsFk); const index = rows.value.findIndex((row) => row.id == dmsFk);
rows.value.splice(index, 1); rows.value.splice(index, 1);
notify(t('globals.dataDeleted'), 'positive');
} catch (e) {
throw e;
}
}); });
} }
@ -295,7 +303,9 @@ defineExpose({
:data-key="$props.model" :data-key="$props.model"
:url="$props.model" :url="$props.model"
:user-filter="dmsFilter" :user-filter="dmsFilter"
search-url="dmsFilter"
:order="['dmsFk DESC']" :order="['dmsFk DESC']"
:filter="{ where: { [$props.filter]: route.params.id } }"
auto-load auto-load
@on-fetch="setData" @on-fetch="setData"
> >

View File

@ -1,44 +0,0 @@
<script setup>
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n();
const model = defineModel({ type: [Number, String] });
const emit = defineEmits(['updateBic']);
const getIbanCountry = (bank) => {
return bank.substr(0, 2);
};
const autofillBic = async (iban) => {
if (!iban) return;
const bankEntityId = parseInt(iban.substr(4, 4));
const ibanCountry = getIbanCountry(iban);
if (ibanCountry != 'ES') return;
const filter = { where: { id: bankEntityId } };
const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`BankEntities`, { params });
emit('updateBic', data[0]?.id);
};
</script>
<template>
<VnInput
:label="t('IBAN')"
clearable
v-model="model"
@update:model-value="autofillBic($event)"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
</template>

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { onMounted, watch, computed, ref, useAttrs } from 'vue'; import { nextTick, watch, computed, ref, useAttrs } from 'vue';
import { date } from 'quasar'; import { date, getCssVar } from 'quasar';
import VnDate from './VnDate.vue'; import VnDate from './VnDate.vue';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
@ -20,61 +20,18 @@ const $props = defineProps({
}); });
const vnInputDateRef = ref(null); const vnInputDateRef = ref(null);
const errColor = getCssVar('negative');
const textColor = ref('');
const dateFormat = 'DD/MM/YYYY'; const dateFormat = 'DD/MM/YYYY';
const isPopupOpen = ref(); const isPopupOpen = ref();
const hover = ref(); const hover = ref();
const mask = ref();
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])]; const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
const formattedDate = computed({
get() {
if (!model.value) return model.value;
return date.formatDate(new Date(model.value), dateFormat);
},
set(value) {
if (value == model.value) return;
let newDate;
if (value) {
// parse input
if (value.includes('/') && value.length >= 10) {
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
value = date.formatDate(
new Date(value).toISOString(),
'YYYY-MM-DDTHH:mm:ss.SSSZ',
);
}
const [year, month, day] = value.split('-').map((e) => parseInt(e));
newDate = new Date(year, month - 1, day);
if (model.value) {
const orgDate =
model.value instanceof Date ? model.value : new Date(model.value);
newDate.setHours(
orgDate.getHours(),
orgDate.getMinutes(),
orgDate.getSeconds(),
orgDate.getMilliseconds(),
);
}
}
if (!isNaN(newDate)) model.value = newDate.toISOString();
},
});
const popupDate = computed(() => const popupDate = computed(() =>
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value, model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
); );
onMounted(() => {
// fix quasar bug
mask.value = '##/##/####';
});
watch(
() => model.value,
(val) => (formattedDate.value = val),
{ immediate: true },
);
const styleAttrs = computed(() => { const styleAttrs = computed(() => {
return $props.isOutlined return $props.isOutlined
@ -86,28 +43,138 @@ const styleAttrs = computed(() => {
: {}; : {};
}); });
const inputValue = ref('');
const validateAndCleanInput = (value) => {
inputValue.value = value.replace(/[^0-9./-]/g, '');
};
const manageDate = (date) => { const manageDate = (date) => {
formattedDate.value = date; inputValue.value = date.split('/').reverse().join('/');
isPopupOpen.value = false; isPopupOpen.value = false;
}; };
watch(
() => model.value,
(nVal) => {
if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
else inputValue.value = '';
},
{ immediate: true },
);
const formatDate = () => {
let value = inputValue.value;
if (!value || value === model.value) {
textColor.value = '';
return;
}
const regex =
/^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
if (!regex.test(value)) {
textColor.value = errColor;
return;
}
value = value.replace(/[.-]/g, '/');
const parts = value.split('/');
if (parts.length < 2) {
textColor.value = errColor;
return;
}
let [day, month, year] = parts;
if (day.length === 1) day = '0' + day;
if (month.length === 1) month = '0' + month;
const currentYear = Date.vnNew().getFullYear();
if (!year) year = currentYear;
const millennium = currentYear.toString().slice(0, 1);
switch (year.length) {
case 1:
year = `${millennium}00${year}`;
break;
case 2:
year = `${millennium}0${year}`;
break;
case 3:
year = `${millennium}${year}`;
break;
case 4:
break;
}
let isoCandidate = `${year}/${month}/${day}`;
isoCandidate = date.formatDate(
new Date(isoCandidate).toISOString(),
'YYYY-MM-DDTHH:mm:ss.SSSZ',
);
const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
const isValidDate =
parsedDate instanceof Date &&
!isNaN(parsedDate) &&
parsedDate.getFullYear() === parseInt(year) &&
parsedDate.getMonth() === parseInt(month) - 1 &&
parsedDate.getDate() === parseInt(day);
if (!isValidDate) {
textColor.value = errColor;
return;
}
if (model.value) {
const original =
model.value instanceof Date ? model.value : new Date(model.value);
parsedDate.setHours(
original.getHours(),
original.getMinutes(),
original.getSeconds(),
original.getMilliseconds(),
);
}
model.value = parsedDate.toISOString();
textColor.value = '';
};
const handleEnter = (event) => {
formatDate();
nextTick(() => {
const newEvent = new KeyboardEvent('keydown', {
key: 'Enter',
code: 'Enter',
bubbles: true,
cancelable: true,
});
vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
});
};
</script> </script>
<template> <template>
<div @mouseover="hover = true" @mouseleave="hover = false"> <div @mouseover="hover = true" @mouseleave="hover = false">
<QInput <QInput
ref="vnInputDateRef" ref="vnInputDateRef"
v-model="formattedDate" v-model="inputValue"
class="vn-input-date" class="vn-input-date"
:mask="mask"
placeholder="dd/mm/aaaa" placeholder="dd/mm/aaaa"
v-bind="{ ...$attrs, ...styleAttrs }" v-bind="{ ...$attrs, ...styleAttrs }"
:class="{ required: isRequired }" :class="{ required: isRequired }"
:rules="mixinRules" :rules="mixinRules"
:clearable="false" :clearable="false"
:input-style="{ color: textColor }"
@click="isPopupOpen = !isPopupOpen" @click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false" @keydown="isPopupOpen = false"
@blur="formatDate"
@keydown.enter.prevent="handleEnter"
hide-bottom-space hide-bottom-space
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'" :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
@update:model-value="validateAndCleanInput"
> >
<template #append> <template #append>
<QIcon <QIcon
@ -116,11 +183,12 @@ const manageDate = (date) => {
v-if=" v-if="
($attrs.clearable == undefined || $attrs.clearable) && ($attrs.clearable == undefined || $attrs.clearable) &&
hover && hover &&
model && inputValue &&
!$attrs.disable !$attrs.disable
" "
@click=" @click="
vnInputDateRef.focus(); vnInputDateRef.focus();
inputValue = null;
model = null; model = null;
isPopupOpen = false; isPopupOpen = false;
" "

View File

@ -5,7 +5,7 @@ import VnDate from './VnDate.vue';
import VnTime from './VnTime.vue'; import VnTime from './VnTime.vue';
const $attrs = useAttrs(); const $attrs = useAttrs();
const model = defineModel({ type: [Date] }); const model = defineModel({ type: [Date, String] });
const $props = defineProps({ const $props = defineProps({
isOutlined: { isOutlined: {
@ -29,7 +29,7 @@ const styleAttrs = computed(() => {
const mask = 'DD-MM-YYYY HH:mm'; const mask = 'DD-MM-YYYY HH:mm';
const selectedDate = computed({ const selectedDate = computed({
get() { get() {
if (!model.value) return new Date(model.value); if (!model.value) return JSON.stringify(new Date(model.value));
return date.formatDate(new Date(model.value), mask); return date.formatDate(new Date(model.value), mask);
}, },
set(value) { set(value) {

View File

@ -21,7 +21,7 @@ watch(
(newValue) => { (newValue) => {
if (!modelValue.value) return; if (!modelValue.value) return;
modelValue.value = formatLocation(newValue) ?? null; modelValue.value = formatLocation(newValue) ?? null;
} },
); );
const mixinRules = [requiredFieldRule]; const mixinRules = [requiredFieldRule];
@ -45,7 +45,7 @@ const formatLocation = (obj, properties = locationProperties) => {
}); });
const filteredParts = parts.filter( const filteredParts = parts.filter(
(part) => part !== null && part !== undefined && part !== '' (part) => part !== null && part !== undefined && part !== '',
); );
return filteredParts.join(', '); return filteredParts.join(', ');

View File

@ -0,0 +1,98 @@
<script setup>
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
const props = defineProps({
scrollTarget: { type: [String, Object], default: 'window' },
});
const scrollPosition = ref(0);
const showButton = ref(false);
let scrollContainer = null;
const onScroll = () => {
if (!scrollContainer) return;
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
: window.scrollY;
};
watch(scrollPosition, (newValue) => {
showButton.value = newValue > 0;
});
const scrollToTop = () => {
if (scrollContainer) {
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
}
};
const updateScrollContainer = (container) => {
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
};
defineExpose({
updateScrollContainer,
});
const initScrollContainer = async () => {
await nextTick();
if (typeof props.scrollTarget === 'object') {
scrollContainer = props.scrollTarget;
} else {
scrollContainer = window;
}
if (!scrollContainer) return;
scrollContainer.addEventListener('scroll', onScroll);
};
onMounted(() => {
initScrollContainer();
});
onUnmounted(() => {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
scrollContainer = null;
}
});
</script>
<template>
<QIcon
v-if="showButton"
color="primary"
name="keyboard_arrow_up"
class="scroll-to-top"
@click="scrollToTop"
>
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
</QIcon>
</template>
<style scoped>
.scroll-to-top {
position: fixed;
top: 70px;
font-size: 65px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
transition: transform 0.2s ease-in-out;
}
.scroll-to-top:hover {
transform: translateX(-50%) scale(1.2);
cursor: pointer;
filter: brightness(0.8);
}
</style>

View File

@ -54,6 +54,10 @@ const $props = defineProps({
type: [Array], type: [Array],
default: () => [], default: () => [],
}, },
filterFn: {
type: Function,
default: null,
},
exprBuilder: { exprBuilder: {
type: Function, type: Function,
default: null, default: null,
@ -62,16 +66,12 @@ const $props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
defaultFilter: {
type: Boolean,
default: true,
},
fields: { fields: {
type: Array, type: Array,
default: null, default: null,
}, },
include: { include: {
type: [Object, Array], type: [Object, Array, String],
default: null, default: null,
}, },
where: { where: {
@ -79,7 +79,7 @@ const $props = defineProps({
default: null, default: null,
}, },
sortBy: { sortBy: {
type: String, type: [String, Array],
default: null, default: null,
}, },
limit: { limit: {
@ -166,6 +166,8 @@ const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC'; return $props.sortBy || $props.optionLabel + ' ASC';
}); });
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
watch(options, (newValue) => { watch(options, (newValue) => {
setOptions(newValue); setOptions(newValue);
}); });
@ -255,21 +257,18 @@ async function fetchFilter(val) {
} }
async function filterHandler(val, update) { async function filterHandler(val, update) {
if (isLoading.value) return update();
if (!val && lastVal.value === val) {
lastVal.value = val;
return update();
}
lastVal.value = val;
let newOptions; let newOptions;
if (!$props.defaultFilter) return update(); if ($props.filterFn) update($props.filterFn(val));
if ( else if (!val && lastVal.value === val) update();
$props.url && else {
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0)) const makeRequest =
) { ($props.url && $props.limit) ||
newOptions = await fetchFilter(val); (!$props.limit && Object.keys(myOptions.value).length === 0);
} else newOptions = filter(val, myOptionsOriginal.value); newOptions = makeRequest
? await fetchFilter(val)
: filter(val, myOptionsOriginal.value);
update( update(
() => { () => {
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase())) if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
@ -286,12 +285,13 @@ async function filterHandler(val, update) {
); );
} }
lastVal.value = val;
}
function nullishToTrue(value) { function nullishToTrue(value) {
return value ?? true; return value ?? true;
} }
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
async function onScroll({ to, direction, from, index }) { async function onScroll({ to, direction, from, index }) {
const lastIndex = myOptions.value.length - 1; const lastIndex = myOptions.value.length - 1;
@ -379,7 +379,7 @@ function getCaption(opt) {
> >
<template #append> <template #append>
<QIcon <QIcon
v-show="isClearable && value" v-show="isClearable && value != null && value !== ''"
name="close" name="close"
@click=" @click="
() => { () => {
@ -394,7 +394,7 @@ function getCaption(opt) {
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName"> <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<div v-if="slotName == 'append'"> <div v-if="slotName == 'append'">
<QIcon <QIcon
v-show="isClearable && value" v-show="isClearable && value != null && value !== ''"
name="close" name="close"
@click.stop=" @click.stop="
() => { () => {
@ -419,7 +419,7 @@ function getCaption(opt) {
<QItemLabel> <QItemLabel>
{{ opt[optionLabel] }} {{ opt[optionLabel] }}
</QItemLabel> </QItemLabel>
<QItemLabel caption v-if="getCaption(opt)"> <QItemLabel caption v-if="getCaption(opt) !== false">
{{ `#${getCaption(opt)}` }} {{ `#${getCaption(opt)}` }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>

View File

@ -0,0 +1,50 @@
import { createWrapper } from 'app/test/vitest/helper';
import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
describe('VnBankDetail Component', () => {
let vm;
let wrapper;
const bankEntities = [
{ id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
{ id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
];
const correctIban = 'ES6621000418401234567891';
beforeAll(() => {
wrapper = createWrapper(VnBankDetailsForm, {
$props: {
iban: null,
bankEntityFk: null,
disableElement: false,
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic(correctIban);
expect(vm.bankEntityFk).toBe(2100);
});
it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic('ES1234567891324567891234');
expect(vm.bankEntityFk).toBe(null);
});
it('should not update bankEntityFk if IBAN country is not ES', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic('FR1420041010050500013M02606');
expect(vm.bankEntityFk).toBe(null);
});
});

View File

@ -35,7 +35,7 @@ describe('VnSmsDialog', () => {
expect.objectContaining({ expect.objectContaining({
message: 'You must enter a new password', message: 'You must enter a new password',
type: 'negative', type: 'negative',
}) }),
); );
}); });
@ -47,7 +47,7 @@ describe('VnSmsDialog', () => {
expect.objectContaining({ expect.objectContaining({
message: `Passwords don't match`, message: `Passwords don't match`,
type: 'negative', type: 'negative',
}) }),
); );
}); });

View File

@ -12,7 +12,9 @@ describe('VnDiscount', () => {
price: 100, price: 100,
quantity: 2, quantity: 2,
discount: 10, discount: 10,
} mana: 10,
promise: vi.fn(),
},
}).vm; }).vm;
}); });

View File

@ -41,10 +41,12 @@ describe('VnDms', () => {
companyFk: 2, companyFk: 2,
dmsTypeFk: 3, dmsTypeFk: 3,
description: 'This is a test description', description: 'This is a test description',
files: { files: [
{
name: 'example.txt', name: 'example.txt',
content: new Blob(['file content'], { type: 'text/plain' }), content: new Blob(['file content'], { type: 'text/plain' }),
}, },
],
}; };
const expectedBody = { const expectedBody = {
@ -83,7 +85,7 @@ describe('VnDms', () => {
it('should map DMS data correctly and add file to FormData', () => { it('should map DMS data correctly and add file to FormData', () => {
const [formData, params] = vm.mapperDms(data); const [formData, params] = vm.mapperDms(data);
expect(formData.get('example.txt')).toBe(data.files); expect([formData.get('example.txt')]).toStrictEqual(data.files);
expect(expectedBody).toEqual(params.params); expect(expectedBody).toEqual(params.params);
}); });

View File

@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
import { vi, describe, expect, it } from 'vitest'; import { vi, describe, expect, it } from 'vitest';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
describe('VnInput', () => { describe('VnInput', () => {
let vm; let vm;
let wrapper; let wrapper;
@ -12,25 +11,27 @@ describe('VnInput', () => {
wrapper = createWrapper(VnInput, { wrapper = createWrapper(VnInput, {
props: { props: {
modelValue: value, modelValue: value,
isOutlined, emptyToNull, insertable, isOutlined,
maxlength: 101 emptyToNull,
insertable,
maxlength: 101,
}, },
attrs: { attrs: {
label: 'test', label: 'test',
required: true, required: true,
maxlength: 101, maxlength: 101,
maxLength: 10, maxLength: 10,
'max-length':20 'max-length': 20,
}, },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;
input = wrapper.find('[data-cy="test_input"]'); input = wrapper.find('[data-cy="test_input"]');
}; }
describe('value', () => { describe('value', () => {
it('should emit update:modelValue when value changes', async () => { it('should emit update:modelValue when value changes', async () => {
generateWrapper('12345', false, false, true) generateWrapper('12345', false, false, true);
await input.setValue('123'); await input.setValue('123');
expect(wrapper.emitted('update:modelValue')).toBeTruthy(); expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']); expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@ -62,7 +63,6 @@ describe('VnInput', () => {
expect(wrapper.emitted('update:modelValue')).toBeUndefined(); expect(wrapper.emitted('update:modelValue')).toBeUndefined();
const spyhandler = vi.spyOn(vm, 'handleInsertMode'); const spyhandler = vi.spyOn(vm, 'handleInsertMode');
expect(spyhandler).not.toHaveBeenCalled(); expect(spyhandler).not.toHaveBeenCalled();
}); });
/* /*
@ -71,7 +71,7 @@ describe('VnInput', () => {
it.skip('handleKeydown respects insertable behavior', async () => { it.skip('handleKeydown respects insertable behavior', async () => {
const expectedValue = '12345'; const expectedValue = '12345';
generateWrapper('1234', false, false, true); generateWrapper('1234', false, false, true);
vm.focus() vm.focus();
await input.trigger('keydown', { key: '5' }); await input.trigger('keydown', { key: '5' });
await vm.$nextTick(); await vm.$nextTick();
expect(wrapper.emitted('update:modelValue')).toBeTruthy(); expect(wrapper.emitted('update:modelValue')).toBeTruthy();

View File

@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
let vm; let vm;
let wrapper; let wrapper;
function generateWrapper(date, outlined, required) { function generateWrapper(outlined = false, required = false) {
wrapper = createWrapper(VnInputDate, { wrapper = createWrapper(VnInputDate, {
props: { props: {
modelValue: date, modelValue: '2000-12-31T23:00:00.000Z',
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
}, },
attrs: { attrs: {
isOutlined: outlined, isOutlined: outlined,
required: required required: required,
}, },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;
}; }
describe('VnInputDate', () => { describe('VnInputDate', () => {
describe('formattedDate', () => { describe('formattedDate', () => {
it('formats a valid date correctly', async () => { it('validateAndCleanInput should remove non-numeric characters', async () => {
generateWrapper('2023-12-25', false, false); generateWrapper();
vm.validateAndCleanInput('10a/1s2/2dd0a23');
await vm.$nextTick(); await vm.$nextTick();
expect(vm.formattedDate).toBe('25/12/2023'); expect(vm.inputValue).toBe('10/12/2023');
}); });
it('updates the model value when a new date is set', async () => { it('manageDate should reverse the date', async () => {
const input = wrapper.find('input'); generateWrapper();
await input.setValue('31/12/2023'); vm.manageDate('10/12/2023');
expect(wrapper.emitted()['update:modelValue']).toBeTruthy(); await vm.$nextTick();
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z'); expect(vm.inputValue).toBe('2023/12/10');
}); });
it('should not update the model value when an invalid date is set', async () => { it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
const input = wrapper.find('input'); const input = wrapper.find('input');
await input.setValue('invalid-date'); await input.setValue('25.12/2002');
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z'); await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
});
it('should format the date correctly when a valid date is entered with short year', async () => {
const input = wrapper.find('input');
await input.setValue('31.12-23');
await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
});
it('should format the date correctly when a valid date is entered without year', async () => {
const input = wrapper.find('input');
await input.setValue('12.03');
await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
}); });
}); });
describe('styleAttrs', () => { describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => { it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25', false, false); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
expect(vm.styleAttrs).toEqual({}); expect(vm.styleAttrs).toEqual({});
}); });
it('should set styleAttrs when isOutlined is true', async () => { it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25', true, false); generateWrapper(true, false);
await vm.$nextTick(); await vm.$nextTick();
expect(vm.styleAttrs.outlined).toBe(true); expect(vm.styleAttrs.outlined).toBe(true);
}); });
@ -58,13 +77,13 @@ describe('VnInputDate', () => {
describe('required', () => { describe('required', () => {
it('should not applies required class when isRequired is false', async () => { it('should not applies required class when isRequired is false', async () => {
generateWrapper('2023-12-25', false, false); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required'); expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
}); });
it('should applies required class when isRequired is true', async () => { it('should applies required class when isRequired is true', async () => {
generateWrapper('2023-12-25', false, true); generateWrapper(false, true);
await vm.$nextTick(); await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).toContain('required'); expect(wrapper.find('.vn-input-date').classes()).toContain('required');
}); });

View File

@ -33,7 +33,7 @@ describe('VnInputDateTime', () => {
it('handles null date value', async () => { it('handles null date value', async () => {
generateWrapper(null, false, true); generateWrapper(null, false, true);
await vm.$nextTick(); await vm.$nextTick();
expect(vm.selectedDate).toBeInstanceOf(Date); expect(vm.selectedDate).not.toBe(null);
}); });
it('updates the model value when a new datetime is set', async () => { it('updates the model value when a new datetime is set', async () => {

View File

@ -6,8 +6,8 @@ function buildComponent(data) {
return createWrapper(VnLocation, { return createWrapper(VnLocation, {
global: { global: {
props: { props: {
location: data location: data,
} },
}, },
}).vm; }).vm;
} }
@ -24,7 +24,7 @@ describe('formatLocation', () => {
postcode: '46680', postcode: '46680',
city: 'Algemesi', city: 'Algemesi',
province: { name: 'Valencia' }, province: { name: 'Valencia' },
country: { name: 'Spain' } country: { name: 'Spain' },
}; };
}); });
@ -47,7 +47,12 @@ describe('formatLocation', () => {
}); });
it('should return the country', () => { it('should return the country', () => {
const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined }; const location = {
...locationBase,
postcode: undefined,
city: undefined,
province: undefined,
};
const vm = buildComponent(location); const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('Spain'); expect(vm.formatLocation(location)).toEqual('Spain');
}); });
@ -61,7 +66,7 @@ describe('showLabel', () => {
code: '46680', code: '46680',
town: 'Algemesi', town: 'Algemesi',
province: 'Valencia', province: 'Valencia',
country: 'Spain' country: 'Spain',
}; };
}); });
@ -84,7 +89,12 @@ describe('showLabel', () => {
}); });
it('should show the label with country', () => { it('should show the label with country', () => {
const location = { ...locationBase, code: undefined, town: undefined, province: undefined }; const location = {
...locationBase,
code: undefined,
town: undefined,
province: undefined,
};
const vm = buildComponent(location); const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('Spain'); expect(vm.showLabel(location)).toEqual('Spain');
}); });

View File

@ -90,8 +90,10 @@ describe('VnLog', () => {
vm = createWrapper(VnLog, { vm = createWrapper(VnLog, {
global: { global: {
stubs: ['VnUserLink'], stubs: ['FetchData', 'vue-i18n', 'VnUserLink'],
mocks: {}, mocks: {
fetch: vi.fn(),
},
}, },
propsData: { propsData: {
model: 'Claim', model: 'Claim',

View File

@ -26,7 +26,7 @@ describe('VnNotes', () => {
) { ) {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] }); vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
wrapper = createWrapper(VnNotes, { wrapper = createWrapper(VnNotes, {
propsData: options, propsData: { ...defaultOptions, ...options },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;

View File

@ -2,13 +2,14 @@ import { createWrapper } from 'app/test/vitest/helper';
import VnSmsDialog from 'components/common/VnSmsDialog.vue'; import VnSmsDialog from 'components/common/VnSmsDialog.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest'; import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
describe('VnSmsDialog', () => { describe('VnSmsDialog', () => {
let vm; let vm;
const orderId = 1; const orderId = 1;
const shipped = new Date(); const shipped = new Date();
const phone = '012345678'; const phone = '012345678';
const promise = (response) => {return response;}; const promise = (response) => {
return response;
};
const template = 'minAmount'; const template = 'minAmount';
const locale = 'en'; const locale = 'en';
@ -17,13 +18,13 @@ describe('VnSmsDialog', () => {
propsData: { propsData: {
data: { data: {
orderId, orderId,
shipped shipped,
}, },
template, template,
locale, locale,
phone, phone,
promise promise,
} },
}).vm; }).vm;
}); });
@ -35,7 +36,9 @@ describe('VnSmsDialog', () => {
it('should update the message value with the correct template and parameters', () => { it('should update the message value with the correct template and parameters', () => {
vm.updateMessage(); vm.updateMessage();
expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`); expect(vm.message).toEqual(
`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`,
);
}); });
}); });
@ -47,7 +50,7 @@ describe('VnSmsDialog', () => {
orderId, orderId,
shipped, shipped,
destination: phone, destination: phone,
message: vm.message message: vm.message,
}; };
await vm.send(); await vm.send();

View File

@ -17,7 +17,7 @@ const token = getTokenMultimedia();
const { t } = useI18n(); const { t } = useI18n();
const src = computed( const src = computed(
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}` () => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`,
); );
const title = computed(() => $props.title?.toUpperCase() || t('globals.system')); const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
const showLetter = ref(false); const showLetter = ref(false);

View File

@ -89,6 +89,7 @@ function cancel() {
<slot name="customHTML"></slot> <slot name="customHTML"></slot>
</QCardSection> </QCardSection>
<QCardActions align="right"> <QCardActions align="right">
<slot name="actions" :actions="{ confirm, cancel }">
<QBtn <QBtn
:label="t('globals.cancel')" :label="t('globals.cancel')"
color="primary" color="primary"
@ -107,6 +108,7 @@ function cancel() {
autofocus autofocus
data-cy="VnConfirm_confirm" data-cy="VnConfirm_confirm"
/> />
</slot>
</QCardActions> </QCardActions>
</QCard> </QCard>
</QDialog> </QDialog>

View File

@ -212,6 +212,7 @@ const getLocale = (label) => {
color="primary" color="primary"
style="position: fixed; z-index: 1; right: 0; bottom: 0" style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search" icon="search"
data-cy="vnFilterPanel_search"
@click="search()" @click="search()"
> >
<QTooltip bottom anchor="bottom right"> <QTooltip bottom anchor="bottom right">
@ -229,6 +230,7 @@ const getLocale = (label) => {
<QItemSection top side> <QItemSection top side>
<QBtn <QBtn
@click="clearFilters" @click="clearFilters"
data-cy="clearFilters"
color="primary" color="primary"
dense dense
flat flat
@ -292,6 +294,7 @@ const getLocale = (label) => {
</QList> </QList>
</QForm> </QForm>
<QInnerLoading <QInnerLoading
data-cy="filterPanel-spinner"
:label="t('globals.pleaseWait')" :label="t('globals.pleaseWait')"
:showing="isLoading" :showing="isLoading"
color="primary" color="primary"

View File

@ -13,7 +13,7 @@ const src = computed({
get() { get() {
return new URL( return new URL(
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`, `../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
import.meta.url import.meta.url,
).href; ).href;
}, },
}); });

View File

@ -1,10 +1,11 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { ref, reactive, useAttrs, computed } from 'vue'; import { ref, reactive, useAttrs, computed, onMounted, nextTick } from 'vue';
import { onBeforeRouteLeave } from 'vue-router'; import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { tMobile } from 'src/composables/tMobile';
import { toDateHourMin } from 'src/filters'; import { toDateHourMin } from 'src/filters';
import VnPaginate from 'components/ui/VnPaginate.vue'; import VnPaginate from 'components/ui/VnPaginate.vue';
@ -33,20 +34,47 @@ const $props = defineProps({
addNote: { type: Boolean, default: false }, addNote: { type: Boolean, default: false },
selectType: { type: Boolean, default: false }, selectType: { type: Boolean, default: false },
justInput: { type: Boolean, default: false }, justInput: { type: Boolean, default: false },
goTo: { type: String, default: '' },
useUserRelation: { type: Boolean, default: true },
}); });
const { t } = useI18n(); const { t } = useI18n();
const quasar = useQuasar(); const quasar = useQuasar();
const stateStore = useStateStore();
const router = useRouter();
const route = useRoute();
const componentIsRendered = ref(false);
const newNote = reactive({ text: null, observationTypeFk: null }); const newNote = reactive({ text: null, observationTypeFk: null });
const observationTypes = ref([]); const observationTypes = ref([]);
const vnPaginateRef = ref(); const vnPaginateRef = ref();
const defaultObservationType = computed(() => const defaultObservationType = computed(
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id () => observationTypes.value.find((ot) => ot.code === 'salesPerson')?.id,
); );
let savedNote = false;
let originalText; let originalText;
onBeforeRouteLeave((to, from, next) => {
if (
(newNote.text && !$props.justInput) ||
(newNote.text !== originalText && $props.justInput)
)
quasar.dialog({
component: VnConfirm,
componentProps: {
title: t('globals.unsavedPopup.title'),
message: t('globals.unsavedPopup.subtitle'),
promise: () => next(),
},
});
else next();
});
onMounted(() => {
nextTick(() => (componentIsRendered.value = true));
});
function handleClick(e) { function handleClick(e) {
if (e.shiftKey && e.key === 'Enter') return; if (e.shiftKey && e.key === 'Enter') return;
if ($props.justInput) confirmAndUpdate(); if ($props.justInput) confirmAndUpdate();
@ -68,6 +96,7 @@ async function insert() {
}; };
await axios.post($props.url, newBody); await axios.post($props.url, newBody);
await vnPaginateRef.value.fetch(); await vnPaginateRef.value.fetch();
savedNote = true;
} }
function confirmAndUpdate() { function confirmAndUpdate() {
@ -100,22 +129,6 @@ async function update() {
); );
} }
onBeforeRouteLeave((to, from, next) => {
if (
(newNote.text && !$props.justInput) ||
(newNote.text !== originalText && $props.justInput)
)
quasar.dialog({
component: VnConfirm,
componentProps: {
title: t('globals.unsavedPopup.title'),
message: t('globals.unsavedPopup.subtitle'),
promise: () => next(),
},
});
else next();
});
function fetchData([data]) { function fetchData([data]) {
newNote.text = data?.notes; newNote.text = data?.notes;
originalText = data?.notes; originalText = data?.notes;
@ -129,8 +142,66 @@ const handleObservationTypes = (data) => {
} }
}; };
async function saveAndGo() {
savedNote = false;
await insert();
router.push({ path: $props.goTo });
}
function getUserFilter() {
const newUserFilter = $props.userFilter ?? {};
const userInclude = {
relation: 'user',
scope: {
fields: ['id', 'nickname', 'name'],
},
};
if (newUserFilter.include) {
if (Array.isArray(newUserFilter.include)) {
newUserFilter.include.push(userInclude);
} else {
newUserFilter.include = [userInclude, newUserFilter.include];
}
} else {
newUserFilter.include = userInclude;
}
if ($props.useUserRelation) {
return {
...newUserFilter,
...$props.userFilter,
};
}
return $props.filter;
}
</script> </script>
<template> <template>
<Teleport
to="#st-actions"
v-if="
stateStore?.isSubToolbarShown() &&
componentIsRendered &&
$props.goTo &&
!route.path.includes('summary')
"
>
<QBtn
:label="
tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
color="primary"
icon="save"
@click="saveAndGo"
data-cy="saveContinueNoteButton"
/>
</Teleport>
<FetchData <FetchData
v-if="selectType" v-if="selectType"
url="ObservationTypes" url="ObservationTypes"
@ -176,7 +247,7 @@ const handleObservationTypes = (data) => {
:required="'required' in originalAttrs" :required="'required' in originalAttrs"
clearable clearable
> >
<template #append> <template #append v-if="!$props.goTo">
<QBtn <QBtn
:title="t('Save (Enter)')" :title="t('Save (Enter)')"
icon="save" icon="save"
@ -198,16 +269,14 @@ const handleObservationTypes = (data) => {
:url="$props.url" :url="$props.url"
order="created DESC" order="created DESC"
:limit="0" :limit="0"
:user-filter="userFilter" :user-filter="getUserFilter()"
:filter="filter" :filter="filter"
auto-load auto-load
ref="vnPaginateRef" ref="vnPaginateRef"
class="show" class="show"
v-bind="$attrs" v-bind="$attrs"
:search-url="false" :search-url="false"
@on-fetch=" @on-fetch="newNote.text = ''"
newNote.text = '';
"
> >
<template #body="{ rows }"> <template #body="{ rows }">
<TransitionGroup name="list" tag="div" class="column items-center full-width"> <TransitionGroup name="list" tag="div" class="column items-center full-width">
@ -219,15 +288,15 @@ const handleObservationTypes = (data) => {
<QCardSection horizontal> <QCardSection horizontal>
<VnAvatar <VnAvatar
:descriptor="false" :descriptor="false"
:worker-id="note.workerFk" :worker-id="note.user?.id"
size="md" size="md"
:title="note.worker?.user.nickname" :title="note.user?.nickname"
/> />
<div class="full-width row justify-between q-pa-xs"> <div class="full-width row justify-between q-pa-xs">
<div> <div>
<VnUserLink <VnUserLink
:name="`${note.worker.user.name}`" :name="`${note.user?.name}`"
:worker-id="note.worker.id" :worker-id="note.user?.id"
/> />
<QBadge <QBadge
class="q-ml-xs" class="q-ml-xs"

View File

@ -2,7 +2,9 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { useAttrs } from 'vue';
const attrs = useAttrs();
const { t } = useI18n(); const { t } = useI18n();
const props = defineProps({ const props = defineProps({
@ -67,7 +69,7 @@ const props = defineProps({
default: null, default: null,
}, },
searchUrl: { searchUrl: {
type: String, type: [String, Boolean],
default: null, default: null,
}, },
disableInfiniteScroll: { disableInfiniteScroll: {
@ -75,7 +77,7 @@ const props = defineProps({
default: false, default: false,
}, },
mapKey: { mapKey: {
type: String, type: [String, Boolean],
default: '', default: '',
}, },
keyData: { keyData: {
@ -144,14 +146,14 @@ const addFilter = async (filter, params) => {
}; };
async function fetch(params) { async function fetch(params) {
useArrayData(props.dataKey, params); arrayData.setOptions(params);
arrayData.resetPagination(); arrayData.resetPagination();
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });
return emitStoreData(); return emitStoreData();
} }
async function update(params) { async function update(params) {
useArrayData(props.dataKey, params); arrayData.setOptions(params);
const { limit, skip } = store; const { limit, skip } = store;
store.limit = limit + skip; store.limit = limit + skip;
store.skip = 0; store.skip = 0;

View File

@ -46,7 +46,7 @@ const props = defineProps({
default: null, default: null,
}, },
order: { order: {
type: String, type: [String, Array],
default: '', default: '',
}, },
limit: { limit: {

View File

@ -87,7 +87,7 @@ function formatNumber(number) {
<QItemLabel caption>{{ <QItemLabel caption>{{
date.formatDate( date.formatDate(
row.sms.created, row.sms.created,
'YYYY-MM-DD HH:mm:ss' 'YYYY-MM-DD HH:mm:ss',
) )
}}</QItemLabel> }}</QItemLabel>
<QItemLabel class="row center"> <QItemLabel class="row center">

View File

@ -37,8 +37,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
class="justify-end sticky" class="justify-end sticky"
> >
<slot name="st-data"> <slot name="st-data">
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }"> <div id="st-data" :class="{ 'full-width': !actionsChildCount() }"></div>
</div>
</slot> </slot>
<QSpace /> <QSpace />
<slot name="st-actions"> <slot name="st-actions">

View File

@ -23,10 +23,15 @@ describe('CardSummary', () => {
beforeEach(() => { beforeEach(() => {
wrapper = createWrapper(CardSummary, { wrapper = createWrapper(CardSummary, {
global: {
mocks: {
validate: vi.fn(),
},
},
propsData: { propsData: {
dataKey: 'cardSummaryKey', dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl', url: 'cardSummaryUrl',
filter: 'cardFilter', filter: { key: 'cardFilter' },
}, },
}); });
vm = wrapper.vm; vm = wrapper.vm;
@ -50,7 +55,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => { it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl'); expect(vm.store.url).toEqual('cardSummaryUrl');
expect(vm.store.filter).toEqual('cardFilter'); expect(vm.store.filter).toEqual({ key: 'cardFilter' });
}); });
it('should respond to prop changes and refetch data', async () => { it('should respond to prop changes and refetch data', async () => {

View File

@ -12,12 +12,12 @@ function generateWrapper(storage = 'images') {
id: 123, id: 123,
zoomResolution: '400x400', zoomResolution: '400x400',
storage, storage,
} },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;
vm.timeStamp = 'timestamp'; vm.timeStamp = 'timestamp';
}; }
vi.mock('src/composables/useSession', () => ({ vi.mock('src/composables/useSession', () => ({
useSession: () => ({ useSession: () => ({
@ -31,7 +31,6 @@ vi.mock('src/composables/useRole', () => ({
}), }),
})); }));
describe('VnImg', () => { describe('VnImg', () => {
beforeEach(() => { beforeEach(() => {
isEmployeeMock.mockReset(); isEmployeeMock.mockReset();
@ -63,7 +62,9 @@ describe('VnImg', () => {
generateWrapper(); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
const url = vm.getUrl(); const url = vm.getUrl();
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp'); expect(url).toBe(
'/api/images/catalog/200x200/123/download?access_token=token&timestamp',
);
}); });
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => { it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
@ -71,7 +72,9 @@ describe('VnImg', () => {
generateWrapper(); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
const url = vm.getUrl(true); const url = vm.getUrl(true);
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp'); expect(url).toBe(
'/api/images/catalog/400x400/123/download?access_token=token&timestamp',
);
}); });
}); });

View File

@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
vm.searchText = searchText; vm.searchText = searchText;
vm.arrayData.store.userParams = userParams; vm.arrayData.store.userParams = userParams;
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {}); applyFilterSpy = vi
.spyOn(vm.arrayData, 'applyFilter')
.mockImplementation(() => {});
}); });
afterEach(() => { afterEach(() => {
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
}); });
it('search resets pagination and applies filter', async () => { it('search resets pagination and applies filter', async () => {
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {}); const resetPaginationSpy = vi
.spyOn(vm.arrayData, 'resetPagination')
.mockImplementation(() => {});
await vm.search(); await vm.search();
expect(resetPaginationSpy).toHaveBeenCalled(); expect(resetPaginationSpy).toHaveBeenCalled();

View File

@ -1,5 +1,4 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest'; import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper'; import { createWrapper } from 'app/test/vitest/helper';
import VnSms from 'src/components/ui/VnSms.vue'; import VnSms from 'src/components/ui/VnSms.vue';
@ -12,6 +11,9 @@ describe('VnSms', () => {
stubs: ['VnPaginate'], stubs: ['VnPaginate'],
mocks: {}, mocks: {},
}, },
propsData: {
url: 'SmsUrl',
},
}).vm; }).vm;
}); });

View File

@ -53,26 +53,26 @@ describe('useAcl', () => {
expect( expect(
acl.hasAny([ acl.hasAny([
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' }, { model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
]) ]),
).toBeFalsy(); ).toBeFalsy();
}); });
it('should return false if no roles matched', async () => { it('should return false if no roles matched', async () => {
expect( expect(
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]) acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]),
).toBeTruthy(); ).toBeTruthy();
}); });
describe('*', () => { describe('*', () => {
it('should return true if an acl matched', async () => { it('should return true if an acl matched', async () => {
expect( expect(
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]) acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]),
).toBeTruthy(); ).toBeTruthy();
}); });
it('should return false if no acls matched', async () => { it('should return false if no acls matched', async () => {
expect( expect(
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]) acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]),
).toBeFalsy(); ).toBeFalsy();
}); });
}); });
@ -80,13 +80,15 @@ describe('useAcl', () => {
describe('$authenticated', () => { describe('$authenticated', () => {
it('should return false if no acls matched', async () => { it('should return false if no acls matched', async () => {
expect( expect(
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]) acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]),
).toBeFalsy(); ).toBeFalsy();
}); });
it('should return true if an acl matched', async () => { it('should return true if an acl matched', async () => {
expect( expect(
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }]) acl.hasAny([
{ model: 'Url', props: 'getByUser', accessType: 'READ' },
]),
).toBeTruthy(); ).toBeTruthy();
}); });
}); });
@ -96,7 +98,7 @@ describe('useAcl', () => {
expect( expect(
acl.hasAny([ acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' }, { model: 'TpvTransaction', props: 'start', accessType: 'READ' },
]) ]),
).toBeFalsy(); ).toBeFalsy();
}); });
@ -104,7 +106,7 @@ describe('useAcl', () => {
expect( expect(
acl.hasAny([ acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' }, { model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
]) ]),
).toBeTruthy(); ).toBeTruthy();
}); });
}); });

View File

@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router'; import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia'; import { setActivePinia, createPinia } from 'pinia';
import { defineComponent, h } from 'vue';
import { mount } from '@vue/test-utils';
describe('useArrayData', () => { describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}'; const filter = '{"limit":20,"skip":0}';
@ -43,7 +45,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => { it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] }); vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
searchUrl: 'params', searchUrl: 'params',
}); });
@ -72,7 +74,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }], data: [{ id: 1 }],
}); });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
navigate: {}, navigate: {},
}); });
@ -94,7 +96,7 @@ describe('useArrayData', () => {
], ],
}); });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
oneRecord: true, oneRecord: true,
}); });
@ -107,3 +109,17 @@ describe('useArrayData', () => {
}); });
}); });
}); });
function mountArrayData(...args) {
let arrayData;
const TestComponent = defineComponent({
setup() {
arrayData = useArrayData(...args);
return () => h('div');
},
});
const asd = mount(TestComponent);
return arrayData;
}

View File

@ -64,9 +64,7 @@ describe('session', () => {
}); });
}); });
describe( describe('login', () => {
'login',
() => {
const expectedUser = { const expectedUser = {
id: 999, id: 999,
name: `T'Challa`, name: `T'Challa`,
@ -143,9 +141,7 @@ describe('session', () => {
await session.destroy(); // this clears token and user for any other test await session.destroy(); // this clears token and user for any other test
}); });
}, });
{},
);
describe('RenewToken', () => { describe('RenewToken', () => {
const expectedToken = 'myToken'; const expectedToken = 'myToken';

View File

@ -18,7 +18,7 @@ export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile',
export async function downloadDocuware(url, params) { export async function downloadDocuware(url, params) {
const appUrl = await getAppUrl(); const appUrl = await getAppUrl();
const response = await axios.get(`${appUrl}/api/` + url, { const response = await axios.get(`${appUrl}/api/${url}`, {
responseType: 'blob', responseType: 'blob',
params, params,
}); });

View File

@ -20,5 +20,5 @@ export function getColAlign(col) {
if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center'; if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
return 'text-' + (align ?? 'center'); return `text-${align ?? 'center'}`;
} }

View File

@ -1,10 +1,10 @@
export function getDateQBadgeColor(date) { export function getDateQBadgeColor(date) {
let today = Date.vnNew(); const today = Date.vnNew();
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date); const timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0); timeTicket.setHours(0, 0, 0, 0);
let comparation = today - timeTicket; const comparation = today - timeTicket;
if (comparation == 0) return 'warning'; if (comparation == 0) return 'warning';
if (comparation < 0) return 'success'; if (comparation < 0) return 'success';

View File

@ -0,0 +1,9 @@
import { ref } from 'vue';
import moment from 'moment';
export default function useWeekdaysOrder() {
const firstDay = moment().weekday(1).day();
const weekdays = [...Array(7).keys()].map((i) => (i + firstDay) % 7);
return ref(weekdays);
}

View File

@ -7,7 +7,7 @@ export async function beforeSave(data, getChanges, modelOrigin) {
const patchPromises = []; const patchPromises = [];
for (const change of changes) { for (const change of changes) {
let patchData = {}; const patchData = {};
if ('hasMinPrice' in change.data) { if ('hasMinPrice' in change.data) {
patchData.hasMinPrice = change.data?.hasMinPrice; patchData.hasMinPrice = change.data?.hasMinPrice;

View File

@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
let canceller = null; let canceller = null;
onMounted(() => { onMounted(() => {
setOptions(); setOptions(userOptions ?? {});
reset(['skip']); reset(['skip']);
const query = route.query; const query = route.query;
@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) {
setCurrentFilter(); setCurrentFilter();
}); });
if (key && userOptions) setOptions(); if (userOptions) setOptions(userOptions);
function setOptions() { function setOptions(params) {
if (!params) return;
const allowedOptions = [ const allowedOptions = [
'url', 'url',
'filter', 'filter',
@ -57,14 +58,14 @@ export function useArrayData(key, userOptions) {
'mapKey', 'mapKey',
'oneRecord', 'oneRecord',
]; ];
if (typeof userOptions === 'object') { if (typeof params === 'object') {
for (const option in userOptions) { for (const option in params) {
const isEmpty = userOptions[option] == null || userOptions[option] === ''; const isEmpty = params[option] == null || params[option] === '';
if (isEmpty || !allowedOptions.includes(option)) continue; if (isEmpty || !allowedOptions.includes(option)) continue;
if (Object.hasOwn(store, option)) { if (Object.hasOwn(store, option)) {
const defaultOpts = userOptions[option]; const defaultOpts = params[option];
store[option] = userOptions.keepOpts?.includes(option) store[option] = params.keepOpts?.includes(option)
? Object.assign(defaultOpts, store[option]) ? Object.assign(defaultOpts, store[option])
: defaultOpts; : defaultOpts;
if (option === 'userParams') store.defaultParams = store[option]; if (option === 'userParams') store.defaultParams = store[option];
@ -367,5 +368,6 @@ export function useArrayData(key, userOptions) {
deleteOption, deleteOption,
reset, reset,
resetPagination, resetPagination,
setOptions,
}; };
} }

View File

@ -3,5 +3,4 @@ import { useQuasar } from 'quasar';
export default function () { export default function () {
const quasar = useQuasar(); const quasar = useQuasar();
return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs'; return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs';
} }

View File

@ -6,7 +6,7 @@ export function djb2a(string) {
} }
export function useColor(value) { export function useColor(value) {
return '#' + colors[djb2a(value || '') % colors.length]; return `#${colors[djb2a(value || '') % colors.length]}`;
} }
const colors = [ const colors = [

View File

@ -15,18 +15,16 @@ export function usePrintService() {
message: t('globals.notificationSent'), message: t('globals.notificationSent'),
type: 'positive', type: 'positive',
icon: 'check', icon: 'check',
}) }),
); );
} }
function openReport(path, params, isNewTab = '_self') { function openReport(path, params, isNewTab = '_self') {
if (typeof params === 'string') params = JSON.parse(params); if (typeof params === 'string') params = JSON.parse(params);
params = Object.assign( params = {
{
access_token: getTokenMultimedia(), access_token: getTokenMultimedia(),
}, ...params,
params };
);
const query = new URLSearchParams(params).toString(); const query = new URLSearchParams(params).toString();
window.open(`api/${path}?${query}`, isNewTab); window.open(`api/${path}?${query}`, isNewTab);

View File

@ -17,7 +17,7 @@ export function useSession() {
let intervalId = null; let intervalId = null;
function setSession(data) { function setSession(data) {
let keepLogin = data.keepLogin; const keepLogin = data.keepLogin;
const storage = keepLogin ? localStorage : sessionStorage; const storage = keepLogin ? localStorage : sessionStorage;
storage.setItem(TOKEN, data.token); storage.setItem(TOKEN, data.token);
storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia); storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);

View File

@ -8,7 +8,7 @@ export function useVnConfirm() {
message, message,
promise, promise,
successFn, successFn,
customHTML = {} customHTML = {},
) => { ) => {
const { component, props } = customHTML; const { component, props } = customHTML;
Dialog.create({ Dialog.create({
@ -19,7 +19,7 @@ export function useVnConfirm() {
message: message, message: message,
promise: promise, promise: promise,
}, },
{ customHTML: () => h(component, props) } { customHTML: () => h(component, props) },
), ),
}).onOk(async () => { }).onOk(async () => {
if (successFn) successFn(); if (successFn) successFn();

View File

@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
.q-item__section--main ~ .q-item__section--side { .q-item__section--main ~ .q-item__section--side {
padding-inline: 0; padding-inline: 0;
} }
.calendars-header {
height: 45px;
display: flex;
justify-content: space-between;
align-items: center;
background-color: $primary;
font-weight: bold;
font-size: 16px;
}
.calendars-container {
max-width: 800px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,8 @@
@font-face { @font-face {
font-family: 'icon'; font-family: 'icon';
src: url('fonts/icon.eot?uocffs'); src: url('fonts/icon.eot?uocffs');
src: url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'), src:
url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?uocffs') format('truetype'), url('fonts/icon.ttf?uocffs') format('truetype'),
url('fonts/icon.woff?uocffs') format('woff'), url('fonts/icon.woff?uocffs') format('woff'),
url('fonts/icon.svg?uocffs#icon') format('svg'); url('fonts/icon.svg?uocffs#icon') format('svg');
@ -10,7 +11,8 @@
font-display: block; font-display: block;
} }
[class^="icon-"], [class*=" icon-"] { [class^='icon-'],
[class*=' icon-'] {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icon' !important; font-family: 'icon' !important;
speak: never; speak: never;
@ -26,428 +28,428 @@
} }
.icon-inactive-car:before { .icon-inactive-car:before {
content: "\e978"; content: '\e978';
} }
.icon-hasItemLost:before { .icon-hasItemLost:before {
content: "\e957"; content: '\e957';
} }
.icon-hasItemDelay:before { .icon-hasItemDelay:before {
content: "\e96d"; content: '\e96d';
} }
.icon-add_entries:before { .icon-add_entries:before {
content: "\e953"; content: '\e953';
} }
.icon-100:before { .icon-100:before {
content: "\e901"; content: '\e901';
} }
.icon-Client_unpaid:before { .icon-Client_unpaid:before {
content: "\e98c"; content: '\e98c';
} }
.icon-History:before { .icon-History:before {
content: "\e902"; content: '\e902';
} }
.icon-Person:before { .icon-Person:before {
content: "\e903"; content: '\e903';
} }
.icon-accessory:before { .icon-accessory:before {
content: "\e904"; content: '\e904';
} }
.icon-account:before { .icon-account:before {
content: "\e905"; content: '\e905';
} }
.icon-actions:before { .icon-actions:before {
content: "\e907"; content: '\e907';
} }
.icon-addperson:before { .icon-addperson:before {
content: "\e908"; content: '\e908';
} }
.icon-agencia_tributaria:before { .icon-agencia_tributaria:before {
content: "\e948"; content: '\e948';
} }
.icon-agency:before { .icon-agency:before {
content: "\e92a"; content: '\e92a';
} }
.icon-agency-term:before { .icon-agency-term:before {
content: "\e909"; content: '\e909';
} }
.icon-albaran:before { .icon-albaran:before {
content: "\e92c"; content: '\e92c';
} }
.icon-anonymous:before { .icon-anonymous:before {
content: "\e90b"; content: '\e90b';
} }
.icon-apps:before { .icon-apps:before {
content: "\e90c"; content: '\e90c';
} }
.icon-artificial:before { .icon-artificial:before {
content: "\e90d"; content: '\e90d';
} }
.icon-attach:before { .icon-attach:before {
content: "\e90e"; content: '\e90e';
} }
.icon-barcode:before { .icon-barcode:before {
content: "\e90f"; content: '\e90f';
} }
.icon-basket:before { .icon-basket:before {
content: "\e910"; content: '\e910';
} }
.icon-basketadd:before { .icon-basketadd:before {
content: "\e911"; content: '\e911';
} }
.icon-bin:before { .icon-bin:before {
content: "\e913"; content: '\e913';
} }
.icon-botanical:before { .icon-botanical:before {
content: "\e914"; content: '\e914';
} }
.icon-bucket:before { .icon-bucket:before {
content: "\e915"; content: '\e915';
} }
.icon-buscaman:before { .icon-buscaman:before {
content: "\e916"; content: '\e916';
} }
.icon-buyrequest:before { .icon-buyrequest:before {
content: "\e917"; content: '\e917';
} }
.icon-calc_volum .path1:before { .icon-calc_volum .path1:before {
content: "\e918"; content: '\e918';
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
} }
.icon-calc_volum .path2:before { .icon-calc_volum .path2:before {
content: "\e919"; content: '\e919';
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
} }
.icon-calc_volum .path3:before { .icon-calc_volum .path3:before {
content: "\e91c"; content: '\e91c';
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
} }
.icon-calc_volum .path4:before { .icon-calc_volum .path4:before {
content: "\e91d"; content: '\e91d';
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
} }
.icon-calc_volum .path5:before { .icon-calc_volum .path5:before {
content: "\e91e"; content: '\e91e';
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
} }
.icon-calc_volum .path6:before { .icon-calc_volum .path6:before {
content: "\e91f"; content: '\e91f';
margin-left: -1em; margin-left: -1em;
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
} }
.icon-calendar:before { .icon-calendar:before {
content: "\e920"; content: '\e920';
} }
.icon-catalog:before { .icon-catalog:before {
content: "\e921"; content: '\e921';
} }
.icon-claims:before { .icon-claims:before {
content: "\e922"; content: '\e922';
} }
.icon-client:before { .icon-client:before {
content: "\e923"; content: '\e923';
} }
.icon-clone:before { .icon-clone:before {
content: "\e924"; content: '\e924';
} }
.icon-columnadd:before { .icon-columnadd:before {
content: "\e925"; content: '\e925';
} }
.icon-columndelete:before { .icon-columndelete:before {
content: "\e926"; content: '\e926';
} }
.icon-components:before { .icon-components:before {
content: "\e927"; content: '\e927';
} }
.icon-consignatarios:before { .icon-consignatarios:before {
content: "\e928"; content: '\e928';
} }
.icon-control:before { .icon-control:before {
content: "\e929"; content: '\e929';
} }
.icon-credit:before { .icon-credit:before {
content: "\e92b"; content: '\e92b';
} }
.icon-defaulter:before { .icon-defaulter:before {
content: "\e92d"; content: '\e92d';
} }
.icon-deletedTicket:before { .icon-deletedTicket:before {
content: "\e92e"; content: '\e92e';
} }
.icon-deleteline:before { .icon-deleteline:before {
content: "\e92f"; content: '\e92f';
} }
.icon-delivery:before { .icon-delivery:before {
content: "\e930"; content: '\e930';
} }
.icon-deliveryprices:before { .icon-deliveryprices:before {
content: "\e932"; content: '\e932';
} }
.icon-details:before { .icon-details:before {
content: "\e933"; content: '\e933';
} }
.icon-dfiscales:before { .icon-dfiscales:before {
content: "\e934"; content: '\e934';
} }
.icon-disabled:before { .icon-disabled:before {
content: "\e935"; content: '\e935';
} }
.icon-doc:before { .icon-doc:before {
content: "\e936"; content: '\e936';
} }
.icon-entry:before { .icon-entry:before {
content: "\e937"; content: '\e937';
} }
.icon-entry_lastbuys:before { .icon-entry_lastbuys:before {
content: "\e91a"; content: '\e91a';
} }
.icon-exit:before { .icon-exit:before {
content: "\e938"; content: '\e938';
} }
.icon-eye:before { .icon-eye:before {
content: "\e939"; content: '\e939';
} }
.icon-fixedPrice:before { .icon-fixedPrice:before {
content: "\e93a"; content: '\e93a';
} }
.icon-flower:before { .icon-flower:before {
content: "\e93b"; content: '\e93b';
} }
.icon-frozen:before { .icon-frozen:before {
content: "\e93c"; content: '\e93c';
} }
.icon-fruit:before { .icon-fruit:before {
content: "\e93d"; content: '\e93d';
} }
.icon-funeral:before { .icon-funeral:before {
content: "\e93e"; content: '\e93e';
} }
.icon-grafana:before { .icon-grafana:before {
content: "\e906"; content: '\e906';
} }
.icon-greenery:before { .icon-greenery:before {
content: "\e93f"; content: '\e93f';
} }
.icon-greuge:before { .icon-greuge:before {
content: "\e940"; content: '\e940';
} }
.icon-grid:before { .icon-grid:before {
content: "\e941"; content: '\e941';
} }
.icon-handmade:before { .icon-handmade:before {
content: "\e942"; content: '\e942';
} }
.icon-handmadeArtificial:before { .icon-handmadeArtificial:before {
content: "\e943"; content: '\e943';
} }
.icon-headercol:before { .icon-headercol:before {
content: "\e945"; content: '\e945';
} }
.icon-info:before { .icon-info:before {
content: "\e946"; content: '\e946';
} }
.icon-inventory:before { .icon-inventory:before {
content: "\e947"; content: '\e947';
} }
.icon-invoice:before { .icon-invoice:before {
content: "\e968"; content: '\e968';
color: #5f5f5f; color: #5f5f5f;
} }
.icon-invoice-in:before { .icon-invoice-in:before {
content: "\e949"; content: '\e949';
} }
.icon-invoice-in-create:before { .icon-invoice-in-create:before {
content: "\e94a"; content: '\e94a';
} }
.icon-invoice-out:before { .icon-invoice-out:before {
content: "\e94b"; content: '\e94b';
} }
.icon-isTooLittle:before { .icon-isTooLittle:before {
content: "\e94c"; content: '\e94c';
} }
.icon-item:before { .icon-item:before {
content: "\e94d"; content: '\e94d';
} }
.icon-languaje:before { .icon-languaje:before {
content: "\e970"; content: '\e970';
} }
.icon-lines:before { .icon-lines:before {
content: "\e94e"; content: '\e94e';
} }
.icon-linesprepaired:before { .icon-linesprepaired:before {
content: "\e94f"; content: '\e94f';
} }
.icon-link-to-corrected:before { .icon-link-to-corrected:before {
content: "\e931"; content: '\e931';
} }
.icon-link-to-correcting:before { .icon-link-to-correcting:before {
content: "\e944"; content: '\e944';
} }
.icon-logout:before { .icon-logout:before {
content: "\e973"; content: '\e973';
} }
.icon-mana:before { .icon-mana:before {
content: "\e950"; content: '\e950';
} }
.icon-mandatory:before { .icon-mandatory:before {
content: "\e951"; content: '\e951';
} }
.icon-net:before { .icon-net:before {
content: "\e952"; content: '\e952';
} }
.icon-newalbaran:before { .icon-newalbaran:before {
content: "\e954"; content: '\e954';
} }
.icon-niche:before { .icon-niche:before {
content: "\e955"; content: '\e955';
} }
.icon-no036:before { .icon-no036:before {
content: "\e956"; content: '\e956';
} }
.icon-noPayMethod:before { .icon-noPayMethod:before {
content: "\e958"; content: '\e958';
} }
.icon-notes:before { .icon-notes:before {
content: "\e959"; content: '\e959';
} }
.icon-noweb:before { .icon-noweb:before {
content: "\e95a"; content: '\e95a';
} }
.icon-onlinepayment:before { .icon-onlinepayment:before {
content: "\e95b"; content: '\e95b';
} }
.icon-package:before { .icon-package:before {
content: "\e95c"; content: '\e95c';
} }
.icon-payment:before { .icon-payment:before {
content: "\e95d"; content: '\e95d';
} }
.icon-pbx:before { .icon-pbx:before {
content: "\e95e"; content: '\e95e';
} }
.icon-pets:before { .icon-pets:before {
content: "\e95f"; content: '\e95f';
} }
.icon-photo:before { .icon-photo:before {
content: "\e960"; content: '\e960';
} }
.icon-plant:before { .icon-plant:before {
content: "\e961"; content: '\e961';
} }
.icon-polizon:before { .icon-polizon:before {
content: "\e962"; content: '\e962';
} }
.icon-preserved:before { .icon-preserved:before {
content: "\e963"; content: '\e963';
} }
.icon-recovery:before { .icon-recovery:before {
content: "\e964"; content: '\e964';
} }
.icon-regentry:before { .icon-regentry:before {
content: "\e965"; content: '\e965';
} }
.icon-reserva:before { .icon-reserva:before {
content: "\e966"; content: '\e966';
} }
.icon-revision:before { .icon-revision:before {
content: "\e967"; content: '\e967';
} }
.icon-risk:before { .icon-risk:before {
content: "\e969"; content: '\e969';
} }
.icon-saysimple:before { .icon-saysimple:before {
content: "\e912"; content: '\e912';
} }
.icon-services:before { .icon-services:before {
content: "\e96a"; content: '\e96a';
} }
.icon-settings:before { .icon-settings:before {
content: "\e96b"; content: '\e96b';
} }
.icon-shipment:before { .icon-shipment:before {
content: "\e96c"; content: '\e96c';
} }
.icon-sign:before { .icon-sign:before {
content: "\e90a"; content: '\e90a';
} }
.icon-sms:before { .icon-sms:before {
content: "\e96e"; content: '\e96e';
} }
.icon-solclaim:before { .icon-solclaim:before {
content: "\e96f"; content: '\e96f';
} }
.icon-solunion:before { .icon-solunion:before {
content: "\e971"; content: '\e971';
} }
.icon-splitline:before { .icon-splitline:before {
content: "\e972"; content: '\e972';
} }
.icon-splur:before { .icon-splur:before {
content: "\e974"; content: '\e974';
} }
.icon-stowaway:before { .icon-stowaway:before {
content: "\e975"; content: '\e975';
} }
.icon-supplier:before { .icon-supplier:before {
content: "\e976"; content: '\e976';
} }
.icon-supplierfalse:before { .icon-supplierfalse:before {
content: "\e977"; content: '\e977';
} }
.icon-tags:before { .icon-tags:before {
content: "\e979"; content: '\e979';
} }
.icon-tax:before { .icon-tax:before {
content: "\e97a"; content: '\e97a';
} }
.icon-thermometer:before { .icon-thermometer:before {
content: "\e97b"; content: '\e97b';
} }
.icon-ticket:before { .icon-ticket:before {
content: "\e97c"; content: '\e97c';
} }
.icon-ticketAdd:before { .icon-ticketAdd:before {
content: "\e97e"; content: '\e97e';
} }
.icon-traceability:before { .icon-traceability:before {
content: "\e97f"; content: '\e97f';
} }
.icon-transaction:before { .icon-transaction:before {
content: "\e91b"; content: '\e91b';
} }
.icon-treatments:before { .icon-treatments:before {
content: "\e980"; content: '\e980';
} }
.icon-trolley:before { .icon-trolley:before {
content: "\e900"; content: '\e900';
} }
.icon-troncales:before { .icon-troncales:before {
content: "\e982"; content: '\e982';
} }
.icon-unavailable:before { .icon-unavailable:before {
content: "\e983"; content: '\e983';
} }
.icon-visible_columns:before { .icon-visible_columns:before {
content: "\e984"; content: '\e984';
} }
.icon-volume:before { .icon-volume:before {
content: "\e985"; content: '\e985';
} }
.icon-wand:before { .icon-wand:before {
content: "\e986"; content: '\e986';
} }
.icon-web:before { .icon-web:before {
content: "\e987"; content: '\e987';
} }
.icon-wiki:before { .icon-wiki:before {
content: "\e989"; content: '\e989';
} }
.icon-worker:before { .icon-worker:before {
content: "\e98a"; content: '\e98a';
} }
.icon-zone:before { .icon-zone:before {
content: "\e98b"; content: '\e98b';
} }

View File

@ -30,10 +30,12 @@ export function isValidDate(date) {
export function toDateFormat(date, locale = 'es-ES', opts = {}) { export function toDateFormat(date, locale = 'es-ES', opts = {}) {
if (!isValidDate(date)) return ''; if (!isValidDate(date)) return '';
const format = Object.assign( const format = {
{ year: 'numeric', month: '2-digit', day: '2-digit' }, year: 'numeric',
opts month: '2-digit',
); day: '2-digit',
...opts,
};
return new Date(date).toLocaleDateString(locale, format); return new Date(date).toLocaleDateString(locale, format);
} }
@ -104,17 +106,17 @@ export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
const hours = Math.floor(seconds / 3600); const hours = Math.floor(seconds / 3600);
const remainingMinutes = seconds % 3600; const remainingMinutes = seconds % 3600;
const minutes = Math.floor(remainingMinutes / 60); const minutes = Math.floor(remainingMinutes / 60);
const formattedHours = hours < 10 ? '0' + hours : hours; const formattedHours = hours < 10 ? `0${hours}` : hours;
const formattedMinutes = minutes < 10 ? '0' + minutes : minutes; const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
// Append "h." if includeHSuffix is true // Append "h." if includeHSuffix is true
const suffix = includeHSuffix ? ' h.' : ''; const suffix = includeHSuffix ? ' h.' : '';
// Return formatted string // Return formatted string
return formattedHours + ':' + formattedMinutes + suffix; return `${formattedHours}:${formattedMinutes}${suffix}`;
} }
export function getTimeDifferenceWithToday(date) { export function getTimeDifferenceWithToday(date) {
let today = Date.vnNew(); const today = Date.vnNew();
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
date = new Date(date); date = new Date(date);

View File

@ -5,12 +5,12 @@
* @return {Object} The fields as object * @return {Object} The fields as object
*/ */
function fieldsToObject(fields) { function fieldsToObject(fields) {
let fieldsObj = {}; const fieldsObj = {};
if (Array.isArray(fields)) { if (Array.isArray(fields)) {
for (let field of fields) fieldsObj[field] = true; for (const field of fields) fieldsObj[field] = true;
} else if (typeof fields == 'object') { } else if (typeof fields == 'object') {
for (let field in fields) { for (const field in fields) {
if (fields[field]) fieldsObj[field] = true; if (fields[field]) fieldsObj[field] = true;
} }
} }
@ -26,7 +26,7 @@ function fieldsToObject(fields) {
* @return {Array} The merged fields as an array * @return {Array} The merged fields as an array
*/ */
function mergeFields(src, dst) { function mergeFields(src, dst) {
let fields = {}; const fields = {};
Object.assign(fields, fieldsToObject(src), fieldsToObject(dst)); Object.assign(fields, fieldsToObject(src), fieldsToObject(dst));
return Object.keys(fields); return Object.keys(fields);
} }
@ -39,7 +39,7 @@ function mergeFields(src, dst) {
* @return {Array} The merged wheres * @return {Array} The merged wheres
*/ */
function mergeWhere(src, dst) { function mergeWhere(src, dst) {
let and = []; const and = [];
if (src) and.push(src); if (src) and.push(src);
if (dst) and.push(dst); if (dst) and.push(dst);
return simplifyOperation(and, 'and'); return simplifyOperation(and, 'and');
@ -53,7 +53,7 @@ function mergeWhere(src, dst) {
* @return {Object} The result filter * @return {Object} The result filter
*/ */
function mergeFilters(src, dst) { function mergeFilters(src, dst) {
let res = Object.assign({}, dst); const res = { ...dst };
if (!src) return res; if (!src) return res;
@ -80,12 +80,12 @@ function simplifyOperation(operation, operator) {
} }
function buildFilter(params, builderFunc) { function buildFilter(params, builderFunc) {
let and = []; const and = [];
for (let param in params) { for (const param in params) {
let value = params[param]; const value = params[param];
if (value == null) continue; if (value == null) continue;
let expr = builderFunc(param, value); const expr = builderFunc(param, value);
if (expr) and.push(expr); if (expr) and.push(expr);
} }
return simplifyOperation(and, 'and'); return simplifyOperation(and, 'and');

View File

@ -1,14 +1,14 @@
export default function getDifferences(obj1, obj2) { export default function getDifferences(obj1, obj2) {
let diff = {}; const diff = {};
delete obj1.$index; delete obj1.$index;
delete obj2.$index; delete obj2.$index;
for (let key in obj1) { for (const key in obj1) {
if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) { if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
diff[key] = obj2[key]; diff[key] = obj2[key];
} }
} }
for (let key in obj2) { for (const key in obj2) {
if ( if (
obj1[key] === undefined || obj1[key] === undefined ||
JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key]) JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])

View File

@ -6,6 +6,7 @@ import toDateHourMinSec from './toDateHourMinSec';
import toRelativeDate from './toRelativeDate'; import toRelativeDate from './toRelativeDate';
import toCurrency from './toCurrency'; import toCurrency from './toCurrency';
import toPercentage from './toPercentage'; import toPercentage from './toPercentage';
import toNumber from './toNumber';
import toLowerCamel from './toLowerCamel'; import toLowerCamel from './toLowerCamel';
import dashIfEmpty from './dashIfEmpty'; import dashIfEmpty from './dashIfEmpty';
import dateRange from './dateRange'; import dateRange from './dateRange';
@ -34,6 +35,7 @@ export {
toRelativeDate, toRelativeDate,
toCurrency, toCurrency,
toPercentage, toPercentage,
toNumber,
dashIfEmpty, dashIfEmpty,
dateRange, dateRange,
getParamWhere, getParamWhere,

View File

@ -1,10 +1,10 @@
export default function toDateString(date) { export default function toDateString(date) {
let day = date.getDate(); let day = date.getDate();
let month = date.getMonth() + 1; let month = date.getMonth() + 1;
let year = date.getFullYear(); const year = date.getFullYear();
if (day < 10) day = `0${day}`; if (day < 10) day = `0${day}`;
if (month < 10) month = `0${month}`; if (month < 10) month = `0${month}`;
return `${year}-${month}-${day}` return `${year}-${month}-${day}`;
} }

View File

@ -1,5 +1,5 @@
export default function toLowerCamel(value) { export default function toLowerCamel(value) {
if (!value) return; if (!value) return;
if (typeof (value) !== 'string') return value; if (typeof value !== 'string') return value;
return value.charAt(0).toLowerCase() + value.slice(1); return value.charAt(0).toLowerCase() + value.slice(1);
} }

8
src/filters/toNumber.js Normal file
View File

@ -0,0 +1,8 @@
export default function (value, fractionSize = 2) {
if (isNaN(value)) return value;
return new Intl.NumberFormat('es-ES', {
style: 'decimal',
minimumFractionDigits: 0,
maximumFractionDigits: fractionSize,
}).format(value);
}

View File

@ -9,7 +9,7 @@ export default function formatDate(dateVal) {
const dateZeroTime = new Date(dateVal); const dateZeroTime = new Date(dateVal);
dateZeroTime.setHours(0, 0, 0, 0); dateZeroTime.setHours(0, 0, 0, 0);
const diff = Math.trunc( const diff = Math.trunc(
(today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24) (today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24),
); );
let format; let format;
if (diff === 0) format = t('globals.today'); if (diff === 0) format = t('globals.today');

View File

@ -11,12 +11,12 @@ for (const file in files) {
translations[lang] = g.default; translations[lang] = g.default;
}) })
.finally(() => { .finally(() => {
const actualLang = lang + '.yml'; const actualLang = `${lang}.yml`;
for (const module in modules) { for (const module in modules) {
if (!module.endsWith(actualLang)) continue; if (!module.endsWith(actualLang)) continue;
modules[module]().then((t) => { modules[module]().then((t) => {
Object.assign(translations[lang], t.default); Object.assign(translations[lang], t.default);
}) });
} }
}); });
} }

View File

@ -6,6 +6,7 @@ globals:
quantity: Quantity quantity: Quantity
entity: Entity entity: Entity
preview: Preview preview: Preview
scrollToTop: Go up
user: User user: User
details: Details details: Details
collapseMenu: Collapse lateral menu collapseMenu: Collapse lateral menu
@ -23,13 +24,14 @@ globals:
dataDeleted: Data deleted dataDeleted: Data deleted
delete: Delete delete: Delete
search: Search search: Search
lines: Lines
changes: Changes changes: Changes
dataCreated: Data created dataCreated: Data created
add: Add add: Add
create: Create create: Create
edit: Edit edit: Edit
save: Save save: Save
saveAndContinue: Save and continue saveAndContinue: Save and go to
remove: Remove remove: Remove
reset: Reset reset: Reset
close: Close close: Close
@ -106,6 +108,8 @@ globals:
from: From from: From
to: To to: To
notes: Notes notes: Notes
photos: Photos
due-day: Due day
refresh: Refresh refresh: Refresh
item: Item item: Item
ticket: Ticket ticket: Ticket
@ -121,6 +125,7 @@ globals:
producer: Producer producer: Producer
origin: Origin origin: Origin
state: State state: State
total: Total
subtotal: Subtotal subtotal: Subtotal
visible: Visible visible: Visible
price: Price price: Price
@ -161,6 +166,9 @@ globals:
department: Department department: Department
noData: No data available noData: No data available
vehicle: Vehicle vehicle: Vehicle
selectDocumentId: Select document id
document: Document
import: Import from existing
pageTitles: pageTitles:
logIn: Login logIn: Login
addressEdit: Update address addressEdit: Update address
@ -342,6 +350,8 @@ globals:
parking: Parking parking: Parking
vehicleList: Vehicles vehicleList: Vehicles
vehicle: Vehicle vehicle: Vehicle
entryPreAccount: Pre-account
management: Worker management
unsavedPopup: unsavedPopup:
title: Unsaved changes will be lost title: Unsaved changes will be lost
subtitle: Are you sure exit without saving? subtitle: Are you sure exit without saving?
@ -390,6 +400,7 @@ errors:
updateUserConfig: Error updating user config updateUserConfig: Error updating user config
tokenConfig: Error fetching token config tokenConfig: Error fetching token config
writeRequest: The requested operation could not be completed writeRequest: The requested operation could not be completed
claimBeginningQuantity: Cannot import a line with a claimed quantity of 0
login: login:
title: Login title: Login
username: Username username: Username

View File

@ -6,6 +6,7 @@ globals:
quantity: Cantidad quantity: Cantidad
entity: Entidad entity: Entidad
preview: Vista previa preview: Vista previa
scrollToTop: Ir arriba
user: Usuario user: Usuario
details: Detalles details: Detalles
collapseMenu: Contraer menú lateral collapseMenu: Contraer menú lateral
@ -24,12 +25,13 @@ globals:
openDetail: Ver detalle openDetail: Ver detalle
delete: Eliminar delete: Eliminar
search: Buscar search: Buscar
lines: Lineas
changes: Cambios changes: Cambios
add: Añadir add: Añadir
create: Crear create: Crear
edit: Modificar edit: Modificar
save: Guardar save: Guardar
saveAndContinue: Guardar y continuar saveAndContinue: Guardar e ir a
remove: Eliminar remove: Eliminar
reset: Restaurar reset: Restaurar
close: Cerrar close: Cerrar
@ -110,6 +112,8 @@ globals:
from: Desde from: Desde
to: Hasta to: Hasta
notes: Notas notes: Notas
photos: Fotos
due-day: Vencimiento
refresh: Actualizar refresh: Actualizar
item: Artículo item: Artículo
ticket: Ticket ticket: Ticket
@ -125,6 +129,7 @@ globals:
producer: Productor producer: Productor
origin: Origen origin: Origen
state: Estado state: Estado
total: Total
subtotal: Subtotal subtotal: Subtotal
visible: Visible visible: Visible
price: Precio price: Precio
@ -165,6 +170,9 @@ globals:
noData: Datos no disponibles noData: Datos no disponibles
department: Departamento department: Departamento
vehicle: Vehículo vehicle: Vehículo
selectDocumentId: Seleccione el id de gestión documental
document: Documento
import: Importar desde existente
pageTitles: pageTitles:
logIn: Inicio de sesión logIn: Inicio de sesión
addressEdit: Modificar consignatario addressEdit: Modificar consignatario
@ -345,6 +353,8 @@ globals:
parking: Parking parking: Parking
vehicleList: Vehículos vehicleList: Vehículos
vehicle: Vehículo vehicle: Vehículo
entryPreAccount: Precontabilizar
management: Gestión de trabajadores
unsavedPopup: unsavedPopup:
title: Los cambios que no haya guardado se perderán title: Los cambios que no haya guardado se perderán
subtitle: ¿Seguro que quiere salir sin guardar? subtitle: ¿Seguro que quiere salir sin guardar?
@ -386,6 +396,7 @@ errors:
updateUserConfig: Error al actualizar la configuración de usuario updateUserConfig: Error al actualizar la configuración de usuario
tokenConfig: Error al obtener configuración de token tokenConfig: Error al obtener configuración de token
writeRequest: No se pudo completar la operación solicitada writeRequest: No se pudo completar la operación solicitada
claimBeginningQuantity: No se puede importar una linea sin una cantidad reclamada
login: login:
title: Inicio de sesión title: Inicio de sesión
username: Nombre de usuario username: Nombre de usuario

View File

@ -80,7 +80,7 @@ const killSession = async ({ userId, created }) => {
openConfirmationModal( openConfirmationModal(
t('Session will be killed'), t('Session will be killed'),
t('Are you sure you want to continue?'), t('Are you sure you want to continue?'),
() => killSession(row) () => killSession(row),
) )
" "
outline outline

Some files were not shown because too many files have changed in this diff Show More