Compare commits

..

188 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
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
Alex Moreno 665168dc45 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-16 09:20:09 +02:00
Javier Segarra caa5fdf587 Merge pull request 'hotfix: Ticket negative improve' (!1591) from hotfix_negative_available into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 21:04:28 +00: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
Javier Segarra f615c5c196 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:35:38 +00:00
Jon Elias 77db8392cc Merge pull request 'Hotfix[routeSummary]: Show in table client id instead of client's name' (!1715) from Hotfix-RouteClient into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1715
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 13:22:36 +00:00
Jon Elias d8234ba141 Merge branch 'master' into Hotfix-RouteClient
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:00:44 +00: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 2eb70aadcb Merge pull request 'hotfix: make accountNumber to work on blur' (!1714) from hotfix_vnAccountNumber into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1714
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 12:38:24 +00:00
Jon Elias 1d573b5dee fix: show in table client id instead of client's name
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 14:37:09 +02:00
Pau Rovira d122752672 hotfix: make accountNumber to work on blur
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 11:54:26 +00:00
Javier Segarra 82b6fb6c2f fix: correct data retrieval after fetching in getData function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:49:21 +02: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
Javier Segarra 31acc3d0a1 Merge branch 'master' into hotfix_negative_available 2025-04-15 12:23:31 +02:00
Javier Segarra a66849f361 fix: ensure submit is awaited
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:38:04 +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
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
Javier Segarra 64e30b7143 refactor: remove redundant form filling step in order creation test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 10:38:00 +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
Javier Segarra de359043af Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 07:43:11 +00: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
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
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
Javier Segarra f49f694970 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 11:09:13 +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
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
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
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
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
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
Javier Segarra 510eab8af0 feat: fix minor bugs
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 15:04:24 +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
Javier Segarra b32a889dfe feat: updates 2025-04-11 12:30:37 +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
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
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 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
Javier Segarra 37bc464a98 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 10:06:21 +02:00
Javier Segarra 5fca08aaa2 test: add VnInputDateTime component tests 2025-04-11 10:05:47 +02: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
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
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
Javier Segarra d0f4eb9db9 feat: handle action notification 2025-04-09 10:59:43 +02:00
Javier Segarra 8f5b4af7cc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available 2025-04-08 12:30:29 +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
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
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
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
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
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
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
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
Jose Antonio Tubau dbdccc4774 refactor: refs #8422 improve error handling and notifications in DMS components 2025-03-28 08:56:26 +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
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
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 bc75bd9dc0 feat: update order creation test to use form data and improve readability
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-24 09:20:39 +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 c672d33b0c feat: change i18n hasObservation
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 11:41:55 +01:00
Javier Segarra e3c2ae935c style: improve css
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-21 11:15:26 +01:00
Javier Segarra 69548456c3 feat: hide url 2025-03-21 11:14:13 +01:00
Javier Segarra 64fe998053 feat: add availabled item 2025-03-21 11:14:01 +01:00
Javier Segarra ae856ec0bc perf: remove comments 2025-03-21 11:13:42 +01:00
Javier Segarra 239805515d feat: show substitution note
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 10:49:33 +01:00
Javier Segarra 56da11345b revert: remove substitutionAllowed 2025-03-21 10:49:17 +01:00
Javier Segarra 78d0f31b11 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 09:35:30 +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
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
Jose Antonio Tubau 22d912ba76 Merge branch 'dev' into 8422-createVehicleDms 2025-03-18 14:24:26 +01: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
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
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 bb949cd00c Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-13 08:01:56 +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
Javier Segarra f4c22938c7 perf: minor changes
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 23:47:31 +01:00
Javier Segarra 23670debd1 feat: add VnInputDateTime component and enhance date handling functions
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 15:34:30 +01:00
Javier Segarra 311c361f11 fix: minor bugs 2025-03-12 15:34:20 +01: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
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
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
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
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
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
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
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
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
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
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
Javier Segarra f1a57ceba1 feat: refs #6321 init 2025-02-19 14:09:00 +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
125 changed files with 1433 additions and 758 deletions

View File

@ -44,6 +44,7 @@ export default defineConfig({
supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads',
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
video: false,
specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true,

View File

@ -67,7 +67,7 @@ describe('Axios boot', () => {
};
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 () => {
@ -83,7 +83,7 @@ describe('Axios boot', () => {
};
const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error));
await expect(result).rejects.toEqual(expect.objectContaining(error));
});
});
});

View File

@ -1,4 +1,6 @@
import { boot } from 'quasar/wrappers';
import { date as quasarDate } from 'quasar';
const { formatDate } = quasarDate;
export default boot(() => {
Date.vnUTC = () => {
@ -25,4 +27,34 @@ export default boot(() => {
const date = new Date(Date.vnUTC());
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
};
Date.getCurrentDateTimeFormatted = (
options = {
startOfDay: false,
endOfDay: true,
iso: true,
mask: 'DD-MM-YYYY HH:mm',
},
) => {
const date = Date.vnUTC();
if (options.startOfDay) {
date.setHours(0, 0, 0);
}
if (options.endOfDay) {
date.setHours(23, 59, 0);
}
if (options.iso) {
return date.toISOString();
}
return formatDate(date, options.mask);
};
Date.convertToISODateTime = (dateTimeStr) => {
const [datePart, timePart] = dateTimeStr.split(' ');
const [day, month, year] = datePart.split('-');
const [hours, minutes] = timePart.split(':');
const isoDate = new Date(year, month - 1, day, hours, minutes);
return isoDate.toISOString();
};
});

View File

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

View File

@ -65,7 +65,7 @@ const $props = defineProps({
default: null,
},
beforeSaveFn: {
type: Function,
type: [String, Function],
default: null,
},
goTo: {

View File

@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
img.onerror = () => {
notify(
t("This photo provider doesn't allow remote downloads"),
'negative'
'negative',
);
};
}
@ -219,11 +219,7 @@ const makeRequest = async () => {
color="primary"
class="cursor-pointer"
@click="rotateLeft()"
>
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate left') }}
</QTooltip> -->
</QIcon>
/>
<div>
<div ref="photoContainerRef" />
</div>
@ -233,11 +229,7 @@ const makeRequest = async () => {
color="primary"
class="cursor-pointer"
@click="rotateRight()"
>
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate right') }}
</QTooltip> -->
</QIcon>
/>
</div>
<div class="column">
@ -265,7 +257,6 @@ const makeRequest = async () => {
class="cursor-pointer q-mr-sm"
@click="openInputFile()"
>
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
</QIcon>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{

View File

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

View File

@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
const attrs = useAttrs();
const $props = defineProps({
url: {
type: String,
@ -99,8 +98,12 @@ const $props = defineProps({
type: Function,
default: () => {},
},
preventSubmit: {
type: Boolean,
default: true,
},
});
const emit = defineEmits(['onFetch', 'onDataSaved']);
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value;
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
);
}
async function onKeyup(evt) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
if (evt.key === 'Enter' && !$props.preventSubmit) {
const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) {
let { selectionStart, selectionEnd } = input;
@ -330,6 +333,7 @@ defineExpose({
<template>
<div class="column items-center full-width">
<QForm
v-on="$attrs"
ref="myForm"
v-if="formData"
@submit.prevent="save"

View File

@ -181,7 +181,7 @@ const searchModule = () => {
<template>
<QList padding class="column-max-width">
<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">
<VnInput
v-model="search"
@ -262,7 +262,7 @@ const searchModule = () => {
</template>
<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">
<QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" />

View File

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

View File

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

View File

@ -66,7 +66,7 @@ const $props = defineProps({
default: null,
},
create: {
type: Object,
type: [Boolean, Object],
default: null,
},
createAsDialog: {

View File

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

View File

@ -58,7 +58,7 @@ async function getConfig(url, filter) {
const response = await axios.get(url, {
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() {

View File

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

View File

@ -11,13 +11,7 @@ describe('CrudModel', () => {
beforeAll(() => {
wrapper = createWrapper(CrudModel, {
global: {
stubs: [
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
stubs: ['vnPaginate', 'vue-i18n'],
mocks: {
validate: vi.fn(),
},
@ -29,7 +23,7 @@ describe('CrudModel', () => {
dataKey: 'crudModelKey',
model: 'crudModel',
url: 'crudModelUrl',
saveFn: '',
saveFn: vi.fn(),
},
});
wrapper = wrapper.wrapper;
@ -231,7 +225,7 @@ describe('CrudModel', () => {
expect(vm.isLoading).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 () => {

View File

@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
vm = mount('card').vm;
});
it('should get routes for card source', async () => {
it('should get routes for card source', () => {
vm.getRoutes();
});
});
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
});
it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled();
});

View File

@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
<VnInput
v-model="model"
ref="inputRef"
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
@blur="model = useAccountShortToStandard(model) ?? model"
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
/>
</template>

View File

@ -1,5 +1,5 @@
<script setup>
const model = defineModel({ type: [String, Number], required: true });
const model = defineModel({ type: [String, Number], default: '' });
</script>
<template>
<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 axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import FetchData from 'components/FetchData.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
const route = useRoute();
const { t } = useI18n();
const { notify } = useNotify();
const emit = defineEmits(['onDataSaved']);
const $props = defineProps({
@ -61,8 +63,11 @@ function onFileChange(files) {
function mapperDms(data) {
const formData = new FormData();
const { files } = data;
if (files) formData.append(files?.name, files);
let files = data.files;
if (files) {
files = Array.isArray(files) ? files : [files];
files.forEach((file) => formData.append(file?.name, file));
}
const dms = {
hasFile: !!data.hasFile,
@ -83,11 +88,16 @@ function getUrl() {
}
async function save() {
const body = mapperDms(dms.value);
const response = await axios.post(getUrl(), body[0], body[1]);
emit('onDataSaved', body[1].params, response);
delete dms.value.files;
return response;
try {
const body = mapperDms(dms.value);
const response = await axios.post(getUrl(), body[0], body[1]);
emit('onDataSaved', body[1].params, response);
notify(t('globals.dataSaved'), 'positive');
delete dms.value.files;
return response;
} catch (e) {
throw e;
}
}
function defaultData() {
@ -208,7 +218,7 @@ function addDefaultData(data) {
}
</style>
<i18n>
en:
en:
contentTypesInfo: Allowed file types {allowedContentTypes}
EntryDmsDescription: Reference {reference}
WorkersDescription: Working of employee id {reference}

View File

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

View File

@ -1,6 +1,6 @@
<script setup>
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
import { date } from 'quasar';
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
import { date, getCssVar } from 'quasar';
import VnDate from './VnDate.vue';
import { useRequired } from 'src/composables/useRequired';
@ -20,61 +20,18 @@ const $props = defineProps({
});
const vnInputDateRef = ref(null);
const errColor = getCssVar('negative');
const textColor = ref('');
const dateFormat = 'DD/MM/YYYY';
const isPopupOpen = ref();
const hover = ref();
const mask = ref();
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(() =>
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(() => {
return $props.isOutlined
@ -86,28 +43,139 @@ const styleAttrs = computed(() => {
: {};
});
const inputValue = ref('');
const validateAndCleanInput = (value) => {
inputValue.value = value.replace(/[^0-9./-]/g, '');
};
const manageDate = (date) => {
formattedDate.value = date;
inputValue.value = date.split('/').reverse().join('/');
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>
<template>
<div @mouseover="hover = true" @mouseleave="hover = false">
{{ console.log($q) }}
<QInput
ref="vnInputDateRef"
v-model="formattedDate"
v-model="inputValue"
class="vn-input-date"
:mask="mask"
placeholder="dd/mm/aaaa"
v-bind="{ ...$attrs, ...styleAttrs }"
:class="{ required: isRequired }"
:rules="mixinRules"
:clearable="false"
:input-style="{color: textColor}"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
@blur="formatDate"
@keydown.enter.prevent="handleEnter"
hide-bottom-space
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
@update:model-value="validateAndCleanInput"
>
<template #append>
<QIcon
@ -116,11 +184,12 @@ const manageDate = (date) => {
v-if="
($attrs.clearable == undefined || $attrs.clearable) &&
hover &&
model &&
inputValue &&
!$attrs.disable
"
@click="
vnInputDateRef.focus();
inputValue = null;
model = null;
isPopupOpen = false;
"

View File

@ -0,0 +1,79 @@
<script setup>
import { computed, useAttrs } from 'vue';
import { date } from 'quasar';
import VnDate from './VnDate.vue';
import VnTime from './VnTime.vue';
const $attrs = useAttrs();
const model = defineModel({ type: [Date, String] });
const $props = defineProps({
isOutlined: {
type: Boolean,
default: false,
},
showEvent: {
type: Boolean,
default: true,
},
});
const styleAttrs = computed(() => {
return $props.isOutlined
? {
dense: true,
outlined: true,
rounded: true,
}
: {};
});
const mask = 'DD-MM-YYYY HH:mm';
const selectedDate = computed({
get() {
if (!model.value) return JSON.stringify(new Date(model.value));
return date.formatDate(new Date(model.value), mask);
},
set(value) {
model.value = Date.convertToISODateTime(value);
},
});
const manageDate = (date) => {
selectedDate.value = date;
};
</script>
<template>
<div @mouseover="hover = true" @mouseleave="hover = false">
<QInput
ref="vnInputDateRef"
v-model="selectedDate"
class="vn-input-date"
placeholder="dd/mm/aaaa HH:mm"
v-bind="{ ...$attrs, ...styleAttrs }"
:clearable="false"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space
@update:model-value="manageDate"
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
>
<template #prepend>
<QIcon name="today" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnDate :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
<template #append>
<QIcon name="access_time" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnTime format24h :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
</QInput>
</div>
</template>
<i18n>
es:
Open date: Abrir fecha
</i18n>

View File

@ -54,6 +54,10 @@ const $props = defineProps({
type: [Array],
default: () => [],
},
filterFn: {
type: Function,
default: null,
},
exprBuilder: {
type: Function,
default: null,
@ -62,16 +66,12 @@ const $props = defineProps({
type: Boolean,
default: true,
},
defaultFilter: {
type: Boolean,
default: true,
},
fields: {
type: Array,
default: null,
},
include: {
type: [Object, Array],
type: [Object, Array, String],
default: null,
},
where: {
@ -79,7 +79,7 @@ const $props = defineProps({
default: null,
},
sortBy: {
type: String,
type: [String, Array],
default: null,
},
limit: {
@ -152,10 +152,22 @@ const value = computed({
},
});
const arrayDataKey =
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
watch(options, (newValue) => {
setOptions(newValue);
});
@ -174,16 +186,6 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
});
const arrayDataKey =
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
function findKeyInOptions() {
if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length;
@ -252,43 +254,41 @@ async function fetchFilter(val) {
}
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;
if (!$props.defaultFilter) return update();
if (
$props.url &&
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
) {
newOptions = await fetchFilter(val);
} else newOptions = filter(val, myOptionsOriginal.value);
update(
() => {
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
newOptions.unshift(noOneOpt.value);
if ($props.filterFn) update($props.filterFn(val));
else if (!val && lastVal.value === val) update();
else {
const makeRequest =
($props.url && $props.limit) ||
(!$props.limit && Object.keys(myOptions.value).length === 0);
newOptions = makeRequest
? await fetchFilter(val)
: filter(val, myOptionsOriginal.value);
myOptions.value = newOptions;
},
(ref) => {
if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
update(
() => {
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
newOptions.unshift(noOneOpt.value);
myOptions.value = newOptions;
},
(ref) => {
if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
lastVal.value = val;
}
function nullishToTrue(value) {
return value ?? true;
}
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
async function onScroll({ to, direction, from, index }) {
const lastIndex = myOptions.value.length - 1;

View File

@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
describe('VnDiscount', () => {
let vm;
beforeAll(() => {
vm = createWrapper(VnDiscount, {
props: {
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
price: 100,
quantity: 2,
discount: 10,
}
mana: 10,
promise: vi.fn(),
},
}).vm;
});
@ -21,8 +23,8 @@ describe('VnDiscount', () => {
});
describe('total', () => {
it('should calculate total correctly', () => {
it('should calculate total correctly', () => {
expect(vm.total).toBe(180);
});
});
});
});

View File

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

View File

@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
import { vi, describe, expect, it } from 'vitest';
import VnInput from 'src/components/common/VnInput.vue';
describe('VnInput', () => {
let vm;
let wrapper;
@ -11,26 +10,28 @@ describe('VnInput', () => {
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
wrapper = createWrapper(VnInput, {
props: {
modelValue: value,
isOutlined, emptyToNull, insertable,
maxlength: 101
modelValue: value,
isOutlined,
emptyToNull,
insertable,
maxlength: 101,
},
attrs: {
label: 'test',
required: true,
maxlength: 101,
maxLength: 10,
'max-length':20
'max-length': 20,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
input = wrapper.find('[data-cy="test_input"]');
};
}
describe('value', () => {
it('should emit update:modelValue when value changes', async () => {
generateWrapper('12345', false, false, true)
generateWrapper('12345', false, false, true);
await input.setValue('123');
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@ -46,37 +47,36 @@ describe('VnInput', () => {
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('123', false, false, false);
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('123', true, false, false);
expect(vm.styleAttrs.outlined).toBe(true);
});
});
describe('handleKeydown', () => {
describe('handleKeydown', () => {
it('should do nothing when "Backspace" key is pressed', async () => {
generateWrapper('12345', false, false, true);
await input.trigger('keydown', { key: 'Backspace' });
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
expect(spyhandler).not.toHaveBeenCalled();
});
/*
TODO: #8399 REDMINE
*/
it.skip('handleKeydown respects insertable behavior', async () => {
const expectedValue = '12345';
generateWrapper('1234', false, false, true);
vm.focus()
vm.focus();
await input.trigger('keydown', { key: '5' });
await vm.$nextTick();
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
expect(vm.value).toBe( expectedValue);
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
expect(vm.value).toBe(expectedValue);
});
});
@ -86,6 +86,6 @@ describe('VnInput', () => {
const focusSpy = vi.spyOn(input.element, 'focus');
vm.focus();
expect(focusSpy).toHaveBeenCalled();
});
});
});
});

View File

@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
let vm;
let wrapper;
function generateWrapper(date, outlined, required) {
function generateWrapper(outlined = false, required = false) {
wrapper = createWrapper(VnInputDate, {
props: {
modelValue: date,
modelValue: '2000-12-31T23:00:00.000Z',
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
},
attrs: {
isOutlined: outlined,
required: required
required: required,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
};
}
describe('VnInputDate', () => {
describe('formattedDate', () => {
it('formats a valid date correctly', async () => {
generateWrapper('2023-12-25', false, false);
describe('formattedDate', () => {
it('validateAndCleanInput should remove non-numeric characters', async () => {
generateWrapper();
vm.validateAndCleanInput('10a/1s2/2dd0a23');
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 () => {
const input = wrapper.find('input');
await input.setValue('31/12/2023');
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
it('manageDate should reverse the date', async () => {
generateWrapper();
vm.manageDate('10/12/2023');
await vm.$nextTick();
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');
await input.setValue('invalid-date');
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
});
await input.setValue('25.12/2002');
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', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25', false, false);
generateWrapper();
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25', true, false);
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper(true, false);
await vm.$nextTick();
expect(vm.styleAttrs.outlined).toBe(true);
});
@ -58,15 +77,15 @@ describe('VnInputDate', () => {
describe('required', () => {
it('should not applies required class when isRequired is false', async () => {
generateWrapper('2023-12-25', false, false);
generateWrapper();
await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
});
it('should applies required class when isRequired is true', async () => {
generateWrapper('2023-12-25', false, true);
generateWrapper(false, true);
await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
});
});
});
});

View File

@ -0,0 +1,81 @@
import { createWrapper } from 'app/test/vitest/helper.js';
import { describe, it, expect, beforeAll } from 'vitest';
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
import vnDateBoot from 'src/boot/vnDate';
let vm;
let wrapper;
beforeAll(() => {
// Initialize the vnDate boot
vnDateBoot();
});
function generateWrapper(date, outlined, showEvent) {
wrapper = createWrapper(VnInputDateTime, {
props: {
modelValue: date,
isOutlined: outlined,
showEvent: showEvent,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
}
describe('VnInputDateTime', () => {
describe('selectedDate', () => {
it('formats a valid datetime correctly', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.selectedDate).toBe('25-12-2023 10:30');
});
it('handles null date value', async () => {
generateWrapper(null, false, true);
await vm.$nextTick();
expect(vm.selectedDate).not.toBe(null);
});
it('updates the model value when a new datetime is set', async () => {
vm.selectedDate = '31-12-2023 15:45';
await vm.$nextTick();
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25T10:30:00', true, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({
dense: true,
outlined: true,
rounded: true,
});
});
});
describe('component rendering', () => {
it('should render date and time icons', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const icons = wrapper.findAllComponents({ name: 'QIcon' });
expect(icons.length).toBe(2);
expect(icons[0].props('name')).toBe('today');
expect(icons[1].props('name')).toBe('access_time');
});
it('should render popup proxies for date and time', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
expect(popups.length).toBe(2);
});
});
});

View File

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

View File

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

View File

@ -44,7 +44,8 @@ onBeforeMount(async () => {
});
// It enables to load data only once if the module is the same as the dataKey
if (!isSameDataKey.value || !route.params.id) await getData();
if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
await getData();
watch(
() => [$props.url, $props.filter],
async () => {
@ -58,7 +59,8 @@ async function getData() {
store.filter = $props.filter ?? {};
isLoading.value = true;
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
await arrayData.fetch({ append: false, updateRouter: false });
const { data } = store;
state.set($props.dataKey, data);
emit('onFetch', data);
} finally {

View File

@ -2,7 +2,9 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData';
import { useAttrs } from 'vue';
const attrs = useAttrs();
const { t } = useI18n();
const props = defineProps({
@ -67,7 +69,7 @@ const props = defineProps({
default: null,
},
searchUrl: {
type: String,
type: [String, Boolean],
default: null,
},
disableInfiniteScroll: {
@ -75,7 +77,7 @@ const props = defineProps({
default: false,
},
mapKey: {
type: String,
type: [String, Boolean],
default: '',
},
keyData: {
@ -220,7 +222,7 @@ defineExpose({
</script>
<template>
<div class="full-width">
<div class="full-width" v-bind="attrs">
<div
v-if="!store.data && !store.data?.length && !isLoading"
class="info-row q-pa-md text-center"

View File

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

View File

@ -23,10 +23,15 @@ describe('CardSummary', () => {
beforeEach(() => {
wrapper = createWrapper(CardSummary, {
global: {
mocks: {
validate: vi.fn(),
},
},
propsData: {
dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl',
filter: 'cardFilter',
filter: { key: 'cardFilter' },
},
});
vm = wrapper.vm;
@ -50,7 +55,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => {
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 () => {

View File

@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
let wrapper;
let applyFilterSpy;
const searchText = 'Bolas de madera';
const userParams = {staticKey: 'staticValue'};
const userParams = { staticKey: 'staticValue' };
beforeEach(async () => {
wrapper = createWrapper(VnSearchbar, {
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
vm.searchText = searchText;
vm.arrayData.store.userParams = userParams;
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
applyFilterSpy = vi
.spyOn(vm.arrayData, 'applyFilter')
.mockImplementation(() => {});
});
afterEach(() => {
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
});
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();
expect(resetPaginationSpy).toHaveBeenCalled();
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText },
filter: {skip: 0},
filter: { skip: 0 },
});
});
@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
});
expect(vm.to.query.searchParam).toBe(expectedQuery);
});
});
});

View File

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

View File

@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia';
import { defineComponent, h } from 'vue';
import { mount } from '@vue/test-utils';
describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}';
@ -43,7 +45,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
searchUrl: 'params',
});
@ -72,7 +74,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }],
});
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
navigate: {},
});
@ -94,7 +96,7 @@ describe('useArrayData', () => {
],
});
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
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,88 +64,84 @@ describe('session', () => {
});
});
describe(
'login',
() => {
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
userConfig: {
darkMode: false,
describe('login', () => {
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
userConfig: {
darkMode: false,
},
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
},
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
},
},
{
role: {
name: 'admin',
},
{
role: {
name: 'admin',
},
},
];
beforeEach(() => {
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
});
},
];
beforeEach(() => {
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
});
});
});
it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false;
it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false;
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
await session.destroy(); // this clears token and user for any other test
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
it('should fetch the user roles and then set token in the localStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
await session.destroy(); // this clears token and user for any other test
});
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
it('should fetch the user roles and then set token in the localStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
await session.destroy(); // this clears token and user for any other test
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
},
{},
);
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
await session.destroy(); // this clears token and user for any other test
});
});
describe('RenewToken', () => {
const expectedToken = 'myToken';

View File

@ -20,6 +20,7 @@ globals:
logOut: Log out
date: Date
dataSaved: Data saved
openDetail: Open detail
dataDeleted: Data deleted
delete: Delete
search: Search
@ -161,6 +162,9 @@ globals:
department: Department
noData: No data available
vehicle: Vehicle
selectDocumentId: Select document id
document: Document
import: Import from existing
pageTitles:
logIn: Login
addressEdit: Update address

View File

@ -21,10 +21,11 @@ globals:
date: Fecha
dataSaved: Datos guardados
dataDeleted: Datos eliminados
dataCreated: Datos creados
openDetail: Ver detalle
delete: Eliminar
search: Buscar
changes: Cambios
dataCreated: Datos creados
add: Añadir
create: Crear
edit: Modificar
@ -165,6 +166,9 @@ globals:
noData: Datos no disponibles
department: Departamento
vehicle: Vehículo
selectDocumentId: Seleccione el id de gestión documental
document: Documento
import: Importar desde existente
pageTitles:
logIn: Inicio de sesión
addressEdit: Modificar consignatario

View File

@ -23,7 +23,7 @@ const claimDms = ref([
]);
const client = ref({});
const inputFile = ref();
const files = ref({});
const files = ref([]);
const spinnerRef = ref();
const claimDmsRef = ref();
const dmsType = ref({});
@ -255,9 +255,8 @@ function onDrag() {
icon="add"
color="primary"
>
<QInput
<QFile
ref="inputFile"
type="file"
style="display: none"
multiple
v-model="files"

View File

@ -52,7 +52,7 @@ describe('ClaimLines', () => {
expectedData,
{
signal: canceller.signal,
}
},
);
});
});
@ -69,7 +69,7 @@ describe('ClaimLines', () => {
expect.objectContaining({
message: 'Discount updated',
type: 'positive',
})
}),
);
});
});

View File

@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
fetch: vi.fn(),
},
},
propsData: {
ticketId: 1,
},
}).vm;
});
@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
expect.objectContaining({
message: 'Lines added to claim',
type: 'positive',
})
}),
);
expect(vm.canceller).toEqual(null);
});

View File

@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
await vm.deleteDms({ index: 0 });
expect(axios.post).toHaveBeenCalledWith(
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' })
expect.objectContaining({ type: 'positive' }),
);
});
});
@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
data: { index: 1 },
promise: vm.deleteDms,
},
})
}),
);
});
});
@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
new FormData(),
expect.objectContaining({
params: expect.objectContaining({ hasFile: false }),
})
}),
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' })
expect.objectContaining({ type: 'positive' }),
);
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

View File

@ -39,7 +39,7 @@ const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => {
return $props.id || route.params.id;
return Number($props.id || route.params.id);
});
const data = ref(useCardDescription());

View File

@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
:required="true"
:rules="validate('client.socialName')"
clearable
uppercase="true"
:uppercase="true"
v-model="data.socialName"
>
<template #append>

View File

@ -25,7 +25,7 @@ const $props = defineProps({
},
});
const entityId = computed(() => $props.id || route.params.id);
const entityId = computed(() => Number($props.id || route.params.id));
const customer = computed(() => summary.value.entity);
const summary = ref();
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);

View File

@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
option-value="id"
option-label="name"
url="Departments"
no-one="true"
:no-one="true"
/>
</QItemSection>
</QItem>

View File

@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
expect.objectContaining({
message: 'Payment confirmed',
type: 'positive',
})
}),
);
});
});

View File

@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
const initialData = reactive({});
const entityId = computed(() => route.params.id);
const customer = computed(() => useArrayData('Customer').store?.data);
const filterEmailUsers = { where: { userFk: user.value.id } };
const filterClientsAddresses = {
include: [
{ relation: 'province', scope: { fields: ['name'] } },
@ -73,7 +72,7 @@ onBeforeMount(async () => {
const setEmailUser = (data) => {
optionsEmailUsers.value = data;
initialData.replyTo = data[0]?.email;
initialData.replyTo = data[0]?.notificationEmail;
};
const setClientsAddresses = (data) => {
@ -182,10 +181,12 @@ const toCustomerSamples = () => {
<template>
<FetchData
:filter="filterEmailUsers"
:filter="{
where: { id: customer.departmentFk },
}"
@on-fetch="setEmailUser"
auto-load
url="EmailUsers"
url="Departments"
/>
<FetchData
:filter="filterClientsAddresses"

View File

@ -162,11 +162,6 @@ const entryFilterPanel = ref();
v-model="params.warehouseOutFk"
@update:model-value="searchFn()"
url="Warehouses"
:where="{
isOrigin: {
neq: 0,
},
}"
:fields="['id', 'name']"
sort-by="name ASC"
hide-selected
@ -182,11 +177,6 @@ const entryFilterPanel = ref();
v-model="params.warehouseInFk"
@update:model-value="searchFn()"
url="Warehouses"
:where="{
isDestiny: {
neq: 0,
},
}"
:fields="['id', 'name']"
sort-by="name ASC"
hide-selected

View File

@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
const $props = defineProps({
id: {
type: Number,
required: true,
default: null,
},
});
</script>

View File

@ -164,6 +164,7 @@ onMounted(async () => {
unelevated
filled
dense
data-cy="formSubmitBtn"
/>
<QBtn
v-else
@ -174,6 +175,7 @@ onMounted(async () => {
filled
dense
@click="getStatus = 'stopping'"
data-cy="formStopBtn"
/>
</QForm>
</template>

View File

@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
import VnTable from 'src/components/VnTable/VnTable.vue';
import axios from 'axios';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
import FetchData from 'components/FetchData.vue';
import { useState } from 'src/composables/useState';
const MATCH = 'match';
const { notifyResults } = displayResults();
const { t } = useI18n();
const $props = defineProps({
@ -18,14 +20,20 @@ const $props = defineProps({
required: true,
default: () => {},
},
filter: {
type: Object,
required: true,
default: () => {},
},
replaceAction: {
type: Boolean,
required: false,
required: true,
default: false,
},
sales: {
type: Array,
required: false,
required: true,
default: () => [],
},
});
@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
const sale = computed(() => $props.sales[0]);
const saleFk = computed(() => sale.value.saleFk);
const filter = computed(() => ({
where: $props.filter,
itemFk: $props.itemLack.itemFk,
sales: saleFk.value,
}));

View File

@ -1,13 +1,17 @@
<script setup>
import ItemProposal from './ItemProposal.vue';
import { useDialogPluginComponent } from 'quasar';
const $props = defineProps({
itemLack: {
type: Object,
required: true,
default: () => {},
},
filter: {
type: Object,
required: true,
default: () => {},
},
replaceAction: {
type: Boolean,
required: false,
@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
<QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
<QCard class="dialog-width">
<QCardSection class="row items-center q-pb-none">
<span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
<span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
<QSpace />
<QBtn icon="close" flat round dense v-close-popup />
</QCardSection>

View File

@ -120,7 +120,6 @@ watch(
:data-key="dataKey"
:tag-value="tagValue"
:tags="tags"
:initial-catalog-params="catalogParams"
:arrayData
/>
</template>

View File

@ -27,7 +27,7 @@ const getTotalRef = ref();
const total = ref(0);
const entityId = computed(() => {
return $props.id || route.params.id;
return Number($props.id || route.params.id);
});
const orderTotal = computed(() => state.get('orderTotal') ?? 0);

View File

@ -233,10 +233,10 @@ const ticketColumns = ref([
</span>
</QTd>
</template>
<template #body-cell-client="{ value, row }">
<QTd auto-width>
<template #body-cell-client="{ row }">
<QTd>
<span class="link">
{{ value }}
{{ row.clientFk }}
<CustomerDescriptorProxy :id="row?.clientFk" />
</span>
</QTd>

View File

@ -0,0 +1,65 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import VnSelect from 'src/components/common/VnSelect.vue';
import FormModelPopup from 'components/FormModelPopup.vue';
import FetchData from 'components/FetchData.vue';
import useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
const emit = defineEmits(['onDataSaved']);
const { t } = useI18n();
const { notify } = useNotify();
const route = useRoute();
const dmsOptions = ref([]);
const dmsId = ref(null);
const importDms = async () => {
try {
if (!dmsId.value) throw new Error(t(`vehicle.errors.documentIdEmpty`));
const data = {
vehicleFk: route.params.id,
dmsFk: dmsId.value,
};
await axios.post('vehicleDms', data);
notify(t('globals.dataSaved'), 'positive');
dmsId.value = null;
emit('onDataSaved');
} catch (e) {
throw e;
}
};
</script>
<template>
<FetchData
url="Dms"
:filter="{ fields: ['id'], order: 'id ASC' }"
auto-load
@on-fetch="(data) => (dmsOptions = data)"
/>
<FormModelPopup
model="DmsImport"
:title="t('globals.selectDocumentId')"
:form-initial-data="{}"
:save-fn="importDms"
>
<template #form-inputs>
<VnSelect
:label="t('globals.document')"
:options="dmsOptions"
hide-selected
option-label="id"
option-value="id"
v-model="dmsId"
/>
</template>
</FormModelPopup>
</template>

View File

@ -0,0 +1,42 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnDmsList from 'src/components/common/VnDmsList.vue';
import VehicleDmsImportForm from 'src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue';
const { t } = useI18n();
const dmsListRef = ref(null);
const showImportDialog = ref(false);
const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
</script>
<template>
<VnDmsList
ref="dmsListRef"
model="VehicleDms"
update-model="vehicles"
delete-model="VehicleDms"
download-model="dms"
default-dms-code="vehicles"
filter="vehicleFk"
/>
<QDialog v-model="showImportDialog">
<VehicleDmsImportForm @on-data-saved="onDataSaved()" />
</QDialog>
<QPageSticky position="bottom-right" :offset="[25, 90]">
<QBtn
fab
color="primary"
icon="file_copy"
@click="showImportDialog = true"
class="fill-icon"
data-cy="importBtn"
>
<QTooltip>
{{ t('globals.import') }}
</QTooltip>
</QBtn>
</QPageSticky>
</template>

View File

@ -18,3 +18,5 @@ vehicle:
params:
vehicleTypeFk: Type
vehicleStateFk: State
errors:
documentIdEmpty: The document identifier can't be empty

View File

@ -18,3 +18,5 @@ vehicle:
params:
vehicleTypeFk: Tipo
vehicleStateFk: Estado
errors:
documentIdEmpty: El número de documento no puede estar vacío

View File

@ -80,7 +80,7 @@ const columns = computed(() => [
<VnTable
:data-key="dataKey"
:columns="columns"
is-editable="false"
:is-editable="false"
:right-search="false"
:use-model="true"
:disable-option="{ table: true }"

View File

@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
<VnTable
:data-key="dataKey"
:columns="columns"
is-editable="false"
:is-editable="false"
:right-search="false"
:use-model="true"
:disable-option="{ table: true }"

View File

@ -65,15 +65,13 @@ function findBankFk(value, row) {
if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
}
function bankEntityFilter(val, update) {
update(() => {
const needle = val.toLowerCase();
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
(bank) =>
bank.bic.toLowerCase().startsWith(needle) ||
bank.name.toLowerCase().includes(needle),
);
});
function bankEntityFilter(val) {
const needle = val.toLowerCase();
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
(bank) =>
bank.bic.toLowerCase().startsWith(needle) ||
bank.name.toLowerCase().includes(needle),
);
}
</script>
<template>
@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
url="BankEntities"
@on-fetch="
(data) => {
(bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
bankEntitiesOptions = data;
filteredBankEntitiesOptions = data;
}
"
auto-load
@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
:label="t('worker.create.bankEntity')"
v-model="row.bankEntityFk"
:options="filteredBankEntitiesOptions"
:default-filter="false"
@filter="(val, update) => bankEntityFilter(val, update)"
:filter-fn="bankEntityFilter"
option-label="bic"
option-value="id"
hide-selected
:required="true"
:roles-allowed-to-create="['financial']"

View File

@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
const $props = defineProps({
id: {
type: Number,
required: true,
default: null,
},
});
</script>

View File

@ -239,11 +239,6 @@ async function getZone(options) {
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
auto-load
/>
<FetchData

View File

@ -101,7 +101,7 @@ const onNextStep = async () => {
t('basicData.negativesConfirmMessage'),
submitWithNegatives,
);
else submit();
else await submit();
}
};
</script>

View File

@ -28,6 +28,7 @@ const props = defineProps({
onMounted(() => {
restoreTicket();
hasDocuware();
});
watch(

View File

@ -1,7 +1,6 @@
<script setup>
import TicketDescriptor from './TicketDescriptor.vue';
import TicketSummary from './TicketSummary.vue';
const $props = defineProps({
id: {
type: Number,

View File

@ -34,7 +34,7 @@ const importDms = async () => {
dmsId.value = null;
emit('onDataSaved');
} catch (e) {
throw new Error(e.message);
throw e;
}
};
</script>
@ -49,7 +49,7 @@ const importDms = async () => {
<FormModelPopup
url-create="genera"
model="DmsImport"
:title="t('Select document id')"
:title="t('globals.selectDocumentId')"
:form-initial-data="{}"
:save-fn="importDms"
>
@ -70,7 +70,6 @@ const importDms = async () => {
<i18n>
es:
Select document id: Introduzca id de gestion documental
Document: Documento
The document indentifier can't be empty: El número de documento no puede estar vacío
</i18n>

View File

@ -773,6 +773,7 @@ watch(
v-model="row.itemFk"
:use-like="false"
@update:model-value="changeItem(row)"
autofocus
>
<template #option="scope">
<QItem v-bind="scope.itemProps">

View File

@ -3,7 +3,9 @@ import { ref } from 'vue';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import split from './components/split';
const emit = defineEmits(['ticketTransfered']);
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
ticket: {
@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
const splitSelectedRows = async () => {
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
await split(tickets, splitDate.value);
emit('ticketTransfered', tickets);
const results = await split(tickets, splitDate.value);
notifyResults(results, 'ticketFk');
emit('ticketTransferred', tickets);
};
</script>
<template>
<VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
<VnInputDate
class="q-mr-sm"
:label="$t('New date')"
v-model="splitDate"
clearable
autofocus
/>
<QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
</template>
<style lang="scss">

View File

@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import TicketTransferForm from './TicketTransferForm.vue';
import { toDateFormat } from 'src/filters/date.js';
const emit = defineEmits(['ticketTransfered']);
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {

View File

@ -1,8 +1,8 @@
<script setup>
import { ref } from 'vue';
import TicketTransfer from './TicketTransfer.vue';
import Split from './TicketSplit.vue';
const emit = defineEmits(['ticketTransfered']);
import TicketSplit from './TicketSplit.vue';
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {
@ -35,7 +35,7 @@ const transferRef = ref(null);
<template>
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
<div class="flex row items-center q-ma-lg" v-if="$props.split">
<Split
<TicketSplit
ref="splitRef"
@splitSelectedRows="splitSelectedRows"
:ticket="$props.ticket"

View File

@ -1,13 +1,11 @@
import axios from 'axios';
import notifyResults from 'src/utils/notifyResults';
export default async function (data, date) {
const reducedData = data.reduce((acc, item) => {
const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
if (existing) {
existing.sales.push(item.saleFk);
} else {
acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
}
return acc;
}, []);
@ -16,7 +14,5 @@ export default async function (data, date) {
const results = await Promise.allSettled(promises);
notifyResults(results, 'ticketFk');
return results;
}

View File

@ -23,7 +23,6 @@ const tableRef = ref();
const changeItemDialogRef = ref(null);
const changeStateDialogRef = ref(null);
const changeQuantityDialogRef = ref(null);
const showProposalDialog = ref(false);
const showChangeQuantityDialog = ref(false);
const selectedRows = ref([]);
const route = useRoute();
@ -63,6 +62,7 @@ const showItemProposal = () => {
.dialog({
component: ItemProposalProxy,
componentProps: {
filter: filter.value,
itemLack: tableRef.value.itemLack,
replaceAction: true,
sales: selectedRows.value,
@ -117,21 +117,17 @@ const showItemProposal = () => {
sales: selectedRows,
lastActiveTickets: selectedRows.map((row) => row.id),
}"
@ticket-transfered="reload"
@ticket-transferred="reload"
></TicketTransferProxy>
</template>
</QBtn>
<QBtn
color="primary"
@click="showProposalDialog = true"
:disable="selectedRows.length < 1"
@click="showItemProposal"
:disable="!(selectedRows.length === 1)"
data-cy="itemProposal"
>
<QIcon
name="import_export"
class="rotate-90"
@click="showItemProposal"
></QIcon>
<QIcon name="import_export" class="rotate-90" />
<QTooltip bottom anchor="bottom right">
{{ t('itemProposal') }}
</QTooltip>
@ -139,7 +135,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeItem"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeItem.title')"
>
<template #extraIcon> <QIcon name="vn:item" /> </template>
@ -153,7 +149,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeState"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeState.title')"
>
<template #extraIcon> <QIcon name="vn:eye" /> </template>
@ -167,7 +163,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeQuantity"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeQuantity.title')"
@click="showChangeQuantityDialog = true"
>

View File

@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
const { t } = useI18n();
const props = defineProps({
dataKey: {
@ -46,16 +47,7 @@ const setUserParams = (params) => {
</script>
<template>
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehouses = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
auto-load
/>
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
<FetchData
url="ItemCategories"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@ -75,6 +67,7 @@ const setUserParams = (params) => {
:data-key="props.dataKey"
:search-button="true"
@set-user-params="setUserParams"
:unremovable-params="['warehouseFk']"
>
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
@ -86,12 +79,11 @@ const setUserParams = (params) => {
<QList dense class="q-gutter-y-sm q-mt-sm">
<QItem>
<QItemSection>
<VnInput
v-model="params.days"
:label="t('negative.days')"
<VnInputDateTime
v-model="params.availabled"
:label="t('negative.availabled')"
dense
filled
type="number"
@update:model-value="
(value) => {
setUserParams(params);

View File

@ -21,14 +21,13 @@ const selectedRows = ref([]);
const tableRef = ref();
const filterParams = ref({});
const negativeParams = reactive({
days: useRole().likeAny('buyer') ? 2 : 0,
warehouseFk: useState().getUser().value.warehouseFk,
availabled: Date.getCurrentDateTimeFormatted(),
});
const redirectToCreateView = ({ itemFk }) => {
router.push({
name: 'NegativeDetail',
params: { id: itemFk },
query: { days: filterParams.value.days ?? negativeParams.days },
});
};
const columns = computed(() => [
@ -65,15 +64,19 @@ const columns = computed(() => [
columnFilter: {
component: 'input',
type: 'number',
columnClass: 'shrink',
inWhere: false,
},
},
{
name: 'longName',
align: 'center',
align: 'left',
label: t('negative.longName'),
field: ({ longName }) => longName,
columnFilter: {
component: 'input',
inWhere: false,
useLike: true,
},
sortable: true,
headerStyle: 'width: 350px',
cardVisible: true,
@ -94,6 +97,11 @@ const columns = computed(() => [
field: ({ inkFk }) => inkFk,
sortable: true,
cardVisible: true,
columnFilter: {
component: 'input',
columnClass: 'shrink',
inWhere: false,
},
},
{
name: 'size',
@ -155,7 +163,6 @@ const setUserParams = (params) => {
<TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
</template>
</RightMenu>
{{ filterRef }}
<VnTable
ref="tableRef"
data-key="NegativeList"

View File

@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import FetchData from 'src/components/FetchData.vue';
import { toDate, toHour } from 'src/filters';
import { toDate } from 'src/filters';
import useNotify from 'src/composables/useNotify.js';
import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
import { useRoute } from 'vue-router';
@ -22,14 +22,6 @@ const $props = defineProps({
},
});
watch(
() => $props.filter,
(v) => {
filterLack.value.where = v;
tableRef.value.reload(filterLack);
},
);
const filterLack = ref({
include: [
{
@ -90,6 +82,7 @@ const columns = computed(() => [
},
{
name: 'alertLevelCode',
field: 'alertLevelCode',
label: t('negative.detail.state'),
columnFilter: {
name: 'alertLevelCode',
@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
fetchItemLack.value.fetch();
} catch (err) {
console.error('Error saving changes', err);
f;
}
};
@ -171,7 +163,11 @@ function onBuysFetched(data) {
<FetchData
ref="fetchItemLack"
:url="`Tickets/itemLack`"
:params="{ id: entityId }"
:params="{
itemFk: entityId,
warehouseFk: $props.filter.warehouseFk,
availabled: Date.getCurrentDateTimeFormatted(),
}"
@on-fetch="(data) => (itemLack = data[0])"
auto-load
/>
@ -207,6 +203,7 @@ function onBuysFetched(data) {
dense
:is-editable="true"
:row-click="false"
:search-url="false"
:right-search="false"
:right-search-icon="false"
v-model:selected="selectedRows"
@ -214,7 +211,6 @@ function onBuysFetched(data) {
>
<template #top-left>
<div style="display: flex; align-items: center" v-if="itemLack">
<!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
<div class="flex column" style="align-items: center">
<QBadge
ref="badgeLackRef"
@ -239,7 +235,7 @@ function onBuysFetched(data) {
<template #column-status="{ row }">
<QTd style="min-width: 150px">
<div class="icon-container">
<div class="flex items-start q-ma-sm">
<QIcon
v-if="row.isBasket"
name="vn:basket"
@ -266,9 +262,10 @@ function onBuysFetched(data) {
size="xs"
>
<QTooltip>{{
t('negative.detail.hasObservation')
}}</QTooltip> </QIcon
><QIcon
row?.note || t('negative.detail.hasObservation')
}}</QTooltip>
</QIcon>
<QIcon
v-if="row.isRookie"
name="vn:Person"
size="xs"
@ -305,9 +302,9 @@ function onBuysFetched(data) {
</span>
</template>
<template #column-ticketFk="{ row }">
<span class="q-pa-sm link">
{{ row.id }}
<TicketDescriptorProxy :id="row.id" />
<span class="link" @click.stop>
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>
</template>
<template #column-alertLevelCode="props">
@ -335,15 +332,6 @@ function onBuysFetched(data) {
</VnTable>
</template>
<style lang="scss" scoped>
.icon-container {
display: grid;
grid-template-columns: repeat(3, 0.2fr);
row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
}
.icon-container > * {
width: 100%;
height: auto;
}
.list-enter-active,
.list-leave-active {
transition: all 1s ease;

View File

@ -2,7 +2,9 @@
import { ref } from 'vue';
import axios from 'axios';
import VnSelect from 'src/components/common/VnSelect.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['update-item']);
const showChangeItemDialog = ref(false);
@ -37,7 +39,6 @@ const updateItem = async () => {
<template>
<QCard class="q-pa-sm">
<QCardSection class="row items-center justify-center column items-stretch">
{{ showChangeItemDialog }}
<span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
<VnSelect
url="Items/WithName"
@ -47,6 +48,7 @@ const updateItem = async () => {
option-label="name"
option-value="id"
v-model="newItem"
autofocus
>
</VnSelect>
</QCardSection>

View File

@ -2,8 +2,9 @@
import { ref } from 'vue';
import axios from 'axios';
import VnInput from 'src/components/common/VnInput.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const showChangeQuantityDialog = ref(false);
const newQuantity = ref(null);
const $props = defineProps({
@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
const updateQuantity = async () => {
try {
showChangeQuantityDialog.value = true;
const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
axios.post(`Sales/${saleFk}/updateQuantity`, {
saleFk,
ticketFk,
quantity: +newQuantity.value,
}),
);
const result = await Promise.allSettled(rowsToUpdate);
notifyResults(result, 'saleFk');
notifyResults(result, 'ticketFk');
emit('update-quantity', newQuantity.value);
} catch (err) {
@ -42,6 +44,7 @@ const updateQuantity = async () => {
:min="0"
:label="$t('negative.detail.modal.changeQuantity.placeholder')"
v-model="newQuantity"
autofocus
/>
</QCardSection>
<QCardActions align="right">

View File

@ -3,8 +3,9 @@ import { ref } from 'vue';
import axios from 'axios';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['update-state']);
const editableStates = ref([]);
const showChangeStateDialog = ref(false);
@ -49,6 +50,7 @@ const updateState = async () => {
:options="editableStates"
option-label="name"
option-value="code"
autofocus
/>
</QCardSection>
<QCardActions align="right">

View File

@ -0,0 +1,56 @@
import { Notify } from 'quasar';
import useOpenURL from 'src/composables/useOpenURL';
import { useI18n } from 'vue-i18n';
export function displayResults() {
const { t } = useI18n();
const createSuccessNotification = (id, path) => {
Notify.create({
type: 'positive',
message: t('globals.dataSaved'),
actions: [
{
label: t('globals.openDetail'),
color: 'white',
handler: () => useOpenURL(`#/ticket/${id}/${path}`),
},
],
});
};
const handleResult = (result, key, path) => {
if (result.status !== 'fulfilled') {
const data = JSON.parse(result.reason.config.data);
const error =
result.reason.response?.data?.error?.message ?? result.reason.message;
Notify.create({
type: 'negative',
message: `Ticket ${data[key]}: ${error}`,
});
return;
}
const data = JSON.parse(result.value.config.data);
let id = data[key];
if (result.value.data.status === 'noSplit') {
Notify.create({
type: 'warning',
message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
});
return;
}
if (result.value.data.status === 'split') {
id = result.value.data.newTicket;
}
createSuccessNotification(id, path);
};
const notifyResults = (results, key, path = 'sale') =>
results.forEach((result) => handleResult(result, key, path));
return { notifyResults };
}

View File

@ -51,11 +51,6 @@ onMounted(async () => await getItemPackingTypes());
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
auto-load
/>
<VnFilterPanel

View File

@ -67,12 +67,14 @@ const onClientSelected = async (formData) => {
const fetchAvailableAgencies = async (formData) => {
resetAgenciesSelector(formData);
const response = await getAgencies(formData, selectedClient.value);
const response= await getAgencies(formData, selectedClient.value);
if (!response) return;
const { options, agency } = response;
if (options) agenciesOptions.value = options;
if (agency) formData.agencyModeId = agency;
const { options, agency } = response
if(options)
agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
};
const redirectToTicketList = (_, { id }) => {
@ -90,11 +92,6 @@ const redirectToTicketList = (_, { id }) => {
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
order="name"
auto-load
/>

View File

@ -40,7 +40,7 @@ onBeforeMount(async () => {
function resetAgenciesSelector(formData) {
agenciesOptions.value = [];
if (formData) formData.agencyModeId = null;
if(formData) formData.agencyModeId = null;
}
const fetchClient = async (formData) => {
@ -67,12 +67,14 @@ const onClientSelected = async (formData) => {
const fetchAvailableAgencies = async (formData) => {
resetAgenciesSelector(formData);
const response = await getAgencies(formData, selectedClient.value);
const response= await getAgencies(formData, selectedClient.value);
if (!response) return;
const { options, agency } = response;
if (options) agenciesOptions.value = options;
if (agency) formData.agencyModeId = agency;
const { options, agency } = response
if(options)
agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
};
const redirectToTicketList = (_, { id }) => {
@ -84,11 +86,6 @@ const redirectToTicketList = (_, { id }) => {
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
order="name"
auto-load
/>

View File

@ -41,16 +41,7 @@ const groupedStates = ref([]);
@on-fetch="(data) => (agencies = data)"
auto-load
/>
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehouses = data)"
auto-load
:where="{
isForTicket: {
neq: 0,
},
}"
/>
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
<VnFilterPanel
:data-key="props.dataKey"
:search-button="true"

View File

@ -55,11 +55,6 @@ onMounted(async () => {
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
:where="{
isForTicket: {
neq: 0,
},
}"
auto-load
/>
<VnFilterPanel

View File

@ -202,11 +202,6 @@ const columns = computed(() => [
attrs: {
url: 'warehouses',
fields: ['id', 'name'],
where: {
isForTicket: {
neq: 0,
},
},
},
format: (row) => row.warehouse,
columnField: {
@ -673,13 +668,9 @@ function setReference(data) {
:sort-by="['name']"
:label="t('globals.warehouse')"
v-model="data.warehouseId"
:options="warehousesOptions"
hide-selected
required
:where="{
isForTicket: {
neq: 0,
},
}"
@update:model-value="() => fetchAvailableAgencies(data)"
/>
</div>

View File

@ -102,9 +102,6 @@ const columns = computed(() => [
attrs: {
url: 'Warehouses',
fields: ['id', 'name'],
where: {
isForTicket: { neq: 0 },
},
},
inWhere: true,
},

View File

@ -208,7 +208,6 @@ ticketList:
hour: Hour
rounding: Rounding
noVerifiedData: No verified data
warehouse: Warehouse
purchaseRequest: Purchase request
notVisible: Not visible
clientFrozen: Client frozen
@ -237,6 +236,7 @@ negative:
minTimed: minTimed
negativeAction: Negative
totalNegative: Total negatives
availabled: Availabled
days: Days
buttonsUpdate:
item: Item
@ -266,7 +266,7 @@ negative:
isRookie: Is rookie
turno: Turn line
isBasket: Basket
hasObservation: Has substitution
hasObservation: Has substitution note
hasToIgnore: VIP
modal:
changeItem:
@ -289,3 +289,4 @@ negative:
newTicket: New ticket
status: Result
message: Message
noSplit: No split

View File

@ -216,7 +216,8 @@ ticketList:
negative:
hour: Hora
id: Id Articulo
longName: Articulo
longName: Artículo
itemFk: Artículo
supplier: Productor
colour: Color
size: Medida
@ -232,6 +233,7 @@ negative:
inkFk: Color
timed: Hora
date: Fecha
availabled: Disponible
minTimed: Hora
type: Tipo
negativeAction: Negativo
@ -265,7 +267,7 @@ negative:
isRookie: Cliente nuevo
turno: Linea turno
isBasket: Cesta
hasObservation: Tiene sustitución
hasObservation: Tiene nota de sustitución
hasToIgnore: VIP
modal:
changeItem:
@ -284,10 +286,11 @@ negative:
title: Gestionar tickets spliteados
subTitle: Confir fecha y agencia
split:
ticket: Ticket viejo
ticket: Ticket origen
newTicket: Ticket nuevo
status: Estado
message: Mensaje
noSplit: No se puede splitar
rounding: Redondeo
noVerifiedData: Sin datos comprobados
purchaseRequest: Petición de compra

View File

@ -28,21 +28,13 @@ const warehousesOptionsIn = ref([]);
url="Warehouses"
@on-fetch="(data) => (warehousesOptionsOut = data)"
auto-load
:where="{
isOrigin: {
neq: 0,
},
}"
:filter="{ where: { isOrigin: TRUE } }"
/>
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptionsIn = data)"
auto-load
:where="{
isDestiny: {
neq: 0,
},
}"
:filter="{ where: { isDestiny: TRUE } }"
/>
<FormModel :url-update="`Travels/${route.params.id}`" model="Travel">
<template #form="{ data }">

View File

@ -183,9 +183,7 @@ warehouses();
<VnSelect
:label="t('extraCommunity.filter.warehouseOutFk')"
v-model="params.warehouseOutFk"
:options="
warehousesOptions.filter((option) => option.isOrigin !== 0)
"
:options="warehousesOptions"
option-value="id"
option-label="name"
hide-selected
@ -199,9 +197,7 @@ warehouses();
<VnSelect
:label="t('extraCommunity.filter.warehouseInFk')"
v-model="params.warehouseInFk"
:options="
warehousesOptions.filter((option) => option.isDestiny !== 0)
"
:options="warehousesOptions"
option-value="id"
option-label="name"
hide-selected

View File

@ -81,11 +81,6 @@ const redirectToTravelBasicData = (_, { id }) => {
option-value="id"
option-label="name"
hide-selected
:where="{
isOrigin: {
neq: 0,
},
}"
/>
<VnSelect
:label="t('globals.warehouseIn')"
@ -94,11 +89,6 @@ const redirectToTravelBasicData = (_, { id }) => {
option-value="id"
option-label="name"
hide-selected
:where="{
isDestiny: {
neq: 0,
},
}"
/>
</VnRow>
</template>

View File

@ -64,11 +64,6 @@ defineExpose({ states });
option-filter="name"
dense
filled
:where="{
isDestiny: {
neq: 0,
},
}"
/>
<VnInputDate
:label="t('travel.shipped')"
@ -94,11 +89,6 @@ defineExpose({ states });
option-filter="name"
dense
filled
:where="{
isOrigin: {
neq: 0,
},
}"
/>
<VnInputDate
:label="t('travel.landed')"

View File

@ -99,7 +99,6 @@ const columns = computed(() => [
fields: ['id', 'name'],
optionLabel: 'name',
optionValue: 'id',
where: { isDestiny: { neq: 0 } },
},
format: (row) => row.warehouseInName,
columnField: {
@ -134,7 +133,6 @@ const columns = computed(() => [
attrs: {
url: 'warehouses',
fields: ['id', 'name'],
where: { isOrigin: { neq: 0 } },
},
format: (row) => row.warehouseOutName,
columnField: {

View File

@ -27,7 +27,7 @@ const entityId = computed(() => {
<template>
<EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
<template #menu="{ entity }">
<ZoneDescriptorMenuItems :zone="entity" />
<ZoneDescriptorMenuItems />
</template>
<template #body="{ entity }">
<VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />

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