Compare commits

..

993 Commits

Author SHA1 Message Date
Alex Moreno 1bbee11ec0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1142) from 8316-customerCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1142
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-22 09:11:30 +00:00
Alex Moreno 467cd8faf7 Merge branch 'dev' into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:42:53 +00:00
Jon Elias 6b84f24a08 Merge pull request 'Fix[VnLocation]: fixed label and warnings' (!1268) from Fix-VnLocationLabel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1268
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-22 08:41:17 +00:00
Jon Elias 82010f1684 Merge branch 'dev' into Fix-VnLocationLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:40:18 +00:00
Jon Elias f536d08317 fix: fixed VnLocation and warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 09:27:58 +01:00
Alex Moreno 18737878a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 09:27:41 +01:00
Jose Antonio Tubau d499565ca3 Merge pull request 'test: refs #7075 add unit tests for VnInput component' (!1209) from 7075-createTestToVnInput into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-22 08:23:39 +00:00
Jose Antonio Tubau 47cb1c2586 Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:18:58 +00:00
Alex Moreno fe7b37fd15 Merge pull request 'fix(VnSection): refs #8197 check route' (!1263) from 8197-better_check_route into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1263
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 14:11:35 +00:00
Javier Segarra 7d39211eeb Merge branch 'dev' into 8197-better_check_route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:57:29 +00:00
Jose Antonio Tubau 5618c1f53a Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:51:53 +00:00
Jose Antonio Tubau 9cdcb63603 Merge pull request 'test: refs #8380 add unit tests for VnImg component' (!1218) from 8380-createTestToVnImg into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1218
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 13:49:52 +00:00
Jose Antonio Tubau d1168c3014 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:48:46 +00:00
Alex Moreno 979c96c5ac perf: refs #8197 perf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 14:11:03 +01:00
Alex Moreno 5b5eca0606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-better_check_route 2025-01-21 14:07:29 +01:00
Javier Segarra 58edb1007a Merge pull request 'fix: init' (!1262) from fix_quasar_lang into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1262
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 13:03:03 +00:00
Javier Segarra 00cea34dde perf: use util in OutLayout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:55:20 +01:00
Alex Moreno 7bca8a4194 fix(VnSection): refs #8197 check route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:48:04 +01:00
Javier Segarra 21251a5167 fix: init
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:25:45 +01:00
Alex Moreno 350dedd78d feat: refs #8316 add slots on VnTable from VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:19:46 +01:00
Jon Elias a1ef002a24 Merge pull request '#7305 deleted warnings' (!1196) from 7305-CustomerFiscalDataWarning into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1196
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 12:15:41 +00:00
Jon Elias 9cb0292361 Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:12:21 +00:00
Jon Elias 9383a3b4fb Merge pull request '#7068: Created VnVisibleColumns test' (!1250) from 7068-TableVisibleColumnsTest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1250
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 12:11:44 +00:00
Jon Elias befbbf3f73 Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:10:56 +00:00
Alex Moreno aee29345a5 build: refs #8316 merge dev 2025-01-21 13:05:55 +01:00
Javier Segarra b0c23b03fd Merge pull request 'update_quasar_version' (!1259) from update_quasar_version into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1259
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 11:40:25 +00:00
Javier Segarra 26e6ceb24d Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:22:14 +00:00
Jon Elias a6e57127f9 Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:16:24 +00:00
Javier Segarra fe99bdf3fd Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:04:36 +00:00
Alex Moreno 1b394e3cac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 11:58:54 +01:00
Alex Moreno b35952928c build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 11:57:37 +01:00
Alex Moreno 9f280c6089 Merge pull request 'perf: refs #8197 fix and imrpove filters' (!1234) from 8197-fix_filters into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1234
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 10:48:31 +00:00
Alex Moreno a2499f11e1 Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:45:42 +00:00
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1254
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-21 10:44:45 +00:00
Jon Elias 28db925645 refactor: refs #7068 adjust variables
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:05:24 +01:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-21 10:58:46 +01:00
Javier Segarra df7ab77225 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 09:53:29 +00:00
Jon Elias 96d1ef7f68 fix: refs #8448 e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-21 10:48:04 +01:00
PAU ROVIRA ROSALENY 9dd53855b5 Merge pull request 'feat: #8395 added total column in invoiceInVat' (!1243) from 8395-invoiceInVatTotal into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1243
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-21 09:10:48 +00:00
PAU ROVIRA ROSALENY 0f64477763 fix: refs #8395 update label for total column
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:08:26 +01:00
PAU ROVIRA ROSALENY 1fbcd0ccd5 Merge branch '8395-invoiceInVatTotal' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:04:21 +01:00
PAU ROVIRA ROSALENY 402b2882da feat: refs #8395 added computed to calculate and display amounts 2025-01-21 10:04:18 +01:00
PAU ROVIRA ROSALENY e169031c19 Merge branch 'dev' into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 09:03:26 +00:00
Jon Elias eb1c621066 Merge branch '7068-TableVisibleColumnsTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 09:06:55 +01:00
Jon Elias b36c53119c refactor: refs #7068 requested changes 2025-01-21 09:06:53 +01:00
Jon Elias d178a77bc6 Merge pull request 'Fix: Move dialog to descriptorMenu' (!1246) from Fix-InvoiceInDescriptorDialog into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1246
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-21 07:52:42 +00:00
Jon Elias 7c91869c8b Merge branch 'dev' into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 07:51:35 +00:00
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:50:57 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 06:49:28 +00:00
Javi Gallego 590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:48:30 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 1feb26bd6d Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 06:37:59 +00:00
Alex Moreno 3cb21d7117 fix: use entryFilter
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:34:48 +01:00
Alex Moreno 824b60df57 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:33:09 +01:00
Alex Moreno 7357559c48 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:32:21 +01:00
Alex Moreno 44d3fa7634 Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1240
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:31:42 +00:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 22:13:30 +00:00
Javier Segarra 3f753a97e7 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-20 21:46:57 +00:00
Javier Segarra fb2baa6180 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 21:39:42 +00:00
Javier Segarra 0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 21:33:13 +00:00
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 17:30:10 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 17:29:21 +00:00
Jorge Penadés f8bcc74133 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 18:09:31 +01:00
Jorge Penadés e1b329db34 Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 14:42:57 +00:00
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 15:41:55 +01:00
Jose Antonio Tubau 9c6e41d2ae Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:49:54 +00:00
Jose Antonio Tubau 6f8b04a3ed Merge branch '8380-createTestToVnImg' of https://gitea.verdnatura.es/verdnatura/salix-front into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:47:06 +01:00
Jose Antonio Tubau 096f0c57ba refactor: refs #8380 remove unnecessary stubs in VnImg test wrapper 2025-01-20 14:47:04 +01:00
Jon Elias 84dd46b22c Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:45:43 +00:00
Jon Elias 5a5adbd165 fix: sort by name in description
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:42:51 +01:00
Jon Elias 7eadb62af7 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:39:33 +01:00
Jon Elias f1fb2f9904 fix: fixed rectificative class 2025-01-20 14:39:32 +01:00
Jorge Penadés 819a5e2d6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog 2025-01-20 14:18:33 +01:00
Jorge Penadés 91f10bba79 Merge pull request 'feat: skip tests' (!1235) from skipTests into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 13:16:57 +00:00
Jon Elias f7a3bdf997 Merge branch 'dev' into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 12:54:22 +00:00
Carlos Satorres a3fe097970 Merge pull request 'fix: refs #6898 hotfix filter' (!1252) from 6898-hotfixFiscalData into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1252
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 12:52:41 +00:00
Jon Elias 5ed5554495 refactor: move remaining data to descriptorMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:52:38 +01:00
Carlos Satorres 77857e9d31 Merge branch 'master' into 6898-hotfixFiscalData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:47:27 +00:00
Carlos Satorres c7b24adc5a fix: refs #6898 hotfix filter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 13:39:56 +01:00
Javier Segarra 1f2746ac18 Merge pull request 'Remove space checkbox when is not hover' (!1002) from hotfix_checbox_css into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1002
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-20 12:28:13 +00:00
Jorge Penadés ff14d81f51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:21:32 +01:00
Jorge Penadés 7d57b1ebe7 test: skip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:13:09 +01:00
Jorge Penadés bdae839e50 fix: refs #7936 toggle option
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:56:40 +01:00
Javier Segarra c3203b18e7 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:17:58 +00:00
Carlos Satorres c333428389 Merge pull request 'fix: fix ticketSale quantity' (!1251) from hotfix-7356ticketSale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 11:11:48 +00:00
Carlos Satorres a3cdb18535 fix: fix use-like
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:04:59 +01:00
Jorge Penadés ae68f25c3c fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:55:49 +01:00
Jorge Penadés ff95882e42 fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:51:53 +01:00
Jon Elias 773c917c20 Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:43:34 +00:00
Jorge Penadés 1d3feef1e7 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:39:59 +01:00
Jorge Penadés 18d4661bc3 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:37:28 +01:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:26:57 +01:00
Jorge Penadés 3abd06db02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:00:55 +01:00
Jon Elias efb0162f9c feat: refs #7068 created VnVisibleColumns unit test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:58:49 +01:00
Jorge Penadés 2f40b77f0b Merge pull request '#8198 keep section filter' (!1210) from 8198-keepSectionFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1210
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 09:42:31 +00:00
Jorge Penadés 7795fd1524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:30:33 +01:00
Jorge Penadés e636a37c33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:18:05 +01:00
Jorge Penadés 8843318b66 fix: refs #7936 update select model-value WIP
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 10:10:45 +01:00
Javier Segarra 6965c5ea78 Merge branch 'dev' into update_quasar_version 2025-01-20 08:57:16 +00:00
Javier Segarra 06d42ca876 feat: downgrade pnpm 2025-01-20 09:56:32 +01:00
Jon Elias ad2e502010 fix: move dialog to descriptorMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 08:44:48 +01:00
Jon Elias b447df7217 Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 07:07:30 +00:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 07:06:14 +00:00
Javier Segarra 7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 07:05:01 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 08:01:46 +01:00
PAU ROVIRA ROSALENY c43a8d0a38 Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 06:01:32 +00:00
PAU ROVIRA ROSALENY c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:54:22 +00:00
PAU ROVIRA ROSALENY dd88598072 Merge branch 'dev' into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:23:18 +00:00
PAU ROVIRA ROSALENY 57804f9f2d feat: refs #8395 added total column in invoiceInVat
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-17 14:08:36 +01:00
Javier Segarra 238817285d perf: remove warning default value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:35:14 +00:00
Jon Elias 9d35dc08dd Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1236
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-17 12:21:32 +00:00
PAU ROVIRA ROSALENY 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY 32909a96bd feat: refs #8258 added uppercase validation on supplier create
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:19:12 +01:00
Jon Elias 63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:09:37 +00:00
Jon Elias e1a395b015 refactor: redirect using params
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:07:30 +01:00
Jose Antonio Tubau dac99dc132 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1144
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-17 11:49:15 +00:00
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-17 12:33:37 +01:00
Javier Segarra 7994f3c791 fix: remove departmentCode
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 11:13:37 +00:00
Jose Antonio Tubau 3305bb4222 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 10:33:08 +00:00
Javier Segarra 179f5a684f Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 09:09:11 +00:00
Javier Segarra 04bbf9e9d7 Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-17 09:05:46 +00:00
Jose Antonio Tubau 872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 08:21:17 +00:00
Jose Antonio Tubau c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY 11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:40:49 +00:00
PAU ROVIRA ROSALENY 6b3c510057 Merge pull request 'fix: #8243 fixed SkeletonSummary' (!1230) from 8243-arreglarSkeletonSummary into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1230
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-01-17 07:34:42 +00:00
Jon Elias 972b377e13 fix: redirect when confirming lines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:35:23 +01:00
Alex Moreno a738fe1579 Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 06:16:53 +00:00
PAU ROVIRA ROSALENY 98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 06:16:36 +00:00
Alex Moreno 94c0cccb1e perf: refs #8197 default is object
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:16:24 +01:00
Jon Elias b00e654fdd Merge pull request 'Fix: Redirect to TicketSale' (!1233) from Fix-RedirectToTicketSale into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1233
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-17 05:01:42 +00:00
Jorge Penadés fb530d8408 chore: refs #8198 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:29:28 +01:00
Jorge Penadés b5ae3a1901 chore: refs #8198 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:27:18 +01:00
Jorge Penadés 21bcfdc997 feat: skip tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:20:02 +01:00
Alex Moreno d95350a8eb perf: refs #8197 fix and imrpove filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 13:32:12 +01:00
Jon Elias eed895b21c fix: redirect to TicketSale from OrderLines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 13:25:00 +01:00
Jorge Penadés 31795ae40b test: refs #8198 skip tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 12:51:35 +01:00
Javier Segarra 3ab3f146d4 feat: add acl in description button
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 12:45:24 +01:00
PAU ROVIRA ROSALENY e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 11:41:04 +00:00
PAU ROVIRA ROSALENY 4b3c78dd65 fix: refs #8243 fixed SkeletonSummary 2025-01-16 12:40:28 +01:00
Jorge Penadés b89293a9a3 Merge pull request 'fix: refs #7936 allow negative values' (!1226) from 7936-hotfix-allowNegative into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1226
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-16 11:37:55 +00:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 11:06:49 +00:00
Pablo Natek cc7f16b635 Merge pull request 'fix: refs #8407 close date and time popups on keydown' (!1229) from 8407-fixVnInputDate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1229
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-16 11:01:35 +00:00
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 11:59:08 +01:00
Jorge Penadés 39adfb3693 fix: refs #8198 update query param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 10:43:40 +01:00
Jorge Penadés 64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 10:40:50 +01:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 09:53:13 +01:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 09:45:15 +01:00
Jorge Penadés 6ca732986d Merge pull request 'hotfix: #7323 catch mail err' (!1225) from hotfix-7323-catchMailErr into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1225
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-16 08:38:06 +00:00
Guillermo Bonet 9b1554b123 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-16 09:34:14 +01:00
Guillermo Bonet 86169d980c feat: refs #7882 Added coords to create a address 2025-01-16 09:34:12 +01:00
PAU ROVIRA ROSALENY 71daac1c9d Merge pull request 'feat: #7077 created test for VnInputTime' (!1163) from 7077-testVnInputTime into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1163
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-16 08:24:02 +00:00
Javi Gallego 8c7747999d feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-16 09:09:05 +01:00
Alex Moreno a71da3a45d Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:25:48 +00:00
PAU ROVIRA ROSALENY 8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:18:40 +00:00
PAU ROVIRA ROSALENY f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-16 07:18:07 +01:00
PAU ROVIRA ROSALENY 82e6cc0790 refactor: refs #7077 removed some comments 2025-01-16 07:18:05 +01:00
PAU ROVIRA ROSALENY 4b9453380a Merge pull request 'feat: #7087 created CardSummary test' (!1197) from 7087-testCardSummary into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-16 06:16:45 +00:00
PAU ROVIRA ROSALENY a0f7905983 Merge branch 'dev' into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:15:51 +00:00
PAU ROVIRA ROSALENY ce7e529776 Merge branch 'dev' into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:15:36 +00:00
Javier Segarra 1befb353a9 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:12:01 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 16:10:33 +01:00
Jose Antonio Tubau b5bdb975b8 test: refs #7075 add TODO for handling keydown behavior in VnInput component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 15:41:19 +01:00
Jose Antonio Tubau 80413eef3e refactor: refs #8316 moved localizations to local locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 15:19:47 +01:00
PAU ROVIRA ROSALENY 0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 13:42:01 +00:00
Alex Moreno c6d7008ed5 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1149) from 8316-orderCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1149
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 11:41:35 +00:00
Alex Moreno a95f6f56bd fix: refs #8316 userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 12:17:06 +01:00
Alex Moreno 3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 11:11:49 +00:00
Alex Moreno a153dd8860 fix: refs #8316 use section-searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 12:11:10 +01:00
Alex Moreno 3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:06:17 +01:00
Alex Moreno 56e0965499 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-15 12:05:38 +01:00
Alex Moreno a15d052589 Merge pull request '8197-fix_searchbar_teleport' (!1204) from 8197-fix_searchbar_teleport into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-15 11:05:33 +00:00
Alex Moreno 7661f9e633 Merge branch 'test' into 8197-fix_searchbar_teleport
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-15 11:04:39 +00:00
Alex Moreno 9765066493 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:03:02 +01:00
Jon Elias 6724818ebe Merge pull request '#8247: Fixed acls and added lost options' (!1159) from 8247-EnableAccount into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 10:53:10 +00:00
Jon Elias c193ce33f6 Merge branch 'dev' into 8247-EnableAccount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 10:51:33 +00:00
Alex Moreno 7e0096cf30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 11:50:11 +01:00
PAU ROVIRA ROSALENY 979353119a refactor: refs #7087 removed unused imports
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 09:56:43 +01:00
PAU ROVIRA ROSALENY 01b6e94008 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 09:56:01 +01:00
PAU ROVIRA ROSALENY 6a88cad903 fix: refs #7077 removed unused imports 2025-01-15 09:55:59 +01:00
PAU ROVIRA ROSALENY 46bfd3b115 Merge branch 'dev' into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 08:54:58 +00:00
Jon Elias 1f76d572ce Merge pull request 'Hotfix[CustomerDescriptor]: Fixed icons in descriptor' (!1217) from Hotfix-CustomerDescriptorIcons into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1217
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-15 08:23:56 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 08:22:56 +00:00
PAU ROVIRA ROSALENY 76968fe6bd fix: refs #7087 fixed some tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 09:01:37 +01:00
PAU ROVIRA ROSALENY 8e4a92b6be Merge branch 'dev' into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 07:58:00 +00:00
PAU ROVIRA ROSALENY d435a44faa Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 08:55:19 +01:00
PAU ROVIRA ROSALENY 6ecbaf1a04 Merge branch '7087-testCardSummary' of https: refs #7087//gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:16 +01:00
PAU ROVIRA ROSALENY 54867597aa feat: refs #7087 added new test 2025-01-15 08:52:43 +01:00
Pablo Natek 4183ad3fa0 Merge pull request 'fix: update SIM serial number binding in WorkerPda.vue' (!1221) from hotFixWorkerPda into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1221
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 07:25:18 +00:00
Pablo Natek a7fd073886 fix: update SIM serial number binding in WorkerPda.vue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 08:23:44 +01:00
Javier Segarra 17f067144c Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 07:18:34 +00:00
Carlos Satorres 27f8a95e6f Merge pull request 'fix: hotfix 7366 6943' (!1215) from hotfix-7366-6943CreditBillingDataAWB into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1215
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 07:00:43 +00:00
Carlos Satorres 621d038133 Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 06:31:54 +00:00
Alex Moreno 6de8687be1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-15 07:12:09 +01:00
Alex Moreno dd41141cf1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-master Build started... Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-15 07:11:51 +01:00
Jose Antonio Tubau e884bab1ea test: refs #8380 add unit tests for VnImg component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 06:56:15 +01:00
Jon Elias 9f0d9bca29 Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 05:03:43 +00:00
Jon Elias 35e4f91154 fix: fixed icons in descriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 05:59:47 +01:00
Jorge Penadés 24b20605d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-14 17:24:03 +01:00
Jorge Penadés df9e5f8059 refactor: refs #8198 simplify state management and data fetching in ItemDiary component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 17:13:59 +01:00
PAU ROVIRA ROSALENY 698c20550f Merge branch 'dev' into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 13:49:32 +00:00
PAU ROVIRA ROSALENY 5ce78ba473 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 12:45:18 +00:00
Jorge Penadés 3cc5595e14 refactor: refs #8198 simplify data fetching and filtering logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 13:08:52 +01:00
Jon Elias 372a43b17e Merge pull request 'Fix: Fixed CustomerDescriptor' (!1212) from Fix-CustomerIcons into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1212
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-14 11:03:39 +00:00
Javier Segarra ed483baef6 Merge pull request 'Hotfix: VnLocation' (!1211) from hotfix_vnLocation_selectValue into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1211
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-14 11:01:50 +00:00
Javier Segarra 4c4d5649ba Merge branch 'dev' into Fix-CustomerIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 11:01:43 +00:00
Javier Segarra 6f50d44772 Merge branch 'master' into hotfix_vnLocation_selectValue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 11:00:38 +00:00
Carlos Satorres 64fcf3c824 fix: hotfix 7366 6943
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 11:36:46 +01:00
Jose Antonio Tubau a36c2ec32a Merge pull request 'test: refs #7076 added new test for VnInputDate' (!1188) from 7076-createTestVnInputDate into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1188
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-14 09:10:40 +00:00
Jose Antonio Tubau ec44bfbc11 Merge branch 'dev' into 7076-createTestVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:43:15 +00:00
Jon Elias 8dc2955109 Merge branch 'dev' into Fix-CustomerIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:18:24 +00:00
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 09:15:53 +01:00
Alex Moreno e61ce651ca Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-14 09:10:35 +01:00
Alex Moreno 6af26f0310 Merge branch 'test' into 8197-fix_searchbar_teleport
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-14 08:09:55 +00:00
Alex Moreno 30e501610d fix: parallelism
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 09:09:26 +01:00
Jon Elias ad4a8beb0a Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:53:18 +00:00
Jose Antonio Tubau f16e956a53 Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:45:54 +00:00
Jose Antonio Tubau 0a577e0524 Merge branch '7075-createTestToVnInput' of https://gitea.verdnatura.es/verdnatura/salix-front into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:45:23 +01:00
Jose Antonio Tubau d0e2093a1c test: refs #7075 update VnInput tests to include label and data-cy attribute 2025-01-14 08:45:21 +01:00
Javier Segarra 8b7337f9ee fix: vnlocation
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 08:37:10 +01:00
Jose Antonio Tubau 702ae17d94 refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:25:10 +01:00
Alex Moreno 0dc0c9efd0 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-14 08:18:49 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 08:16:44 +01:00
Jose Antonio Tubau bd9c2ad4dc refactor: refs #8316 remove unused OrderSearchbar component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:57:54 +01:00
Jon Elias 6e5b703018 fix: refs #8247 conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:47:33 +01:00
Jon Elias 179571e3e9 Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:46:34 +01:00
Alex Moreno 63a6073cce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-14 07:37:37 +01:00
Jon Elias 3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 07:37:22 +01:00
Jon Elias e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin 2025-01-14 07:37:17 +01:00
Alex Moreno bce40834a5 Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1207
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-01-14 06:32:35 +00:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY b8344f3b22 Merge pull request 'feat: refs #7055 created FilterItemForm test' (!1187) from 7055-testFilterItemForm into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1187
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-14 06:03:50 +00:00
PAU ROVIRA ROSALENY 34442c8577 Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 05:59:53 +00:00
Javier Segarra 0a8312a3a8 perf: vitest to 0.34.0
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 06:50:15 +01:00
Javier Segarra 6855a0efec revert: vitest to 0.31.1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 06:47:53 +01:00
Javier Segarra e751233233 perf: pnpm-lock
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 06:15:58 +01:00
Javier Segarra 449a790427 test: fix component 2025-01-14 06:15:40 +01:00
Javier Segarra eb008e8330 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 05:59:46 +01:00
Jorge Penadés 8d1a095302 Merge branch 'test' into 8197-fix_searchbar_teleport
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-13 15:15:23 +00:00
Alex Moreno dbafd5d689 build: refs #8389 changelog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-13 15:24:20 +01:00
Jose Antonio Tubau 1485166fdd Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:05:49 +00:00
Jose Antonio Tubau 10767615de test: refs #7075 add unit tests for VnInput component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-13 15:05:15 +01:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:49:15 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-13 14:49:02 +01:00
Alex Moreno 01a6d714eb Merge branch 'test' into 8197-fix_searchbar_teleport
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-13 13:36:56 +00:00
Jon Elias 07ecd93fe0 Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 13:33:35 +00:00
Alex Moreno 074bb6c94c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:34:55 +01:00
Alex Moreno 671f308006 revert: revert header
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY a22330b15e Merge branch 'dev' into 7077-testVnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 12:20:33 +00:00
Alex Moreno d0e6c28ea2 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 13:15:49 +01:00
Alex Moreno e9645cf86c Merge branch '8316-customerCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:05 +01:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:54:12 +00:00
PAU ROVIRA ROSALENY c9c0e87e46 Merge branch 'dev' into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:42:01 +00:00
PAU ROVIRA ROSALENY 50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 12:27:26 +01:00
Jorge Penadés a32ec49efd Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1205
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 11:25:23 +00:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-13 12:21:33 +01:00
Alex Moreno dd335ef409 fix: refs #8197 not use yet
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-13 12:18:52 +01:00
Alex Moreno ed0730df22 feat: refs #8197 useHasContent and use in VnSection and RightMenu 2025-01-13 12:17:55 +01:00
PAU ROVIRA ROSALENY 7a5de9f708 Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:07:04 +00:00
PAU ROVIRA ROSALENY 221df5fa8c Merge pull request 'fix: added missing translations in InvoiceIn' (!1201) from traduccionesInvoiceIn into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1201
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-13 11:05:54 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-13 10:56:32 +00:00
Jon Elias 5272e5aaae fix: redirect to sales when confirming lines
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein"
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:48:45 +01:00
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:27:00 +01:00
PAU ROVIRA ROSALENY f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY eb92c69475 fix: changed invoiceIn for InvoiceIn 2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY 49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY 2a121dbbb3 fix: added missing translations in InvoiceIn
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-13 10:54:28 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-13 10:23:27 +01:00
Jon Elias 330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 09:17:17 +00:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 08:41:49 +00:00
Jose Antonio Tubau 1af67db644 refactor: refs #8316 move order localization
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:37:01 +01:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions
gitea/salix-front/pipeline/pr-fix_moreOptions There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:34:32 +01:00
PAU ROVIRA ROSALENY 6c0181b2e4 Merge branch 'dev' into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 07:12:13 +00:00
PAU ROVIRA ROSALENY 5bd72c830d Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:11:46 +01:00
PAU ROVIRA ROSALENY 1295f394f3 feat: refs #7087 added more test cases 2025-01-13 08:11:41 +01:00
Pablo Natek 8ce4fc38e2 Merge pull request 'feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit' (!1199) from fixDecimalP into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1199
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-13 07:03:16 +00:00
Pablo Natek fb5d76737d feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-13 08:01:05 +01:00
Jose Antonio Tubau bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 06:45:26 +00:00
Jose Antonio Tubau e65b53fad0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 06:35:51 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 06:34:35 +00:00
Jose Antonio Tubau 7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 15:24:40 +01:00
Jose Antonio Tubau c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component 2025-01-10 15:24:09 +01:00
PAU ROVIRA ROSALENY 6a01c9b746 Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 13:54:08 +00:00
PAU ROVIRA ROSALENY e8105f312f Merge branch 'dev' into 7087-testCardSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 13:08:58 +00:00
PAU ROVIRA ROSALENY bb6fae5d08 feat: refs #7087 created CardSummary test 2025-01-10 14:08:25 +01:00
Jon Elias 36f44179b2 feat: refs #7305 deleted warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 14:04:29 +01:00
Alex Moreno 6b8f6c464c Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1192
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-10 12:39:00 +00:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 12:38:01 +00:00
PAU ROVIRA ROSALENY 47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:53:10 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:03:51 +01:00
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY 6cc400a975 Merge pull request 'fix: fixed InvoiceIn filter translations' (!1193) from invoiceInTranslations into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1193
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-10 08:38:46 +00:00
PAU ROVIRA ROSALENY f834f3b754 feat: refs #8258 added button to pass to uppercase
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 07:52:22 +01:00
PAU ROVIRA ROSALENY 3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 07:44:02 +01:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 14:46:53 +01:00
Carlos Satorres db67b8f01a Merge pull request 'fix: fix confirmRequest' (!1191) from hotfix-7283itemRequestConfirm into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1191
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-09 11:53:15 +00:00
Carlos Satorres 2837d2e5af Merge branch 'master' into hotfix-7283itemRequestConfirm
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-09 11:51:37 +00:00
Alex Moreno 288919f695 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 10:11:56 +01:00
Alex Moreno 45365ba933 Merge pull request 'hotFix: refs #8264 parallelism' (!1182) from 8264-hotFix_globalInvoicing_paralellism into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1182
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-09 09:11:37 +00:00
Alex Moreno 3a7f46856a Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-09 09:10:19 +00:00
PAU ROVIRA ROSALENY c6a9c55ddc Merge pull request 'fix: removed unused searchbar' (!1190) from 8322-workerDepartment into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1190
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-09 09:02:37 +00:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 09:54:15 +01:00
Carlos Satorres 135266a300 Merge branch 'master' into hotfix-7283itemRequestConfirm
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-09 08:54:09 +00:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef"
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest
gitea/salix-front/pipeline/pr-master Build queued... Details
2025-01-09 09:44:37 +01:00
Alex Moreno f45612f058 Merge pull request 'perf_redirectTransition' (!1178) from perf_redirectTransition into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1178
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-09 08:16:53 +00:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 08:03:59 +00:00
Alex Moreno f668a4bac4 Merge branch 'test' into perf_redirectTransition
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-09 08:00:57 +00:00
Alex Moreno 3f167ffd3a fix: hotFix if not date return null/undefined
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 09:00:29 +01:00
Javi Gallego bd09090e11 fix: update button sizes in ExtraCommunity.vue for better visibility
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 08:47:18 +01:00
Alex Moreno a54483f9a5 Merge branch 'test' into perf_redirectTransition
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-09 07:30:37 +00:00
Alex Moreno b28873c67d perf: simplify if
gitea/salix-front/pipeline/pr-test Build queued... Details
2025-01-09 08:30:23 +01:00
PAU ROVIRA ROSALENY 92a130b5db Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 07:25:36 +00:00
PAU ROVIRA ROSALENY b466dfe034 feat: refs #7055 added new test case
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-09 08:25:23 +01:00
Carlos Satorres 14b8fc150b Merge pull request 'fix: modelName' (!1189) from hotfix-7366travelPopup into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1189
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-09 07:07:43 +00:00
Alex Moreno 2505061b8c perf: simplify if
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-01-09 08:06:35 +01:00
Carlos Satorres 93c059cdde Merge branch 'dev' into 7076-createTestVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 07:04:56 +00:00
Carlos Satorres 5e31b93675 fix: modelName
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-09 08:00:30 +01:00
Jose Antonio Tubau f8a0940eba test: refs #7076 added new test for VnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 07:59:43 +01:00
Alex Moreno 6d1478f703 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 07:59:34 +01:00
Alex Moreno b563eda782 Merge branch '8264-hotFix_globalInvoicing_paralellism' of https://gitea.verdnatura.es/verdnatura/salix-front into 8264-hotFix_globalInvoicing_paralellism
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-09 07:56:00 +01:00
Alex Moreno 0c30a82440 fix(InvoiceOutGlobal): refs #8264 fix invoicing 2025-01-09 07:55:57 +01:00
PAU ROVIRA ROSALENY 1142797114 Merge pull request 'feat: #7088 created test for FetchedTags' (!1162) from 7088-testFetchedTags into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1162
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-09 06:04:15 +00:00
PAU ROVIRA ROSALENY 58a4ef2ca8 Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 06:00:13 +00:00
Alex Moreno 83d4997c89 Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-08 13:29:39 +00:00
Alex Moreno 5b415a8398 Merge pull request 'fix: refs #7699 add icons and hint' (!1123) from 7699-refactroViewPassword into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1123
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-08 13:20:16 +00:00
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 13:04:00 +00:00
Robert Ferrús 60191b61ce Merge pull request 'fix: refs #8001 change link grafana' (!1186) from 8001-expeditionGrafanaHotFix into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1186
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-08 12:34:55 +00:00
Jon Elias 6fd9c84efe Merge pull request 'Fix: VnTableFilter translations' (!1183) from Fix-VnTableFilterTranslations into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1183
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-08 12:26:45 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 12:24:52 +00:00
PAU ROVIRA ROSALENY 149cca37ef Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-08 12:02:43 +00:00
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-08 12:02:23 +00:00
PAU ROVIRA ROSALENY 5dc14b8dc1 feat: refs #7055 created FilterItemForm test
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-08 13:02:08 +01:00
Alex Moreno e693323166 fix: workerTimeControl state week colors
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-08 12:57:15 +01:00
Robert Ferrús 1a72eda359 fix: refs #8001 change link grafana
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-08 12:44:35 +01:00
Alex Moreno 3ba37d515a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-08 12:19:51 +01:00
Alex Moreno b889bfd178 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-08 12:19:38 +01:00
Alex Moreno 70f692ffd5 fix(WorkerTimeControl): fix isoYear
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-08 12:19:27 +01:00
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:32:15 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 08:27:54 +00:00
Pablo Natek 1dee824224 Merge pull request 'feat: refs #8348 add CSV download functionality and update print label icon' (!1172) from 8348-exportDataOnCsv into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1172
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-08 07:55:25 +00:00
Pablo Natek d392e93efd Merge branch 'master' into 8348-exportDataOnCsv
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-08 07:15:05 +00:00
PAU ROVIRA ROSALENY dfd7ba9379 feat: refs #8258 added uppercase option to VnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 08:14:37 +01:00
Jose Antonio Tubau 7f1684ddfc refactor: refs #8316 added entryFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-08 08:14:05 +01:00
PAU ROVIRA ROSALENY 03c23a133b Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 07:12:02 +00:00
Jose Antonio Tubau 11642c075c refactor: refs #8316 added claimFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 08:10:00 +01:00
Jon Elias 1e8e2aff72 Merge pull request '#8219 Added InvoiceOut e2e tests' (!1001) from 8219-InvoiceOutE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1001
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-08 06:41:32 +00:00
PAU ROVIRA ROSALENY 6499eeda01 Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:40:29 +00:00
PAU ROVIRA ROSALENY 0d3b1130f9 fix: refs #7088 changed "vm.vm" to "vm"
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 07:39:50 +01:00
Jon Elias 9fa2a77c96 refactor: refs #8219 modified list test, created cypress download folder and added to gitignore
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 07:35:08 +01:00
Jon Elias ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 07:15:52 +01:00
Jon Elias 39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:13:35 +00:00
Jon Elias f4b443f2b0 fix: translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 07:11:26 +01:00
Jose Antonio Tubau 666cdc7674 Merge pull request 'refactor: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice' (!1174) from 8317-buttonsToRightOnItemFixedPrice into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-08 06:09:55 +00:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:08:44 +00:00
Jose Antonio Tubau bb9df49ef9 Merge pull request 'feat: refs #8117 filters and values added as needed' (!1132) from 8117-filtersAndValuesReviewed into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1132
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-08 06:06:51 +00:00
Jon Elias 57ce6d6ea3 Merge branch 'dev' into 8117-filtersAndValuesReviewed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:06:02 +00:00
Jose Antonio Tubau 2c8b120ce4 Merge pull request 'test: refs #7100 added test to vnNotes component' (!1121) from 7100-createVnNotesSpec into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1121
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-08 06:05:01 +00:00
Jose Antonio Tubau 79c7d66fe6 Merge branch 'dev' into 7100-createVnNotesSpec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:03:37 +00:00
Jose Antonio Tubau eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:01:45 +00:00
Jose Antonio Tubau 6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 05:59:56 +00:00
PAU ROVIRA ROSALENY f0889f158d Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 05:56:57 +00:00
PAU ROVIRA ROSALENY 46cd5382c1 Merge pull request 'feat: #7078 created test for VnJsonValue' (!1168) from 7078-testVnJsonValue into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1168
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-08 05:04:47 +00:00
PAU ROVIRA ROSALENY 663a417a45 Merge branch 'dev' into 7078-testVnJsonValue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 05:03:46 +00:00
Jorge Penadés c0d909b3e8 Merge pull request 'feat: refs #7957 open in new tab' (!1086) from 7957-monitorChanges into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1086
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 14:38:55 +00:00
Jorge Penadés 08d20d3e7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 15:35:45 +01:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 15:05:33 +01:00
Alex Moreno ebb4d36fda fix: refs #8264 parallelism
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 15:04:45 +01:00
Jorge Penadés 8f418dcb4b style: refs #7957 update VnSearchbar padding for improved layout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 14:31:38 +01:00
Jorge Penadés b289ba3196 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 14:11:44 +01:00
Jon Elias c9c0a25ff9 Merge pull request '#8220 created items e2e' (!1039) from 8220-ItemsE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1039
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 12:50:35 +00:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 16e4845d83 Merge pull request 'refactor: #8322 changed Worker component to use VnSection/VnCardBeta' (!1152) from 8322-worker into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 12:26:29 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:22:32 +00:00
Jorge Penadés f04aeec21d fix: refs #7957 update data-cy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 13:21:20 +01:00
PAU ROVIRA ROSALENY f273540708 Merge pull request 'fix: #8338 fixed VnTable translations' (!1173) from 8338-traduccionesVnTable into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1173
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 12:18:50 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 13:13:12 +01:00
Alex Moreno 62cdc2b4f7 Merge branch 'dev' into 8322-worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:02:22 +00:00
Alex Moreno 02973cc7d6 fix: refs #8322 unnecessary section
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-07 13:02:04 +01:00
Alex Moreno 5440d94df2 chore: refs #8322 unnecessary prop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 13:00:42 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 13:00:00 +01:00
Jorge Penadés 73c133c62b fix: refs #7957 css
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:26:05 +01:00
Jorge Penadés d925e3f8b4 fix: refs #7957 css 2025-01-07 12:24:32 +01:00
Jorge Penadés 7b9731a4c8 fix: refs #7957 css
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:22:21 +01:00
Jorge Penadés 30bdf42f3f Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 12:16:39 +01:00
Jorge Penadés 0703a8c105 Merge pull request 'fix: refs #7323 update getAbsences to handle multiple years for absence data' (!1181) from 7323-hotfix-getNextYearAbsences into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1181
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 11:05:20 +00:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 11:43:39 +01:00
Carlos Satorres 8c2f102414 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 11:18:19 +01:00
Carlos Satorres 3953721424 fix: refs #7699 fix component 2025-01-07 11:18:16 +01:00
Jorge Penadés da0e31b978 fix: refs #7323 update getAbsences to handle multiple years for absence data
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:42:16 +00:00
Jorge Penadés c6ccbd98b1 Merge pull request 'fix: refs #7936 disable option caption in EditTableCellValueForm' (!1180) from 7936-hotfix-hideCaption into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1180
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 09:39:26 +00:00
Jon Elias 6250894355 Merge pull request 'Fix: EntrySummary view' (!1155) from Fix-EntrySummary into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1155
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 09:33:32 +00:00
Jorge Penadés e0179d99d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 10:33:05 +01:00
Jorge Penadés 59c755329a fix: refs #7936 update VnSelect to conditionally render option caption
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 10:29:37 +01:00
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY e7f2d6ae7f Merge branch 'dev' into 8322-worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:22:40 +00:00
Jon Elias c27700db4d Merge pull request 'Fix: Broken E2E tests' (!1171) from Fix-IntegrationE2ETests into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1171
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 09:12:55 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:09:35 +00:00
Jon Elias 9e59383493 Merge pull request '#7202 added new field in InvoiceOut' (!1160) from 7202-AddCustomAgentFkColumn2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1160
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-07 09:05:27 +00:00
Jon Elias 2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:02:13 +00:00
Jorge Penadés 13d51bedc9 fix: refs #7936 disable option caption in EditTableCellValueForm
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 10:00:29 +01:00
Jon Elias bc2b8fff0f Merge branch 'dev' into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 08:58:19 +00:00
Jon Elias 86e9594fe9 fix: skip failling e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:56:50 +01:00
Alex Moreno 1d92e84227 fix: claimList order
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 09:51:36 +01:00
Alex Moreno 1c787130b3 build: add new version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 09:44:55 +01:00
PAU ROVIRA ROSALENY 7eb62ce23c Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 08:44:22 +00:00
PAU ROVIRA ROSALENY a14f3153b0 Merge branch 'dev' into 7078-testVnJsonValue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 08:44:05 +00:00
Alex Moreno 3a0d545b94 Merge pull request '8356-devToTest' (!1179) from 8356-devToTest into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1179
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-07 08:39:23 +00:00
Alex Moreno ddc2f99efd Merge branch 'test' of https: refs #8356//gitea.verdnatura.es/verdnatura/salix-front into 8356-devToTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 09:33:47 +01:00
Alex Moreno c645a8b4b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 09:07:08 +01:00
Alex Moreno e46b4b0b97 fix: vnNotes filter & fix: itemFixedPrice order
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 09:06:41 +01:00
Alex Moreno 97fee8d1d0 perf: order
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 08:26:33 +01:00
Alex Moreno d8c3e6bce7 perf: revert processData
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 08:24:37 +01:00
Alex Moreno e06d5df89f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 08:23:01 +01:00
Alex Moreno 76b9fbc267 perf: redirect transition list to card
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-01-07 08:21:09 +01:00
Jon Elias 582e1de8df Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 07:55:20 +01:00
Jon Elias 52f09357d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-07 07:55:18 +01:00
Alex Moreno cc6ee7ce30 Merge pull request '8355-testToMaster' (!1177) from 8355-testToMaster into master
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1177
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-01-07 06:46:54 +00:00
Jon Elias 1bc0a6dcdf Merge pull request '#8246: Added new field in list' (!1176) from 8246-ZoneAddressFk into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-07 06:40:46 +00:00
Alex Moreno ea157eaf73 build: refs #8355 add changelog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-07 07:30:44 +01:00
Jon Elias 5c839b2dfa Merge branch 'dev' into 8246-ZoneAddressFk
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 06:22:27 +00:00
Alex Moreno 3b0c31f68c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 07:20:30 +01:00
Alex Moreno 266eccb814 Merge pull request '8197-perf_vnTableInside' (!1175) from 8197-perf_vnTableInside into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1175
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-07 06:17:43 +00:00
Alex Moreno d23e077af0 fix: refs #8197 mapKey
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 07:15:40 +01:00
Jon Elias b0cb3597de feat: refs #8246 added new field in list
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 07:11:04 +01:00
PAU ROVIRA ROSALENY 09cc12667c Merge branch 'dev' into 7088-testFetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 06:07:55 +00:00
PAU ROVIRA ROSALENY 29614ce335 fix: refs #7088 changed wrapper to vm
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-07 07:06:23 +01:00
Alex Moreno 17db5ac882 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-07 07:02:04 +01:00
Alex Moreno 940e67b963 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-perf_vnTableInside
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-07 07:01:51 +01:00
Alex Moreno d0e73caefd Merge pull request 'fix: refs #8197 redirection' (!1170) from 8197-perf_redirection into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1170
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-07 06:01:34 +00:00
PAU ROVIRA ROSALENY 7502ed2da6 Merge branch 'dev' into 7078-testVnJsonValue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 05:23:49 +00:00
PAU ROVIRA ROSALENY 4834b07d5d fix: refs #7078 added missing case with array
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-07 06:23:31 +01:00
Alex Moreno af7c6a0aaf test: refs #8197 fix e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-06 18:59:48 +01:00
Alex Moreno 1a8368c4ce fix(VnDmsList): refs #8197 add mapKey
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-06 18:31:19 +01:00
Alex Moreno cc4295e722 feat: refs #8197 keepData in VnSection
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-03 15:40:19 +01:00
Alex Moreno f3835a1d83 fix: refs #8197 vnPaginate when change :id 2025-01-03 15:31:00 +01:00
Alex Moreno 8ca9668b0e Merge branch 'dev' into 8117-filtersAndValuesReviewed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 14:23:38 +00:00
Alex Moreno 388ad8d187 test: ticketExpedition working
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 13:52:36 +01:00
Alex Moreno 7fe2dd9ca7 Merge branch 'test' into 8197-perf_redirection
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-03 12:50:59 +00:00
Alex Moreno 4900935e73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 13:46:18 +01:00
Alex Moreno 64e8eec854 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 13:45:16 +01:00
Alex Moreno dc8fe65558 fix: redirection vnTable VnTableFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 13:45:07 +01:00
Alex Moreno 81116b4b13 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 13:43:12 +01:00
Alex Moreno ac2336064b test: fix expedition e2e 2025-01-03 13:43:10 +01:00
Jose Antonio Tubau c35a468e01 fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 13:33:44 +01:00
Jon Elias 5fda8e0c89 Merge branch 'dev' into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 12:21:20 +00:00
PAU ROVIRA ROSALENY 50ace09482 Merge branch 'dev' into 8338-traduccionesVnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 11:52:10 +00:00
PAU ROVIRA ROSALENY a40da6b5d9 fix: refs #8338 fixed VnTable translations
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-03 12:51:26 +01:00
Jose Antonio Tubau f53906f9c9 Merge branch 'dev' into 8117-filtersAndValuesReviewed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 11:50:10 +00:00
Jose Antonio Tubau 1a90be0561 feat: refs #8316 added order param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 12:47:24 +01:00
Pablo Natek 2b643a9dc1 feat: refs #8348 add CSV download functionality and update print label icon
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-03 12:16:24 +01:00
Jon Elias 27f7b6ce29 Merge pull request 'Fix: ItemFixedPrice' (!1167) from Fix-ItemFixedPrice into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-03 10:53:30 +00:00
Jon Elias dddfb62a95 Merge branch 'dev' into Fix-ItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 10:48:10 +00:00
Alex Moreno b156662fba Merge branch 'dev' into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 10:44:25 +00:00
Alex Moreno dd8664eebf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 11:44:19 +01:00
Alex Moreno 6d7053b1b5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 11:43:19 +01:00
Alex Moreno eb8fbe23ce fix: add data-key
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 11:39:28 +01:00
Jon Elias 55aa678bb7 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 11:14:56 +01:00
Jon Elias 143d8bea4a refactor: skip intermitent failing test 2025-01-03 11:14:52 +01:00
Jon Elias cec7de7fc6 Merge branch 'dev' into Fix-ItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 10:12:59 +00:00
Jon Elias 551498e0a5 Merge branch 'dev' into Fix-IntegrationE2ETests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 10:12:52 +00:00
Jon Elias c9179c101e fix: e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 11:11:04 +01:00
Alex Moreno 9a631a61f9 fix: refs #8197 redirection
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-03 10:46:43 +01:00
Alex Moreno 2e3e7c6a5d fix: refs #8316 use rightMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 09:44:00 +01:00
Carlos Satorres ae42142524 Merge branch 'dev' into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 08:37:05 +00:00
Carlos Satorres a89fad0ae2 fix: refs #7699 fix tfront clean code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 09:35:03 +01:00
Alex Moreno e7a0c826c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 09:25:56 +01:00
Alex Moreno cd44a443c2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 09:25:45 +01:00
Alex Moreno 80a99d1261 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 09:24:06 +01:00
Pablo Natek ef201a8322 Merge pull request 'feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component' (!1161) from 7301-warmFix into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #1161
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-03 08:02:50 +00:00
Carlos Satorres 009cf2322b Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-03 08:46:25 +01:00
Carlos Satorres cd6cc5c865 fix: refs #7699 fix vnInputPassword 2025-01-03 08:46:22 +01:00
PAU ROVIRA ROSALENY d1466746de feat: refs #7078 created test for VnJsonValue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 08:33:38 +01:00
Carlos Satorres 3cf4c5ed80 Merge branch 'dev' into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-03 07:26:19 +00:00
Carlos Satorres 60f3ea838a fix: refs #7699 fix component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-03 08:18:11 +01:00
Jon Elias a6ac9c9d3f refactor: item fixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 08:12:50 +01:00
Jose Antonio Tubau bf23895c03 Merge branch 'dev' into 7100-createVnNotesSpec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 14:13:58 +00:00
Jose Antonio Tubau 23afe3276c refactor: refs #7100 added const mockData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 15:13:36 +01:00
Pablo Natek 7eb11c497b Merge branch 'test' into 7301-warmFix
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-02 13:48:39 +00:00
Jon Elias 1eaa81d243 Merge pull request 'Hotfix: ZoneExlcusion dated field' (!1165) from Hotfix-ZoneEventExclusionDate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1165
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-01-02 13:38:02 +00:00
Jon Elias 272d69d9e1 fix: dated field
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-02 14:33:09 +01:00
Pablo Natek 6e38a23852 Merge pull request 'Warmfix: Zone exclusion dated field' (!1164) from Warmfix-ZoneExclusionEvent into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1164
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-01-02 13:24:49 +00:00
Jon Elias e648b82ecc fix: dated field
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-02 14:23:13 +01:00
PAU ROVIRA ROSALENY 93ba88f236 feat: refs #8322 added department changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 13:31:37 +01:00
Carlos Satorres 9b0d1058c5 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 13:23:04 +01:00
Carlos Satorres 4c57e55f25 fix: refs #7699 fix vnInputPassword 2025-01-02 13:23:02 +01:00
Jon Elias 49198f794c refactor: refs #8220 skip failling test and modifed tag test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 13:15:36 +01:00
Jon Elias 13d9705f69 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 13:13:44 +01:00
Jon Elias 1941e896e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-02 13:10:25 +01:00
PAU ROVIRA ROSALENY 8eccf557f0 Merge branch 'dev' into 8322-worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 12:04:55 +00:00
PAU ROVIRA ROSALENY df1b1205cf feat: refs #7077 created test for VnInputTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 12:16:05 +01:00
PAU ROVIRA ROSALENY 85bf4053bb feat: refs #7088 created test for FetchedTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 12:03:56 +01:00
Pablo Natek fb21bcc02e feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-02 11:38:04 +01:00
Jon Elias 1cecea4aee feat: refs #7202 added new field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 10:04:57 +01:00
Jon Elias 832ba01a52 Merge branch 'dev' into 8247-EnableAccount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 09:01:31 +00:00
Jon Elias 5259b8200b fix: refs #8247 fixed acls and added lost options
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-02 09:57:56 +01:00
Alex Moreno 268ddb027b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-02 08:45:52 +01:00
Alex Moreno d7b7850f62 fix: duplicate transalation after test to dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-02 08:04:39 +01:00
Alex Moreno a7e04557dc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-01-02 07:52:47 +01:00
Alex Moreno a65b8432d8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-02 07:51:39 +01:00
Jon Elias 16065b6342 Merge pull request 'Hotfix: zone events postcode select' (!1154) from Hotfix-ZoneEventSelect into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-31 12:34:38 +00:00
Jon Elias 9525eef025 Merge branch 'master' into Hotfix-ZoneEventSelect
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-31 12:33:33 +00:00
Jon Elias 27bbd7695f Merge pull request 'Hotfix: use mapKey prop to show all ocurrencies' (!1157) from Hotfix-VnSms into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1157
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-31 12:28:35 +00:00
Jon Elias 65a54b12e6 fix: use map-key prop to show all ocurrencies
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-31 13:11:59 +01:00
Javier Segarra e0fca5d24b Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-31 12:16:20 +01:00
Javier Segarra 738bb76e10 fix: refs #8220 itemTag test 2024-12-31 12:16:17 +01:00
Javier Segarra d7bcc5b358 Merge pull request 'hotfix: CustomerConsumption campaignFilter' (!1156) from hotfix_customerConsumption_campaignFilter into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1156
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-12-31 09:59:18 +00:00
Javier Segarra b6161a41e8 perf: use dateRange
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-31 10:48:07 +01:00
Javier Segarra 229130409a fix: init fix 2024-12-31 10:45:37 +01:00
Jon Elias 4c5319eacf Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-31 08:07:49 +01:00
Jon Elias 843710255e refactor: refs #8220 requested changes 2024-12-31 08:07:47 +01:00
Jon Elias a98c1b38e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-31 06:52:35 +01:00
Jon Elias 582b4f68e0 Merge branch 'dev' into Fix-EntrySummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-31 05:36:01 +00:00
Jon Elias 90c5aefac3 fix: entry summary view and build warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-31 06:14:23 +01:00
Javi Gallego fdc0a856ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-30 14:53:11 +01:00
Javi Gallego d67ae3cafb style: update CustomerBalance.vue to set label color 2024-12-30 14:53:08 +01:00
Javi Gallego cea24f4720 Merge pull request 'test: refs #7052 add unit tests for EditTableCellValueForm component' (!1104) from 7052-testEditTableCellValueForm into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1104
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-30 13:37:10 +00:00
Javi Gallego d16e2e81e4 Merge branch 'dev' into 7052-testEditTableCellValueForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 13:35:32 +00:00
Jon Elias 7e15d3c7a4 Merge branch 'master' into Hotfix-ZoneEventSelect
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-30 13:05:27 +00:00
Jon Elias 3c7880d02f fix: zone events postcode select
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-30 14:02:23 +01:00
Jon Elias 8e0e15840b Merge branch 'dev' into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 09:11:25 +00:00
Jon Elias edc1ed1a2e Merge branch 'dev' into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 09:11:23 +00:00
Javi Gallego 55ab9fea3e test: refs #7052 remove .only from EditTableCellValueForm test suite
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 08:55:00 +01:00
Jose Antonio Tubau efa08495df Merge branch 'dev' into 8316-claimCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 07:41:09 +00:00
Jose Antonio Tubau fc648530bb Merge pull request '#8266 change expedition item name' (!1073) from 8266-changeExpeditionItemNameFront into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-30 07:04:32 +00:00
Jose Antonio Tubau 3cd861edee Merge branch 'dev' into 8266-changeExpeditionItemNameFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 07:03:36 +00:00
Jose Antonio Tubau 0a2f1fb073 Merge branch 'dev' into 7100-createVnNotesSpec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 06:41:06 +00:00
Jose Antonio Tubau 771ecf1cc6 refactor: refs #7100 refactorized with methods
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 07:40:25 +01:00
Javi Gallego 5784c079ce Merge pull request '7924-itemInsepction' (!1114) from 7924-itemInsepction into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-29 09:10:43 +00:00
Javi Gallego 286e460638 Merge branch 'dev' into 7924-itemInsepction
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-29 09:09:30 +00:00
Javi Gallego 1e0d444e85 refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-29 10:06:30 +01:00
Javi Gallego 53c1040cd8 refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-29 10:05:56 +01:00
Javi Gallego 6acf6f8131 Merge branch 'dev' into 7052-testEditTableCellValueForm 2024-12-29 09:44:12 +01:00
Jose Antonio Tubau 120f7892a8 Merge branch 'dev' into 8266-changeExpeditionItemNameFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:06:33 +00:00
PAU ROVIRA ROSALENY 2eb7b7af13 refactor: refs #8322 changed translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:58:16 +01:00
PAU ROVIRA ROSALENY 4b80800182 Merge branch 'dev' into 8322-worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:56:28 +00:00
PAU ROVIRA ROSALENY b03efbc977 refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:51:23 +01:00
Jose Antonio Tubau 0b15c28449 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:09:27 +01:00
Jose Antonio Tubau a9a09ad0a3 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:58:35 +01:00
Jose Antonio Tubau 37a87fa8e1 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-test Build queued... Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:45:01 +01:00
Javier Segarra a297bb7f4a Merge pull request 'perf: remove unused variables' (!1138) from warmfix_noUsedVars into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1138
Reviewed-by: Jon Elias <jon@verdnatura.es>
2024-12-27 12:40:25 +00:00
Jose Antonio Tubau 0bd07d197c refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:39:45 +01:00
Javier Segarra 7cc4d760dd perf: remove unused variables
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-27 12:02:34 +01:00
Jon Elias ad64c4ea0c Merge pull request 'Hotfix: Remove params when searching by id on VnSearchbar' (!1102) from Hotfix-VnSearchbarRemoveParams into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-27 11:00:53 +00:00
PAU ROVIRA ROSALENY d4eb61116a Merge pull request 'fix: fixed translations' (!1136) from hotfix_unhandledTranslations into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1136
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-27 10:55:19 +00:00
Jon Elias 93047ab179 Merge pull request '#8201: Fix descriptor icons error' (!1080) from 8201-DescriptorIcons into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1080
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-27 09:55:46 +00:00
Jon Elias fad3e49e2f Merge branch 'dev' into 8201-DescriptorIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:55:02 +00:00
Javier Segarra 0211aeb5cf Merge pull request 'fix: discount class' (!1137) from fix_discount_class into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1137
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-27 09:49:59 +00:00
Jon Elias d73b03f757 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-27 09:48:39 +00:00
Javier Segarra d81daf8c66 fix: fixed translations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-27 10:42:41 +01:00
Jon Elias 0e9c342b88 Merge pull request 'Hotfix: modified VnTable bottom icon to display when no data in the table' (!1103) from Hotfix-VnTableBottomButton into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1103
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-27 09:41:17 +00:00
Jon Elias 976b891a75 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-27 09:40:16 +00:00
Jon Elias a4f6974e69 Merge branch 'master' into Hotfix-VnTableBottomButton
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-27 09:39:36 +00:00
Jon Elias c7f358115f Merge branch 'dev' into 8201-DescriptorIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:39:05 +00:00
Jon Elias 894b0d3dee Merge branch '8201-DescriptorIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 8201-DescriptorIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 10:36:04 +01:00
Jon Elias de30725322 perf: refs #8201 onDataSaved fetch 2024-12-27 10:36:03 +01:00
PAU ROVIRA ROSALENY 9d89f6c5d1 fix: discount class
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:24:39 +00:00
Jon Elias 42a4672008 Merge branch 'dev' into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:17:54 +00:00
Jon Elias d20bdf63c9 perf: refs #8220 translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 10:15:56 +01:00
Jon Elias 0eedfdee4a perf: refs #8220 on-fetch and added missing translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 10:12:12 +01:00
PAU ROVIRA ROSALENY 470e0cc08a fix: fixed translations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-27 10:08:28 +01:00
Jon Elias d6949ea0db Merge branch 'dev' into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 08:50:47 +00:00
Jon Elias 886c811b79 refactor: refs #8219 use checkNotification command
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:49:54 +01:00
Javier Segarra d1fdb1777d Merge pull request 'fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component' (!1135) from 7935-dropDuplicateCol into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1135
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-27 08:23:23 +00:00
Jon Elias ceb470fc0f Merge branch 'dev' into 8201-DescriptorIcons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 08:20:36 +00:00
Jon Elias 1ff54d7423 refactor: refs #8201 deleted condition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:18:29 +01:00
Jon Elias 2b1e1e9e1a Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 08:47:42 +01:00
Jon Elias fc5578cb18 perf: refs #8220 on-fetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 08:41:54 +01:00
Jon Elias face202918 Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 07:47:37 +01:00
Jon Elias 77b642c5f8 Merge branch 'dev' of https: refs #8220//gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-27 07:47:34 +01:00
Jorge Penadés be71e66075 fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 17:59:42 +01:00
Jose Antonio Tubau 494b8440d6 Merge pull request '#7050 testCrudModel' (!1077) from 7050-testCrudModel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1077
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-12-26 11:14:15 +00:00
Jose Antonio Tubau c27a7fc206 Merge branch 'dev' into 7050-testCrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 11:13:13 +00:00
Jose Antonio Tubau 33cf755782 Merge remote-tracking branch 'origin/dev' into 7050-testCrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 12:10:26 +01:00
Jorge Penadés 1d7927a604 Merge pull request '#7056 update route meta information and add FormModel tests' (!1122) from 7056-formModelTest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1122
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-26 11:07:20 +00:00
Jorge Penadés 90500538e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7056-formModelTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 12:06:00 +01:00
Jose Antonio Tubau f4ba551df4 fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 10:51:24 +01:00
Jose Antonio Tubau 788d7b09cf Merge branch 'dev' into 7100-createVnNotesSpec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 07:54:39 +00:00
Jose Antonio Tubau 435d9750ca Merge branch 'dev' into 8266-changeExpeditionItemNameFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 07:43:32 +00:00
Jose Antonio Tubau 81ddb119b7 Merge branch 'dev' into 8117-filtersAndValuesReviewed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 07:41:18 +00:00
Jose Antonio Tubau 7a2de50d7d feat: refs #8117 filters and values added as needed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 08:29:29 +01:00
Carlos Satorres f1d6ecd5ff Merge branch 'dev' into 7699-refactroViewPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 06:44:44 +00:00
Carlos Satorres 0d9ba62d37 fix: refs #7699 fix vnChangePassword, clean VnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 07:34:31 +01:00
Carlos Satorres f0364124cc fix: refs #7699 add pwd vnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 07:29:00 +01:00
PAU ROVIRA ROSALENY bd5daa8368 Merge pull request 'feat: #7079 created VnLocation front test' (!1126) from 7079-testVnLocation into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1126
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-24 13:08:10 +00:00
PAU ROVIRA ROSALENY 37f16cb762 Merge branch 'dev' into 7079-testVnLocation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 13:07:06 +00:00
Jose Antonio Tubau 87cf722c5f Merge branch 'dev' into 8266-changeExpeditionItemNameFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 12:03:14 +00:00
Jose Antonio Tubau 638bd1dc26 refactor: refs #7050 removed blank spaces
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 12:59:40 +01:00
Jose Antonio Tubau 0e57d18171 Merge remote-tracking branch 'origin/dev' into 7100-createVnNotesSpec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 12:51:19 +01:00
Jose Antonio Tubau 790c82926b Merge pull request 'feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog()' (!1092) from 7074-makeFrontTestToVnDmsList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1092
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-24 11:45:59 +00:00
Javier Segarra 9d03333e37 Merge branch 'dev' into 7074-makeFrontTestToVnDmsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 12:31:24 +01:00
PAU ROVIRA ROSALENY 89acb338a9 refactor: refs #7079 removed useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 12:18:36 +01:00
PAU ROVIRA ROSALENY 7d1f25563d Merge branch 'dev' into 7079-testVnLocation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 11:15:29 +00:00
Alex Moreno 9c899a65e6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 12:04:17 +01:00
Alex Moreno 9dabe11cd0 fix(AccountList): use $refs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 12:02:58 +01:00
PAU ROVIRA ROSALENY 4f60544a1e Merge branch 'dev' into 7079-testVnLocation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 10:59:36 +00:00
Alex Moreno 774afbec06 Merge branch 'beta' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-24 11:57:39 +01:00
Alex Moreno afa4a6ac43 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 11:44:47 +01:00
Alex Moreno 14b8284e34 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 11:44:31 +01:00
Alex Moreno 2e4fccf8cb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 11:43:38 +01:00
Alex Moreno cd4d5d011e Merge pull request '8197-VnCardMain' (!1044) from 8197-VnCardMain into beta
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1044
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-12-24 10:29:03 +00:00
Carlos Satorres 43af53da38 Merge pull request 'fix: ClaimList orderBy priority' (!1128) from warmfix_claimList_orderBy into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1128
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-12-24 09:19:11 +00:00
Javier Segarra 17b178d9f1 fix: orderBy priority
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-24 09:06:17 +00:00
Carlos Satorres 01f63ff239 fix: refs #7699 fix password visibility
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 09:52:31 +01:00
Carlos Satorres 550340e720 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword 2024-12-24 08:17:28 +01:00
Alex Moreno cfb35d23b4 perf: refs #8197 perf
gitea/salix-front/pipeline/pr-beta This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 18:16:50 +01:00
Alex Moreno dd36b35bf7 fix: refs #8197 staticParams and redirect
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-23 17:56:09 +01:00
Jorge Penadés 7ef1e49277 Merge pull request 'fix: refs #7133 handleSalesModelValue function to handle empty input' (!1116) from 7133-fixCustomerSelect into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-23 15:56:32 +00:00
Jorge Penadés 24d09c1841 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7133-fixCustomerSelect
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 16:55:17 +01:00
Jose Antonio Tubau cbdfe2b2ec Merge pull request 'feat: refs #8293 addZoneToClaimList' (!1088) from 8293-addZoneToClaimList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1088
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-23 14:15:52 +00:00
Jose Antonio Tubau 1cf817be17 refactor: refs #7050 refactorize
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 15:09:14 +01:00
Jose Antonio Tubau 9a04e0d2b4 feat: refs #8266 added descriptor to item name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 14:50:55 +01:00
Jorge Penadés f4aee047ff test: refs #7056 update FormModel.spec.js to use dynamic model value in tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 14:21:36 +01:00
Jorge Penadés 7cb4dfe16a test: refs #7056 add save function and reload data tests for FormModel component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 13:34:34 +01:00
Jorge Penadés 093034c523 chore: refs #7056 move test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 13:01:59 +01:00
Javier Segarra d92a09e228 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:50:37 +01:00
Jorge Penadés e14e828edb Merge branch 'dev' of https: refs #7056//gitea.verdnatura.es/verdnatura/salix-front into 7056-formModelTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 12:24:51 +01:00
PAU ROVIRA ROSALENY a3236b7dee Merge branch 'dev' into 7079-testVnLocation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 11:14:33 +00:00
PAU ROVIRA ROSALENY bf41f338b7 feat: refs #7079 created VnLocation front test 2024-12-23 12:13:58 +01:00
Javier Segarra b0291b7b41 Merge branch 'dev' into 8293-addZoneToClaimList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 10:39:25 +00:00
Javier Segarra 07ef5a794d Merge pull request 'fix: use value intead computedRef' (!1125) from hotfix_customerSampleCreate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1125
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-12-23 09:49:09 +00:00
Carlos Satorres 638ccf0c63 Merge pull request 'fix: fix translations' (!1124) from warmFix-translationsMonitorItem into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1124
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-23 09:48:46 +00:00
Carlos Satorres d484287601 Merge branch 'dev' into warmFix-translationsMonitorItem
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 09:47:49 +00:00
Javier Segarra d29ecd0a2b fix: use value intead computedRef
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-23 09:47:00 +00:00
Javier Segarra dae33e4df8 feat: update vitest to 1.0
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 10:22:40 +01:00
Javier Segarra 933e092da0 feat: update vue to 3.5 2024-12-23 10:21:56 +01:00
PAU ROVIRA ROSALENY 67315cc9e3 Merge pull request '8320-moveTestsToSections' (!1117) from 8320-moveTestsToSections into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1117
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-12-23 09:21:46 +00:00
Jose Antonio Tubau 28e37a9389 Merge branch 'dev' into 8293-addZoneToClaimList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 08:45:56 +00:00
Jorge Penadés 48742289fe feat: refs #7056 add tests in FormModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 09:45:15 +01:00
Carlos Satorres 4f3e7534e9 Merge branch 'dev' into warmFix-translationsMonitorItem
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 08:35:40 +00:00
Jose Antonio Tubau 07afbc82ef refactor: refs #7100 delete unnecesary set prop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 09:29:50 +01:00
Jorge Penadés dd7b6a7732 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7056-formModelTest
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 09:23:15 +01:00
PAU ROVIRA ROSALENY 3ab8a78144 Merge branch 'dev' into 8320-moveTestsToSections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 08:17:52 +00:00
Carlos Satorres 4fc6b9b8ba fix: fix translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 09:05:18 +01:00
Jose Antonio Tubau b96336dac3 Merge pull request 'fix: refs #8314 space between label and value' (!1110) from 8314-changeStyleOrderVolume into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1110
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-12-23 07:08:31 +00:00
Jose Antonio Tubau 27c0c1dd3c Merge branch 'dev' into 8314-changeStyleOrderVolume
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 06:50:54 +00:00
Jose Antonio Tubau 5cbff5035b Merge branch 'dev' into 7050-testCrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-23 06:15:21 +00:00
Jose Antonio Tubau 69451862bf test: refs #7100 modified test and added more cases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-20 13:20:11 +01:00
Carlos Satorres 5049b05547 fix: refs #7699 add icons and hint
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-20 13:01:56 +01:00
Jorge Penadés 7a53282122 feat: refs #7056 update route meta information and add FormModel tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-20 12:00:32 +01:00
Jose Antonio Tubau 0bd48d476b test: refs #7100 added test to vnNotes component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-20 10:35:31 +01:00
PAU ROVIRA ROSALENY 47a1eb61b9 Merge branch 'dev' into 8320-moveTestsToSections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-20 08:28:13 +00:00
PAU ROVIRA ROSALENY 77d7c2261e refactor: refs #8320 changed folder names from "specs" to "__tests__"
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-20 09:19:49 +01:00
Jorge Penadés 8b3b74a972 Merge pull request 'testToDev' (!1119) from testToDev into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1119
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-19 15:13:06 +00:00
Jorge Penadés afa20927d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 15:55:26 +01:00
Jorge Penadés de87acd5cc fix: refs #7957 add missing closing brace
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 13:42:48 +01:00
Jorge Penadés ea347338f4 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-19 13:16:01 +01:00
PAU ROVIRA ROSALENY a09d000495 refactor: refs #8320 moved front tests to their respective sections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 12:32:29 +01:00
PAU ROVIRA ROSALENY 3fb9b0de47 refactor: refs #8320 moved front tests to their respective sections 2024-12-19 12:32:15 +01:00
Jorge Penadés edeaa7cffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7133-fixCustomerSelect
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 12:16:09 +01:00
Jorge Penadés 5125b57663 fix: refs #7133 handleSalesModelValue function to handle empty input
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 12:15:46 +01:00
Jorge Penadés 4483d1cae0 Merge pull request '#7936 fix: handle non-object options' (!1115) from 7936-warmfix-showRawValues into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1115
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-19 11:12:47 +00:00
Javi Gallego 0f9dfd5e59 feat: refs #7924 update custom inspection label for clarity in English and Spanish locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 12:07:01 +01:00
Jorge Penadés 0103927ce7 fix: handle non-object options
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-19 11:03:15 +01:00
Pablo Natek b8ee0b3921 Merge pull request '8004-liliumStyleRemake' (!1106) from 8004-liliumStyleRemake into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1106
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-19 09:42:17 +00:00
Javi Gallego ba7e636a19 refactor: refs #7924 simplify custom inspection icon rendering in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 10:36:35 +01:00
Pablo Natek 648b1269ee refactor: refs #8004 remove unused travelFilterRef and chip definition in TravelList.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 10:35:04 +01:00
Pablo Natek e704a4214c refactor: refs #8004 remove unused stateStore import in InvoiceInList.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 10:32:51 +01:00
Pablo Natek 3eaaea4503 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-12-19 10:32:44 +01:00
Javi Gallego 542acc2c0e feat: refs #7924 add custom inspection checkbox and localization support 2024-12-19 10:25:45 +01:00
Jorge Penadés 9e686f6a25 Merge pull request 'feat: refs #7189 add Accept-Language header to axios requests' (!1111) from 7189-setAcceptLanguage into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1111
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-19 09:22:16 +00:00
Jorge Penadés bbc8fe5acd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7189-setAcceptLanguage
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-19 10:20:44 +01:00
PAU ROVIRA ROSALENY 8ca96d526e Merge pull request 'fix: #8813 fixed ClaimLines format' (!1097) from 8813-arreglarFormatoClaimLines into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1097
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-12-19 05:06:27 +00:00
Jorge Penadés adbb574025 fix: refs #7189 update user language on sessionStorage
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 17:53:41 +01:00
Jorge Penadés 21ebc85405 test: refs #7189 add Accept-Language header to axios request tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 17:15:43 +01:00
Jorge Penadés 777bdec0c7 test: refs #7189 enable skipped test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-18 16:49:06 +01:00
Jorge Penadés bda4fe62af feat: refs #7189 add Accept-Language header to axios requests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-18 16:43:26 +01:00
Alex Moreno a940eb9861 refactor: refs #8197 adapt Ticket to VnCardMain
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-18 14:22:19 +01:00
Alex Moreno 84ac4dd210 fix: refs #8197 vnPaginate onFetch emit 2024-12-18 14:21:59 +01:00
Jose Antonio Tubau 41390fec58 fix: refs #8314 space between label and value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 13:52:43 +01:00
Alex Moreno fccca9ea47 refactor: refs #8197 rename VnSectionMain to VnModule and VnCardMain to VnSection
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-18 13:42:57 +01:00
Jorge Penadés 596daf4696 Merge pull request 'feat: refs #7936 make fields required' (!1109) from 7936-fixInvoiceIn into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1109
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 12:36:02 +00:00
Alex Moreno 8c3c318099 test(VnTable): refs #8197 mock useFilterParams
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-18 13:16:45 +01:00
PAU ROVIRA ROSALENY 8293a314c8 Merge branch 'dev' into 8813-arreglarFormatoClaimLines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 12:06:04 +00:00
Jorge Penadés 5db434676f feat: refs #7936 make fields required
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-18 13:05:40 +01:00
Alex Moreno 32fd07dd14 feat: refs #8197 default sectionName
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-18 13:04:31 +01:00
Alex Moreno 76b73cc616 perf: refs #8197 perf 2024-12-18 13:04:10 +01:00
Alex Moreno b54f39f1a0 feat: refs #8197 default sectionName 2024-12-18 13:04:00 +01:00
Alex Moreno 66d0c2d5bb Merge branch 'beta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-18 12:09:14 +01:00
Alex Moreno 44ee641414 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta
gitea/salix-front/pipeline/pr-master This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-18 12:07:41 +01:00
Alex Moreno 6fa4269eae Merge branch 'beta' into 8197-VnCardMain
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-18 11:04:22 +00:00
Jon Elias 6aac98ed72 Merge pull request 'Hotfix: WorkerTimeControlSendEmail' (!1107) from Hotfix-WorkerTimeControlSendEmail into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1107
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 11:02:08 +00:00
Alex Moreno b851262ff8 build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-18 11:33:57 +01:00
Alex Moreno 5f438de06e Merge pull request '8315-devToTest' (!1094) from 8315-devToTest into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1094
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-12-18 10:31:54 +00:00
Alex Moreno 8bf4eaa39a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8315-devToTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-18 11:26:38 +01:00
Alex Moreno 17527cb4e7 test: refs #8315 fix VnSelect in e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-18 11:22:04 +01:00
Jon Elias 76788fe889 fix: changes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 10:46:50 +01:00
Jon Elias 06d3a025fc fix: deleted code 2024-12-18 10:45:42 +01:00
Jon Elias 9783be1ff0 fix: fixed recipient param 2024-12-18 10:45:02 +01:00
Alex Moreno 50262003d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8315-devToTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-18 10:22:41 +01:00
Jorge Penadés 01eca1eb0d Merge pull request '#7936 improve InvoiceIn' (!1004) from 7936-improveInvoiceIn into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1004
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 09:22:07 +00:00
Jorge Penadés c1ec57c846 Merge branch '7936-improveInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 10:18:53 +01:00
Jorge Penadés 18d7c194ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-18 10:18:26 +01:00
Alex Moreno c4d11fddbe Merge branch 'dev' into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 09:18:07 +00:00
Jon Elias 410052d6ec refactor: refs #8201 deleted logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 10:04:21 +01:00
Jorge Penadés 8502e13bdb Merge pull request '#8113 mapData' (!1099) from 8113-mapData into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1099
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 08:54:50 +00:00
Alex Moreno 5925a1acf2 Merge branch 'dev' into 8004-liliumStyleRemake
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 08:54:35 +00:00
Jorge Penadés 9052b2f1a2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-mapData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 09:53:20 +01:00
Jorge Penadés df671b4472 Merge pull request '#6583 add destination opt filter' (!899) from 6583-addDestinationFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-18 08:48:45 +00:00
Jorge Penadés f880834271 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 09:43:53 +01:00
Jorge Penadés 0478fd6ec3 Merge pull request 'fix: refs #7323 update date on outside' (!1100) from 7323-hotfix-fetchOnOutside into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1100
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 08:42:18 +00:00
Jorge Penadés e54b79fd0d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-fetchOnOutside
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 09:38:22 +01:00
PAU ROVIRA ROSALENY 4ac5a603bb refactor: refs #8813 removed unused class property
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 09:26:13 +01:00
PAU ROVIRA ROSALENY f2596f7197 Merge branch 'dev' into 8813-arreglarFormatoClaimLines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 08:21:00 +00:00
Javi Gallego 1e779ea0be Merge pull request 'feat: refs #7235 update invoice out global form to fetch config based on serial type' (!1082) from 7235-InvoiceOutBySerial into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1082
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 08:09:31 +00:00
Alex Moreno 467dec609d Merge pull request 'fix: refs #7146 front rutas' (!1101) from 7146--hotfixRoutes into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1101
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 08:09:26 +00:00
Javi Gallego ac4e0f9b07 Merge branch 'dev' into 7235-InvoiceOutBySerial
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 08:08:16 +00:00
Javi Gallego 1193eaa073 test: refs #7052 add unit tests for EditTableCellValueForm component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-18 09:04:37 +01:00
Jon Elias e81710257a Merge branch 'master' into Hotfix-VnTableBottomButton
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 07:49:34 +00:00
Jon Elias f918bbd539 fix: modified bottom button to show it when no data in the table and refactored add sale function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 08:47:29 +01:00
Jon Elias afe3795e39 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 07:20:43 +00:00
Jon Elias 2ee4f0e65c fix: remove params when searching by id on VnSearchbar
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 08:19:07 +01:00
Jose Antonio Tubau 8ab10dda1b refactor: refs #7074 move dms constant to global scope
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-18 08:07:44 +01:00
Jose Antonio Tubau 17c776138e Merge branch 'dev' into 7074-makeFrontTestToVnDmsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 07:02:17 +00:00
Jose Antonio Tubau 4b35d4b41e refactor: refs #8293 remove redundant attributes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 07:59:56 +01:00
Jose Antonio Tubau 152bb7009a Merge branch 'dev' into 8293-addZoneToClaimList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 06:43:04 +00:00
Jose Antonio Tubau 9d955f45bb test: refs #7050 add tests to fns resetData() and saveChanges()
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 07:06:34 +01:00
Carlos Andrés 7028d95b1a fix: refs #7146 front rutas
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 18:33:58 +01:00
Jorge Penadés 75b49490f6 fix: refs #7323 update date on outside
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 16:18:31 +01:00
Alex Moreno 997a6d18bc fix: refs #8315 ticketBoxing test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-17 14:48:16 +01:00
Jose Antonio Tubau 48805f977b Merge branch 'dev' into 7050-testCrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:48:03 +00:00
Alex Moreno cbb1bb6f60 test: refs #8315 fix clientList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-17 14:37:15 +01:00
Alex Moreno 5bf3e2c80a test: refs #8315 fix claimDevelopment fixtures 2024-12-17 14:35:37 +01:00
Pablo Natek fd1261973f Merge branch 'dev' into 8004-liliumStyleRemake 2024-12-17 13:26:29 +00:00
Pablo Natek c9aa06e471 Merge branch 'dev' into 8813-arreglarFormatoClaimLines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:20:55 +00:00
Jorge Penadés bd6038d683 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-mapArrayData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 13:55:11 +01:00
Jorge Penadés 7b118d6621 feat: refs #6583 add locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:38:06 +01:00
Jorge Penadés 9b83490cf1 feat: refs #6583 add locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:37:46 +01:00
Jorge Penadés 19c7337479 feat: refs #6583 add locale 2024-12-17 13:36:52 +01:00
Jorge Penadés 959608c490 feat: refs #6583 add locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:35:46 +01:00
Jorge Penadés 109841eee5 feat: refs #6583 add default param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 13:20:48 +01:00
Carlos Satorres 894fba7772 Merge pull request 'fix: hotfix mix' (!1095) from hotfix-mixTravelSupplierFixedPrice into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1095
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-17 12:10:53 +00:00
Carlos Satorres 35de47f102 Merge pull request 'fix: monitorPayMethodFilter' (!1096) from warmfix-monitorPayMethodFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1096
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-17 12:08:08 +00:00
Carlos Satorres 646efe52ff fix: fix use-model
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 13:04:00 +01:00
Carlos Satorres 3da7425f6f fix: remove url
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 12:59:27 +01:00
PAU ROVIRA ROSALENY 9c17541085 fix: refs #8813 fixed ClaimLines format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 12:51:57 +01:00
Alex Moreno 3bd028aa20 Merge pull request 'refactor: refs #8197 backward compatible' (!1091) from 8197-VnCardMain_backwardCompatibility into 8197-VnCardMain
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
Reviewed-on: #1091
2024-12-17 11:47:20 +00:00
Jorge Penadés 9d60083360 fix: refs #6583 update checkbox for filtering by destination in TicketAdvanceFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 12:46:53 +01:00
Alex Moreno d1970f5227 Merge branch '8197-VnCardMain' into 8197-VnCardMain_backwardCompatibility
gitea/salix-front/pipeline/pr-8197-VnCardMain Build started... Details
2024-12-17 11:46:43 +00:00
Carlos Satorres 2d9d58f79c fix: monitorPayMethodFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 12:45:02 +01:00
Jorge Penadés c1543b1b42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 12:31:53 +01:00
Carlos Satorres 5eb842f1b4 fix: remove params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 12:25:57 +01:00
Carlos Satorres 4ab3934da3 fix: hotfix mix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-17 12:19:35 +01:00
Jorge Penadés 22daf36c6c fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 11:58:57 +01:00
Jorge Penadés ad9063704c feat: refs #7936 enhance downloadFile function to support opening in a new tab
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-17 11:54:12 +01:00
Alex Moreno adce872f15 Merge branch 'dev' into 8004-liliumStyleRemake 2024-12-17 10:27:59 +00:00
Jorge Penadés a33cec4a34 feat: refs #7936 add optionCaption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 11:12:21 +01:00
Jorge Penadés d90750b2d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 10:54:01 +01:00
Jorge Penadés 4e98296dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 10:44:29 +01:00
Jorge Penadés efeb32fb28 fix: refs #7957 vn-searchbar test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 10:44:04 +01:00
Alex Moreno e6ced7b2f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-17 10:36:39 +01:00
Alex Moreno a0a6746db4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:25 +01:00
Jon Elias 3b3d57ea79 Merge pull request 'Fix: use Teleport to avoid QDrawer overlapping' (!1093) from Fix-QDrawer into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1093
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-17 09:35:09 +00:00
Jorge Penadés b1ad357bda feat: refs #7957 simplify fn to
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 10:16:28 +01:00
Alex Moreno 586d5eff3e chore: refs #8197 unnecessary file
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-17 09:05:22 +01:00
Jon Elias 4dff5a2eec refactor: use teleport to avoid qdrawer overlapping
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 09:03:09 +01:00
Jose Antonio Tubau 14ca6d73f1 feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog()
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 07:36:16 +01:00
Carlos Satorres a3ea359b01 fix: remove useless try catch
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-17 07:02:44 +01:00
Jon Elias fe1d9e93a3 refactor: refs #8201 added onMounted to stablish the value to show icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 06:27:03 +01:00
Jorge Penadés e08f718975 feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 17:42:28 +01:00
Jorge Penadés 6db44f158e fix: refs #7957 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 17:26:04 +01:00
Jorge Penadés bae7529f3d Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-12-16 17:25:55 +01:00
Jorge Penadés ed238d32ed feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 17:02:46 +01:00
Jorge Penadés 6bbd122029 fix: refs #7957 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 16:11:53 +01:00
Jorge Penadés 6858f4e44c fix: refs #7957 rollback 2024-12-16 16:11:42 +01:00
Jorge Penadés 1e0e859726 fix: refs #7957 update visibility handling for clear icon in VnInput component 2024-12-16 16:08:46 +01:00
Jorge Penadés 4a4cb1cf3f feat: refs #7957 enhance search functionality and improve data filtering logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 16:02:43 +01:00
Alex Moreno dc83d50e96 refactor: refs #8197 backward compatible
gitea/salix-front/pipeline/pr-8197-VnCardMain Build queued... Details
2024-12-16 14:30:23 +01:00
Alex Moreno 846eabfceb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-16 13:56:34 +01:00
Alex Moreno cfeb26258a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-16 13:55:34 +01:00
Pablo Natek daab9488ff Merge branch 'dev' into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:44:30 +00:00
Pablo Natek 35df8ca66d Merge branch '8004-liliumStyleRemake' of https://gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 13:44:14 +01:00
Pablo Natek 2985583353 style: refs #8004 update layout and styling in FetchedTags and ItemList components 2024-12-16 13:44:09 +01:00
Robert Ferrús 943b44934e Merge pull request 'feat: refs #8001 ticketExpeditionGrafana' (!865) from 8001-expeditionGrafana into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #865
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-16 12:35:12 +00:00
Robert Ferrús 61056e008e Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:34:36 +00:00
Alex Moreno dc665d43fe feat: refs #8197 default leftMenu
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
gitea/salix-front/pipeline/pr-beta There was a failure building this commit Details
2024-12-16 13:33:59 +01:00
Pablo Natek 3363ac5335 Merge branch 'dev' into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:29:05 +00:00
Pablo Natek bef0f25e88 test: refs #8004 remove only modifier from 'Client list create new client' test case in ticketList.spec.js
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 13:28:49 +01:00
Jon Elias 7fc0d0bcfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8201-DescriptorIcons 2024-12-16 13:23:35 +01:00
Jon Elias 96ef2b776c Merge pull request 'Fix: use VnSelectWorker' (!1089) from Fix-ClaimDevelopmentSelectWorker into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1089
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-16 12:20:53 +00:00
Pablo Natek 331c1bc51d refactor: refs #8004 replace VnSelect with VnSelectWorker in CustomerList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:51:51 +01:00
Pablo Natek 0c7d5baa76 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:35:59 +01:00
Alex Moreno 95420e96d1 refactor: refs #8197 adapt AccountAcls to VnCardMain
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-16 12:27:13 +01:00
Alex Moreno 0ab12d7b5d fix: refs #8197 vnTableFilter in vnTable 2024-12-16 12:26:41 +01:00
Alex Moreno 7dccf124ca Merge pull request 'Ignore params when searching by id on searchbar' (!1090) from VnSearchbar-SearchRemoveParams into beta
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1090
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-16 11:12:50 +00:00
Carlos Satorres 98674e528c Merge pull request 'fix: fix front' (!1061) from hotfix-irpfDaysOnWard into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1061
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-16 11:05:34 +00:00
Jon Elias 1e76d5fd3f refactor: ignore params when searching by id on searchbar
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-16 12:03:57 +01:00
Jorge Penadés 4cf13a83a4 fix: refs #7957 rollback 2024-12-16 11:54:57 +01:00
Jon Elias ab99f66758 refactor: use VnSelectWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 11:29:03 +01:00
Jon Elias e42a2c8bce Merge branch 'dev' into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 09:25:26 +00:00
Jon Elias a2b3a493fd perf: refs #8220 use searchbar selector in e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 10:24:31 +01:00
Jorge Penadés 6e655b37a1 fix: refs #7957 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 10:22:01 +01:00
Jorge Penadés a6815f4e3d fix: refs #7957 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 10:21:20 +01:00
Jorge Penadés 51ed58465d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 10:15:22 +01:00
Pablo Natek 1658e4f0e9 Merge branch '8004-liliumStyleRemake' of https://gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-12-16 09:52:42 +01:00
Pablo Natek fb8997b3df fix: refs #8004 update label for daysOnward in TravelFilter component and add translations 2024-12-16 09:52:40 +01:00
Alex Moreno 18fd41b82b refactor: refs #8197 adapt AccountAlias
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-16 09:47:46 +01:00
Alex Moreno 5d744ca456 feat: refs #8197 better leftMenu and VnCardMain improvements
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-16 09:41:50 +01:00
Robert Ferrús b84e8a4a2b Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 07:48:37 +00:00
Jose Antonio Tubau dadf3206e0 feat: refs #8293 add zone filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 08:42:37 +01:00
Jose Antonio Tubau c4db8f7818 feat: refs #8293 include zone data in each record 2024-12-16 08:41:28 +01:00
Guillermo Bonet 96ec1ca86b Merge pull request 'feat: refs #7882 Added longitude & latitude' (!1070) from 7882-osrm into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1070
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-16 06:59:06 +00:00
Jon Elias a4062f188b refactor: refs #8219 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 07:46:36 +01:00
Jon Elias 56308f40f2 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 07:45:36 +01:00
Jon Elias ad38bad945 fix: refs #8219 merge conflicts 2024-12-16 07:45:35 +01:00
Alex Moreno 1b1aa8e488 Merge branch 'master' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-16 07:32:25 +01:00
Guillermo Bonet b1cf0c2365 Merge branch 'dev' into 7882-osrm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 06:14:25 +00:00
Carlos Satorres 7ce92cc64b Merge branch 'master' into hotfix-irpfDaysOnWard
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-16 06:06:59 +00:00
Jorge Penadés 0cce5b93cd refactor: refs #7957 remove blank
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 17:20:28 +01:00
Jorge Penadés 981f3e90c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 16:27:11 +01:00
Jon Elias 43c24e0383 fix: refs #8201 added onDataSaved emi to refetch when cahnges are made
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 14:20:17 +01:00
Jorge Penadés cb0422d83f feat: refs #7957 open in new tab
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 14:16:27 +01:00
Javier Segarra 601111ee9f Merge pull request 'fix_orderCatalog_reload' (!1085) from fix_orderCatalog_reload into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1085
Reviewed-by: Jon Elias <jon@verdnatura.es>
2024-12-13 13:01:34 +00:00
Javier Segarra 9ae43244d9 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-13 11:40:05 +00:00
Javier Segarra 608f881eab Merge pull request 'feat: hide menus' (!1083) from hotfix-hideMenu into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1083
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-13 11:07:53 +00:00
Jorge Penadés d0e6c2c567 feat: hide menus
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-13 11:45:56 +01:00
Javi Gallego 21b4913e19 feat: refs #7235 update invoice out global form to fetch config based on serial type
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 08:33:05 +01:00
Jon Elias 1a0789b77f refactor: refs #8201 deleted log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 08:05:03 +01:00
Jon Elias 35cef37d4f fix: refs #8201 use arrayData to fix the error 2024-12-13 08:04:05 +01:00
Guillermo Bonet e6195a8529 Merge branch 'dev' into 7882-osrm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-13 06:00:26 +00:00
Jose Antonio Tubau d601caf95b Merge branch 'dev' into 7050-testCrudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 15:48:52 +00:00
Jose Antonio Tubau 0706c9d58e fix: refs #7050 delete import added by mistake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 16:04:57 +01:00
Jose Antonio Tubau 77f4949ba6 feat: refs #7050 7050 add object check
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 15:53:56 +01:00
Jose Antonio Tubau c164c39a2d feat: refs #7050 7050 add test to isEmpty() 2024-12-12 15:52:36 +01:00
Jorge Penadés f95a1f9739 feat: refs #7936 update 'isVies' label to use global translation key
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 12:50:57 +01:00
Jorge Penadés 965f5fbead fix: refs #7936 test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 12:09:23 +01:00
Jorge Penadés d701bf0713 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 11:55:56 +01:00
Jorge Penadés aeee861147 feat: refs #7936 show country code & isVies fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-12 11:20:54 +01:00
Alex Moreno 3984327b51 feat: refs #8197 working rightMenu
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-12 11:03:28 +01:00
Jorge Penadés c5f4e8decd fix: refs #7936 exclude disabled els on tab
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-12 10:56:42 +01:00
Jon Elias 292171348c feat: refs #8220 modified create item form and added respective e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 10:18:07 +01:00
Jorge Penadés 242597b68c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 09:58:27 +01:00
Carlos Satorres dc9dad69a2 Merge branch 'master' into hotfix-irpfDaysOnWard
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 08:36:49 +00:00
Jorge Penadés eb55c08dbd Merge pull request 'feat: refs #8113 add mapKey prop to VnPaginate and integrate into useArrayData for enhanced data mapping' (!1071) from 8113-mapArrayData into beta
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1071
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-12 08:25:52 +00:00
Carlos Satorres b3f22e35a6 Merge pull request 'fix: hotfix date' (!1045) from hotfix-6898SupplierConsumption into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1045
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-12 08:20:36 +00:00
Carlos Satorres 46262ad451 Merge branch 'master' into hotfix-6898SupplierConsumption
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 08:19:45 +00:00
Carlos Satorres 5b0e36fa4e fix: change number
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 09:18:32 +01:00
Carlos Satorres 842a3775f1 fix: clean
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 08:56:43 +01:00
Carlos Satorres 2283e65402 fix: clean
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 08:56:25 +01:00
Jose Antonio Tubau a59fb811fc refactor: refs #8266 change expedition label
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 08:55:19 +01:00
Carlos Satorres 745222c143 Merge branch 'hotfix-irpfDaysOnWard' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-irpfDaysOnWard
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 08:53:33 +01:00
Carlos Satorres 96df567b1d fix: clean 2024-12-12 08:53:31 +01:00
Jose Antonio Tubau ef6ed6c97d refactor: refs #8266 8266 change expedition item name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 08:51:03 +01:00
Guillermo Bonet 75e5fc47a8 Merge branch '7882-osrm' of https://gitea.verdnatura.es/verdnatura/salix-front into 7882-osrm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-12 08:15:00 +01:00
Guillermo Bonet 06329ef857 feat: refs #7882 Added distribution point 2024-12-12 08:14:58 +01:00
Alex Moreno c61934e127 Merge branch 'master' into hotfix-irpfDaysOnWard
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-12 06:28:16 +00:00
Javier Segarra fb1f3e4f24 Merge pull request 'hotfix-quitSaveOnEnter' (!1069) from hotfix-quitSaveOnEnter into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1069
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-11 21:54:01 +00:00
Javier Segarra bae148174a Merge branch 'master' into hotfix-quitSaveOnEnter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 21:51:52 +00:00
Jorge Penadés e075e13076 feat: refs #7936 add dueDated field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-11 17:42:31 +01:00
Jorge Penadés 4ec78aa1c0 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-11 17:21:45 +01:00
Jorge Penadés 2a6717d059 feat: refs #8113 add mapKey prop to VnPaginate and integrate into useArrayData for enhanced data mapping
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-11 15:04:31 +01:00
Alex Moreno 9e8c967567 fix(VnSearchbar): hotFix rollback
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-11 15:01:28 +01:00
Jon Elias 36c447772f Merge pull request 'Hotfix: fixed filter when searching by id' (!1063) from Hotfix-TicketFilter into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1063
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-11 13:35:55 +00:00
Jon Elias f74cd30a4e Merge branch 'Hotfix-TicketFilter' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-TicketFilter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 14:03:57 +01:00
Jon Elias b635010972 perf: if searchtext condition 2024-12-11 14:03:56 +01:00
Jon Elias 2262ef9594 Merge branch 'master' into Hotfix-TicketFilter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 12:39:06 +00:00
Jon Elias 1da3b1081a Merge pull request 'Hotfix: fixed events panel function' (!1067) from Hotfix-ZoneEventsMissingFunction into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1067
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-11 12:38:56 +00:00
Jon Elias c61ad16681 feat: added logic to avoid other filter params when searching on vnsearchbar
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 13:38:04 +01:00
Jorge Penadés 740cca2b93 fix: not trigger submit on enter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 13:03:18 +01:00
Guillermo Bonet f9f29500e9 Merge branch 'dev' into 7882-osrm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-11 10:42:33 +00:00
Guillermo Bonet f04d675f6b feat: refs #7882 Added longitude & latitude
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-11 11:41:58 +01:00
Jorge Penadés f4d7982228 fix: remove useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 11:34:08 +01:00
Jorge Penadés 542ec13cfe feat: add flag attr to prevent submit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 11:30:48 +01:00
Jorge Penadés 87551058dc fix: rollback 2024-12-11 10:18:43 +01:00
Jorge Penadés 8a1cda6914 feat: refs #7936 add autocomplete on tab fn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-11 10:10:59 +01:00
Jon Elias be2409c9b4 Merge branch 'master' into Hotfix-ZoneEventsMissingFunction
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 08:57:10 +00:00
Alex Moreno 19f91e73a3 fix: ticketBasicData haveNegatives and style
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-11 09:47:07 +01:00
Alex Moreno 86ccbecc47 fix(VnVisibleColumn): fix when is null is visible
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-11 09:27:45 +01:00
Jon Elias 2cdc8916cc fix: conflicts
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 06:16:54 +01:00
Jon Elias 309033c6de fix: fixed panel function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 06:05:38 +01:00
Jorge Penadés f61509f376 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-10 16:00:03 +01:00
Jon Elias a6f970cec8 fix: fixed filter when searching by id
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-10 14:06:34 +01:00
Carlos Satorres 86e8900962 Merge branch 'master' into hotfix-6898SupplierConsumption
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-10 11:41:14 +00:00
Carlos Satorres 884138af48 fix: remove Iso
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-10 12:33:53 +01:00
Carlos Satorres eb91b9c109 fix: fix front
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-10 11:02:00 +01:00
Jorge Penadés cc7432b253 refactor: refs #7936 simplify getTotal fn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-10 10:38:43 +01:00
Jorge Penadés 2939ddcfb7 fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-10 10:35:05 +01:00
Jon Elias c2a09868a1 feat: refs #8220 added barcodes e2e test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-10 07:11:18 +01:00
Jon Elias 732683c340 feat: refs #8220 added barcodes e2e test 2024-12-10 07:10:55 +01:00
Jon Elias 100ef4b7b9 refactor: refs #8220 added data-cy for e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-10 07:03:13 +01:00
Jon Elias 859957cadc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-10 06:59:35 +01:00
Jorge Penadés 43629a3bc3 fix: refs #7936 test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 17:27:30 +01:00
Jorge Penadés 799c78cdff feat: refs #7936 show id & value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 17:07:12 +01:00
Jorge Penadés 4e61ede392 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 16:44:17 +01:00
Alex Moreno 2ae0d90e32 chore: refs #8197 replace name
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-09 14:15:33 +01:00
Jorge Penadés 74e2eb3df1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 13:49:41 +01:00
Jon Elias 2ab5ade072 Merge branch 'dev' of https: refs #8220//gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-09 13:34:07 +01:00
Alex Moreno 1d86b29129 feat: refs #8197 vnTableFilter
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-12-09 11:21:18 +01:00
Jon Elias 5793e7c662 Merge branch 'dev' into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 05:18:36 +00:00
Jorge Penadés fb1928db7e feat: refs #7936 simplify optionLabel wip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 16:41:32 +01:00
Jorge Penadés fdd947fbbb feat: refs #7936 improve optionLabel logic in InvoiceInVat component for better handling of numeric values
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 15:59:56 +01:00
Jorge Penadés bd12c3bc66 feat: refs #7936 update option labels in InvoiceIn components for better clarity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 15:55:40 +01:00
Jorge Penadés 6a7cf5e8e8 feat: refs #7936 add unit tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 12:34:29 +01:00
Jorge Penadés d916b47f4c feat: refs #7936 enhance getTotal fn & add unit tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 10:40:50 +01:00
Jorge Penadés 928affc127 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-05 10:10:12 +01:00
Javier Segarra c601083f8c perf: refs #8219 #8219 minor change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-05 09:52:16 +01:00
Jorge Penadés 482505b800 feat: refs #7936 add useAccountShortToStandard composable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-04 17:40:29 +01:00
Jorge Penadés 2ab6380f97 feat: refs #7936 use default invoice data
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-04 13:46:42 +01:00
Jorge Penadés 37362d70d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-04 13:32:19 +01:00
Jon Elias a8b7691ab0 fix: refs #8219 forgotten dataCy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 12:33:38 +01:00
Jon Elias cb1f717fe0 fix: refs #8219 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 12:26:04 +01:00
Jon Elias 248288fd89 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 11:46:47 +01:00
Jon Elias 10ddae3534 fix: refs #8219 fixed summary and global tests 2024-12-04 11:46:46 +01:00
Carlos Satorres 809ad95e46 fix: hotfix date
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-04 10:18:05 +01:00
Alex Moreno 242f6b23d8 Merge branch '8197-VnCardMain' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-04 09:49:51 +01:00
Alex Moreno 2d2501838b revert: refs #8197 arrayData changes 2024-12-04 09:49:48 +01:00
Alex Moreno 0c4d6c782e Merge branch 'master' into 8197-VnCardMain
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-04 08:45:11 +00:00
Alex Moreno 1b2af7cb84 chore: refs #8197 remove console log
gitea/salix-front/pipeline/pr-master Build queued... Details
2024-12-04 09:44:21 +01:00
Alex Moreno 68fc565324 feat(VnPaginate): refs #8197 hold data when change to Card 2024-12-04 09:44:09 +01:00
Javier Segarra 034148841f fix: minor cli error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 09:18:37 +01:00
Javier Segarra 43e02ca00e feat: update quasar version 2024-12-04 09:18:23 +01:00
Jon Elias e9fc8b6888 Merge branch 'dev' into 8219-InvoiceOutE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 07:39:06 +00:00
Jon Elias 670c089125 refactor: refs #8219 modified e2e tests and fixed some translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 08:37:17 +01:00
Jon Elias 8b3a9db781 feat: refs #8220 created items e2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-03 13:00:16 +01:00
Jon Elias 45d1cc6a5d fix: refs #8219 global e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-03 12:54:35 +01:00
Jon Elias f9d897cdde feat: refs #8219 global invoicing e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-03 12:52:37 +01:00
Jorge Penadés 154c147aed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-02 17:11:03 +01:00
Alex Moreno 907bf3cf3b feat(Account & AccountRole): refs #8197 add VnCardMain 2024-12-02 11:39:01 +01:00
Jorge Penadés e2ddc079ec fix: refs #7936 format tax calculation to two decimal places
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-29 12:42:03 +01:00
Jorge Penadés de87fef42a Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-11-29 12:29:03 +01:00
Robert Ferrús 9e75d16976 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 08:56:19 +00:00
Robert Ferrús 68c691587d feat: refs #8001 change request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 09:55:22 +01:00
Jorge Penadés 726c778c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-11-29 09:41:30 +01:00
Robert Ferrús 3c026c9b28 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 07:39:33 +00:00
Robert Ferrús 87b5af7060 feat: refs #8001 change request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 08:38:38 +01:00
Jorge Penadés 50dab045f0 feat: refs #7936 add currency check before fetching
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 15:00:29 +01:00
Jorge Penadés 8e3d9b2bf3 feat: refs #7936 calculate exchange & update taxable base
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 14:52:39 +01:00
Jorge Penadés 44cbabfc7e feat: refs #7936 add number validation to VnInputNumber & new daysAgo filter in InvoiceInFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 13:27:53 +01:00
Jon Elias 454ba4cf7b fix: refs #8219 fixed e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 13:00:53 +01:00
Jorge Penadés 4037b31948 feat: refs #7936 add row click navigation to InvoiceInSerial
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 12:37:30 +01:00
Jorge Penadés 011b5814a7 fix: refs #7936 improve error handling
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 11:41:22 +01:00
Pablo Natek a142a254fc Merge branch 'dev' into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 10:13:52 +00:00
Pablo Natek ff69bf6d57 refactor: refs #8004 remove console log from CardSummary component on mount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 11:13:11 +01:00
Jorge Penadés 1571bd55ea Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-28 11:06:23 +01:00
Robert Ferrús 8b26cc61a5 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 09:44:43 +00:00
Javier Segarra 0e35b2b2d5 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-28 08:39:29 +00:00
Pablo Natek 1b6bb39c3e feat: refs #8004 enhance FetchedTags component with column support and styling updates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 09:23:25 +01:00
Pablo Natek a7e798a7ad Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-11-28 08:52:36 +01:00
Jon Elias 65afec0487 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2024-11-28 08:43:14 +01:00
Javier Segarra 844d72a2e3 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-27 18:20:41 +00:00
Jorge Penadés b5d13904d8 refactor: refs #7936 update label capitalization and replace invoice type options
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 17:52:41 +01:00
Jorge Penadés 8324c0587d fix: refs #7936 descriptor & dueday
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 13:26:54 +01:00
Jorge Penadés 23e9579b7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 10:38:14 +01:00
Jorge Penadés c55530ad1e fix: refs #7936 redirection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 10:36:03 +01:00
Jorge Penadés 70ca31aa46 feat: refs #7936 add company filter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 10:24:09 +01:00
Jorge Penadés 953f6f4af3 refactor: refs #7936 locale
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-27 09:54:56 +01:00
Javier Segarra 7f5d9c7180 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 06:58:52 +00:00
Javier Segarra aab98e3c45 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 22:14:22 +00:00
Jorge Penadés aba33a617e fix: refs #7936 changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-26 16:34:37 +01:00
Jorge Penadés 3f2cd62948 fix: refs #7936 decimal places & locale
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-26 14:53:53 +01:00
Jorge Penadés 070b831392 feat: refs #7936 limit decimal places 2024-11-26 14:48:32 +01:00
Jorge Penadés f5f1cdf0ac fix: refs #7936 tabulation wip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 14:06:14 +01:00
Jorge Penadés 185d4f93a7 fix: refs #7936 serial
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 13:41:26 +01:00
Jorge Penadés cc72f220dc feat: refs #7936 enhance vn-select
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 13:26:14 +01:00
Jorge Penadés b49c912b66 fix: refs #7936 rollback 2024-11-26 12:51:50 +01:00
Javier Segarra e3fa756b14 style: remove space from checkbox
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 11:36:05 +00:00
Javier Segarra c0be47a2e4 style: limit space QCheckbox when is children's QItemSection 2024-11-26 11:29:52 +00:00
Jon Elias 7fb1a9e6b5 feat: refs #8219 added invoice out e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 12:24:02 +01:00
Pablo Natek 9078417746 feat: refs #8004 merge dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 10:13:37 +01:00
Robert Ferrús c6d0dbc318 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-22 05:38:52 +00:00
Jorge Penadés 98f7fe8688 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-11 13:17:52 +01:00
Jorge Penadés 0cf6ee7590 feat: refs #6583 add icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-07 16:14:25 +01:00
Jorge Penadés f289ba3320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-07 15:26:23 +01:00
Jorge Penadés 1dcdc54ab8 feat: refs #6583 add destination opt filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-06 13:45:02 +01:00
Robert Ferrús 8525219154 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-29 08:07:07 +00:00
Robert Ferrús 6878a79c44 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-29 07:03:50 +00:00
Robert Ferrús d16f4f3154 Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 08:13:10 +00:00
Robert Ferrús 3ab4574155 feat: refs #8001 ticketExpeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 13:35:57 +02:00
Pablo Natek 7f1ae16270 fix: refs #8004 fix conflict
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-16 06:20:41 +02:00
Pablo Natek df775ea594 feat: refs #8004 hide rightFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 08:49:01 +02:00
Pablo Natek b32c8dd9f0 fix: refs #8004 more list style issues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-13 11:20:51 +02:00
Pablo Natek 1ff7d55644 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-11 11:44:54 +02:00
Pablo Natek e6756aebee fix: refs #8004 vnTable card with and add permanent labels
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-11 11:39:28 +02:00
Pablo Natek 5ac59840a2 refactor: refs #8004 remove consoleLogs 2024-10-11 11:03:36 +02:00
Pablo Natek 321b8dd9f9 fix: refs #8004 some style issues on all list 2024-10-11 11:01:58 +02:00
398 changed files with 9841 additions and 6793 deletions

View File

@ -1,3 +1,246 @@
# Version 25.00 - 2025-01-14
### Added 🆕
- chore: refs #7056 move test by:jorgep
- feat: refs #7050 7050 add object check by:Jtubau
- feat: refs #7050 7050 add test to isEmpty() by:Jtubau
- feat: refs #7056 add tests in FormModel by:jorgep
- feat: refs #7056 update route meta information and add FormModel tests by:jorgep
- feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog() (7074-makeFrontTestToVnDmsList) by:Jtubau
- feat: refs #7079 created VnLocation front test by:provira
- feat: refs #7189 add Accept-Language header to axios requests by:jorgep
- feat: refs #7924 add custom inspection checkbox and localization support by:jgallego
- feat: refs #7924 update custom inspection label for clarity in English and Spanish locales by:jgallego
- feat: refs #8004 enhance FetchedTags component with column support and styling updates by:pablone
- feat: refs #8004 hide rightFilter by:pablone
- feat: refs #8246 added new field in list by:Jon
- feat: refs #8266 added descriptor to item name by:jtubau
- feat: refs #8293 add zone filter by:Jtubau
- feat: refs #8293 include zone data in each record by:Jtubau
- fix: refs #8004 more list style issues by:pablone
- fix: refs #8004 some style issues on all list by:pablone
- style: refs #8004 update layout and styling in FetchedTags and ItemList components by:pablone
- style: update CustomerBalance.vue to set label color by:jgallego
### Changed 📦
- perf: order by:alexm
- perf: redirect transition list to card by:alexm
- perf: refs #8201 onDataSaved fetch by:Jon
- perf: revert processData by:alexm
- perf: simplify if by:alexm
- perf: simplify if (perf_redirectTransition) by:alexm
- refactor: item fixedPrice by:Jon
- refactor: refs #7050 refactorize by:jtubau
- refactor: refs #7050 removed blank spaces by:jtubau
- refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage by:jgallego
- refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests by:jgallego
- refactor: refs #7074 move dms constant to global scope by:Jtubau
- refactor: refs #7079 removed useless code by:provira
- refactor: refs #7924 simplify custom inspection icon rendering in ExtraCommunity.vue by:jgallego
- refactor: refs #8004 remove console log from CardSummary component on mount by:pablone
- refactor: refs #8004 remove consoleLogs by:pablone
- refactor: refs #8004 remove unused stateStore import in InvoiceInList.vue by:pablone
- refactor: refs #8004 remove unused travelFilterRef and chip definition in TravelList.vue by:pablone
- refactor: refs #8004 replace VnSelect with VnSelectWorker in CustomerList component by:pablone
- refactor: refs #8201 added onMounted to stablish the value to show icons by:Jon
- refactor: refs #8201 deleted condition by:Jon
- refactor: refs #8201 deleted log by:Jon
- refactor: refs #8201 deleted logs by:Jon
- refactor: refs #8266 8266 change expedition item name by:Jtubau
- refactor: refs #8266 change expedition label by:Jtubau
- refactor: refs #8293 remove redundant attributes by:Jtubau
- refactor: refs #8320 changed folder names from "specs" to "**tests**" by:provira
- refactor: refs #8320 moved front tests to their respective sections by:provira
- refactor: refs #8813 removed unused class property by:provira
### Fixed 🛠️
- fix: discount class by:PAU ROVIRA ROSALENY
- fix: duplicate transalation after test to dev by:alexm
- fix: fix translations by:carlossa
- fix: redirect to sales when confirming lines by:Jon
- fix: refs #7050 delete import added by mistake by:Jtubau
- fix: refs #7133 handleSalesModelValue function to handle empty input by:jorgep
- fix: refs #7189 update user language on sessionStorage by:jorgep
- fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component by:jorgep
- fix: refs #8004 more list style issues by:pablone
- fix: refs #8004 some style issues on all list by:pablone
- fix: refs #8004 update label for daysOnward in TravelFilter component and add translations by:pablone
- fix: refs #8004 vnTable card with and add permanent labels by:pablone
- fix: refs #8201 added onDataSaved emi to refetch when cahnges are made by:Jon
- fix: refs #8201 use arrayData to fix the error by:Jon
- fix: refs #8314 space between label and value by:jtubau
- fix: refs #8813 fixed ClaimLines format by:provira
- fix: update button sizes in ExtraCommunity.vue for better visibility by:jgallego
- perf: revert processData by:alexm
- refactor: item fixedPrice by:Jon
# Version 24.52 - 2024-01-07
### Added 🆕
- chore: refs #8197 remove console log by:alexm
- chore: refs #8197 replace name by:alexm
- chore: refs #8197 unnecessary file by:alexm
- feat: #8110 apply mixin in quasar components by:Javier Segarra
- feat(Account & AccountRole): refs #8197 add VnCardMain by:alexm
- feat: addDptoLink by:Jtubau
- feat: added restore ticket function in ticket descriptor menu by:Jon
- feat: add support service wip by:jorgep
- feat: focus menu searchbar by:jorgep
- feat: make additional data object by:jorgep
- feat: message to grant access by:jorgep
- feat: refs #6583 add default param by:jorgep
- feat: refs #6583 add destination opt filter by:jorgep
- feat: refs #6583 add icon by:jorgep
- feat: refs #6583 add locale by:jorgep
- feat: refs #7072 added test to computed fn total by:Jtubau
- feat: refs #7235 update invoice out global form to fetch config based on serial type by:jgallego
- feat: refs #7301 add exclude inventory supplier from list by:pablone
- feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component by:pablone
- feat: refs #7882 Added distribution point by:guillermo
- feat: refs #7882 Added longitude & latitude by:guillermo
- feat: refs #7936 add autocomplete on tab fn by:jorgep
- feat: refs #7936 add company filter by:jorgep
- feat: refs #7936 add currency check before fetching by:jorgep
- feat: refs #7936 add dueDated field by:jorgep
- feat: refs #7936 add number validation to VnInputNumber & new daysAgo filter in InvoiceInFilter by:jorgep
- feat: refs #7936 add optionCaption by:jorgep
- feat: refs #7936 add row click navigation to InvoiceInSerial by:jorgep
- feat: refs #7936 add unit tests by:jorgep
- feat: refs #7936 add useAccountShortToStandard composable by:jorgep
- feat: refs #7936 calculate exchange & update taxable base by:jorgep
- feat: refs #7936 enhance downloadFile function to support opening in a new tab by:jorgep
- feat: refs #7936 enhance getTotal fn & add unit tests by:jorgep
- feat: refs #7936 enhance vn-select by:jorgep
- feat: refs #7936 improve optionLabel logic in InvoiceInVat component for better handling of numeric values by:jorgep
- feat: refs #7936 limit decimal places by:jorgep
- feat: refs #7936 make fields required by:jorgep
- feat: refs #7936 show country code & isVies fields by:jorgep
- feat: refs #7936 show id & value by:jorgep
- feat: refs #7936 simplify optionLabel wip by:jorgep
- feat: refs #7936 update 'isVies' label to use global translation key by:jorgep
- feat: refs #7936 update option labels in InvoiceIn components for better clarity by:jorgep
- feat: refs #7936 use default invoice data by:jorgep
- feat: refs #8001 change request by:robert
- feat: refs #8001 ticketExpeditionGrafana by:robert
- feat: refs #8194 created VnSelectWorker component and use it in Lilium by:Jon
- feat: refs #8197 better leftMenu and VnCardMain improvements by:alexm
- feat: refs #8197 default leftMenu by:alexm
- feat: refs #8197 default sectionName by:alexm
- feat: refs #8197 keepData in VnSection by:alexm
- feat: refs #8197 vnTableFilter by:alexm
- feat: refs #8197 working rightMenu by:alexm
- feat: remove re-fetch when add element by:Javier Segarra
- feat: remove search after category by:Javier Segarra
- feat: requested changes in item module by:Jon
- feat: update quantity by:Javier Segarra
- feat(VnPaginate): refs #8197 hold data when change to Card by:alexm
### Changed 📦
- perf: #6896 REMOVE COMMENTS by:Javier Segarra
- perf: qFormMixin by:Javier Segarra
- perf: qFormMixin improvement by:Javier Segarra
- perf: refs #8194 select worker component by:Jon
- perf: refs #8197 perf by:alexm
- perf: remove comments by:Javier Segarra
- perf: remove unused variables (origin/warmfix_noUsedVars) by:Javier Segarra
- refactor: added again search emit by:Jon
- refactor: add useCau composable by:jorgep
- refactor: deleted log by:Jon
- refactor: deleted onUnmounted code by:Jon
- refactor: deleted useless hidden tag by:Jon
- refactor: deleted warnings and corrected itemTag by:Jon
- refactor: drop logic by:jorgep
- refactor: ignore params when searching by id on searchbar (origin/VnSearchbar-SearchRemoveParams) by:Jon
- refactor: log error by:Jon
- refactor: refs #7936 locale by:jorgep
- refactor: refs #7936 simplify getTotal fn by:jorgep
- refactor: refs #7936 update label capitalization and replace invoice type options by:jorgep
- refactor: refs #8194 deleted unnecessary label by:Jon
- refactor: refs #8194 modified select worker template by:Jon
- refactor: refs #8194 modified select worker to allow no one filter from monitor ticket by:Jon
- refactor: refs #8194 moved translation to the correct place by:Jon
- refactor: refs #8194 requested changes by:Jon
- refactor: refs #8194 structure changes in component and related files by:Jon
- refactor: refs #8197 adapt AccountAcls to VnCardMain by:alexm
- refactor: refs #8197 adapt AccountAlias by:alexm
- refactor: refs #8197 adapt Ticket to VnCardMain by:alexm
- refactor: refs #8197 backward compatible (8197-VnCardMain_backwardCompatibility) by:alexm
- refactor: refs #8197 rename VnSectionMain to VnModule and VnCardMain to VnSection by:alexm
- refactor: refs #8288 changed invoice out spanish translation by:provira
- refactor: use locale keys by:jorgep
- refactor: use teleport to avoid qdrawer overlapping by:Jon
- refactor: use VnSelectWorker by:Jon
### Fixed 🛠️
- fix: account by:carlossa
- fix: account create by:carlossa
- fix: accountList create by:carlossa
- fix(AccountList): use $refs by:alexm
- fix: add data-key by:alexm
- fix: addLocales by:Jtubau
- fix: dated field by:Jon
- fix: e2e by:jorgep
- fix: fix department filter by:carlossa
- fix: fixed translations by:Javier Segarra
- fix: fixed translations by:provira
- fix: get total from api by:Javier Segarra
- fix: handle non-object options by:jorgep
- fix: monitorPayMethodFilter by:carlossa
- fix: orderBy priority by:Javier Segarra
- fix: prevent null by:jorgep
- fix: redirection vnTable VnTableFilter by:alexm
- fix: refs #6389 fix filter trad by:carlossa
- fix: refs #6389 fix front, filters, itp by:carlossa
- fix: refs #6389 front add packing filter by:carlossa
- fix: refs #6389 front by:carlossa
- fix: refs #6389 front filters by:carlossa
- fix: refs #6389 ipt by:carlossa
- fix: refs #6389 packing by:carlossa
- fix: refs #6583 update checkbox for filtering by destination in TicketAdvanceFilter by:jorgep
- fix: refs #7031 add test e2e by:carlossa
- fix: refs #7031 fix zoneTest by:carlossa
- fix: refs #7301 unnecessary console logs from ItemLastEntries.vue by:pablone
- fix: refs #7936 changes by:jorgep
- fix: refs #7936 decimal places & locale by:jorgep
- fix: refs #7936 descriptor & dueday by:jorgep
- fix: refs #7936 exclude disabled els on tab by:jorgep
- fix: refs #7936 format tax calculation to two decimal places by:jorgep
- fix: refs #7936 improve error handling by:jorgep
- fix: refs #7936 redirection by:jorgep
- fix: refs #7936 rollback by:jorgep
- fix: refs #7936 serial by:jorgep
- fix: refs #7936 tabulation wip by:jorgep
- fix: refs #7936 test by:jorgep
- fix: refs #8114 clean by:carlossa
- fix: refs #8114 fix agencyList by:carlossa
- fix: refs #8114 fix lifeCycle hooks by:carlossa
- fix: refs #8114 fix pr by:carlossa
- fix: refs #8114 fix removeAddress by:carlossa
- fix: refs #8114 orderList by:carlossa
- fix: refs #8114 remove logs by:carlossa
- fix: refs #8197 mapKey (origin/8197-perf_vnTableInside, 8197-perf_vnTableInside) by:alexm
- fix: refs #8197 redirection (8197-perf_redirection) by:alexm
- fix: refs #8197 staticParams and redirect by:alexm
- fix: refs #8197 vnPaginate onFetch emit by:alexm
- fix: refs #8197 vnPaginate when change :id by:alexm
- fix: refs #8197 vnTableFilter in vnTable by:alexm
- fix: refs #8315 ticketBoxing test by:alexm
- fix: remove url by:carlossa
- fix: rollback by:jorgep
- fix: test by:jorgep
- fix(VnDmsList): refs #8197 add mapKey by:alexm
- revert: refs #8197 arrayData changes by:alexm
- test: refs #8197 fix e2e by:alexm
- test: refs #8315 fix claimDevelopment fixtures by:alexm
- test: refs #8315 fix clientList by:alexm
- test: refs #8315 fix VnSelect in e2e by:alexm
# Version 24.50 - 2024-12-10 # Version 24.50 - 2024-12-10
### Added 🆕 ### Added 🆕

View File

@ -11,6 +11,7 @@ module.exports = defineConfig({
screenshotsFolder: 'test/cypress/screenshots', screenshotsFolder: 'test/cypress/screenshots',
supportFile: 'test/cypress/support/index.js', supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos', videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads',
video: false, video: false,
specPattern: 'test/cypress/integration/**/*.spec.js', specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true, experimentalRunAllSpecs: true,
@ -33,5 +34,7 @@ module.exports = defineConfig({
require('cypress-mochawesome-reporter/plugin')(on); require('cypress-mochawesome-reporter/plugin')(on);
// implement node event listeners here // implement node event listeners here
}, },
viewportWidth: 1280,
viewportHeight: 720,
}, },
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "salix-front", "name": "salix-front",
"version": "24.52.0", "version": "25.06.0",
"description": "Salix frontend", "description": "Salix frontend",
"productName": "Salix", "productName": "Salix",
"author": "Verdnatura", "author": "Verdnatura",
@ -21,23 +21,24 @@
}, },
"dependencies": { "dependencies": {
"@quasar/cli": "^2.3.0", "@quasar/cli": "^2.3.0",
"@quasar/extras": "^1.16.9", "@quasar/extras": "^1.16.14",
"axios": "^1.4.0", "axios": "^1.4.0",
"chromium": "^3.0.3", "chromium": "^3.0.3",
"croppie": "^2.6.5", "croppie": "^2.6.5",
"moment": "^2.30.1",
"pinia": "^2.1.3", "pinia": "^2.1.3",
"quasar": "^2.14.5", "quasar": "^2.17.4",
"validator": "^13.9.0", "validator": "^13.9.0",
"vue": "^3.3.4", "vue": "^3.5.13",
"vue-i18n": "^9.2.2", "vue-i18n": "^9.3.0",
"vue-router": "^4.2.1" "vue-router": "^4.2.5"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^19.2.1", "@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0", "@commitlint/config-conventional": "^19.1.0",
"@intlify/unplugin-vue-i18n": "^0.8.1", "@intlify/unplugin-vue-i18n": "^0.8.1",
"@pinia/testing": "^0.1.2", "@pinia/testing": "^0.1.2",
"@quasar/app-vite": "^1.7.3", "@quasar/app-vite": "^1.11.0",
"@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15", "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0", "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4", "@vue/test-utils": "^2.4.4",
@ -51,7 +52,7 @@
"husky": "^8.0.0", "husky": "^8.0.0",
"postcss": "^8.4.23", "postcss": "^8.4.23",
"prettier": "^2.8.8", "prettier": "^2.8.8",
"vitest": "^0.31.1" "vitest": "^0.34.0"
}, },
"engines": { "engines": {
"node": "^20 || ^18 || ^16", "node": "^20 || ^18 || ^16",

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,3 @@
import { Notify } from 'quasar';
import { onRequest, onResponseError } from 'src/boot/axios'; import { onRequest, onResponseError } from 'src/boot/axios';
import { describe, expect, it, vi } from 'vitest'; import { describe, expect, it, vi } from 'vitest';
@ -27,6 +26,7 @@ describe('Axios boot', () => {
expect(resultConfig).toEqual( expect(resultConfig).toEqual(
expect.objectContaining({ expect.objectContaining({
headers: { headers: {
'Accept-Language': 'en-US',
Authorization: 'DEFAULT_TOKEN', Authorization: 'DEFAULT_TOKEN',
}, },
}) })

View File

@ -3,12 +3,12 @@ import { useSession } from 'src/composables/useSession';
import { Router } from 'src/router'; import { Router } from 'src/router';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { useStateQueryStore } from 'src/stores/useStateQueryStore'; import { useStateQueryStore } from 'src/stores/useStateQueryStore';
import { i18n } from 'src/boot/i18n';
const session = useSession(); const session = useSession();
const { notify } = useNotify(); const { notify } = useNotify();
const stateQuery = useStateQueryStore(); const stateQuery = useStateQueryStore();
const baseUrl = '/api/'; const baseUrl = '/api/';
axios.defaults.baseURL = baseUrl; axios.defaults.baseURL = baseUrl;
const axiosNoError = axios.create({ baseURL: baseUrl }); const axiosNoError = axios.create({ baseURL: baseUrl });
@ -16,6 +16,7 @@ const onRequest = (config) => {
const token = session.getToken(); const token = session.getToken();
if (token.length && !config.headers.Authorization) { if (token.length && !config.headers.Authorization) {
config.headers.Authorization = token; config.headers.Authorization = token;
config.headers['Accept-Language'] = i18n.global.locale.value;
} }
stateQuery.add(config); stateQuery.add(config);
return config; return config;

View File

@ -1,9 +1,11 @@
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import { createI18n } from 'vue-i18n'; import { createI18n } from 'vue-i18n';
import messages from 'src/i18n'; import messages from 'src/i18n';
import { useState } from 'src/composables/useState';
const user = useState().getUser();
const i18n = createI18n({ const i18n = createI18n({
locale: navigator.language || navigator.userLanguage, locale: user.value.lang || navigator.language || navigator.userLanguage,
fallbackLocale: 'en', fallbackLocale: 'en',
globalInjection: true, globalInjection: true,
messages, messages,

View File

@ -1,6 +1,5 @@
function focusFirstInput(input) { function focusFirstInput(input) {
input.focus(); input.focus();
return;
} }
export default { export default {
mounted: function () { mounted: function () {
@ -32,7 +31,7 @@ export default {
console.error(error); console.error(error);
} }
form.addEventListener('keyup', function (evt) { form.addEventListener('keyup', function (evt) {
if (evt.key === 'Enter') { if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
const input = evt.target; const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) { if (input.type == 'textarea' && evt.shiftKey) {
evt.preventDefault(); evt.preventDefault();

View File

@ -55,13 +55,6 @@ async function setCountry(countryFk, data) {
} }
// Province // Province
async function handleProvinces(data) {
provincesOptions.value = data;
if (postcodeFormData.countryFk) {
await fetchTowns();
}
}
async function setProvince(id, data) { async function setProvince(id, data) {
if (data.provinceFk === id) return; if (data.provinceFk === id) return;
const newProvince = provincesOptions.value.find((province) => province.id == id); const newProvince = provincesOptions.value.find((province) => province.id == id);
@ -69,6 +62,7 @@ async function setProvince(id, data) {
postcodeFormData.provinceFk = id; postcodeFormData.provinceFk = id;
await fetchTowns(); await fetchTowns();
} }
async function onProvinceCreated(data) { async function onProvinceCreated(data) {
postcodeFormData.provinceFk = data.id; postcodeFormData.provinceFk = data.id;
} }

View File

@ -127,7 +127,7 @@ function resetData(data) {
originalData.value = JSON.parse(JSON.stringify(data)); originalData.value = JSON.parse(JSON.stringify(data));
formData.value = JSON.parse(JSON.stringify(data)); formData.value = JSON.parse(JSON.stringify(data));
if (watchChanges.value) watchChanges.value(); //destoy watcher if (watchChanges.value) watchChanges.value(); //destroy watcher
watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true }); watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
} }
@ -270,10 +270,8 @@ function getChanges() {
function isEmpty(obj) { function isEmpty(obj) {
if (obj == null) return true; if (obj == null) return true;
if (obj === undefined) return true; if (Array.isArray(obj)) return !obj.length;
if (Object.keys(obj).length === 0) return true; return !Object.keys(obj).length;
if (obj.length > 0) return false;
} }
async function reload(params) { async function reload(params) {

View File

@ -1,7 +1,7 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue'; import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
import { onBeforeRouteLeave, useRouter } from 'vue-router'; import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
@ -12,7 +12,6 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
import VnConfirm from './ui/VnConfirm.vue'; import VnConfirm from './ui/VnConfirm.vue';
import { tMobile } from 'src/composables/tMobile'; import { tMobile } from 'src/composables/tMobile';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import { useRoute } from 'vue-router';
const { push } = useRouter(); const { push } = useRouter();
const quasar = useQuasar(); const quasar = useQuasar();
@ -199,6 +198,7 @@ async function fetch() {
} catch (e) { } catch (e) {
state.set(modelValue, {}); state.set(modelValue, {});
originalData.value = {}; originalData.value = {};
throw e;
} }
} }
@ -293,6 +293,7 @@ defineExpose({
class="q-pa-md" class="q-pa-md"
:style="maxWidth ? 'max-width: ' + maxWidth : ''" :style="maxWidth ? 'max-width: ' + maxWidth : ''"
id="formModel" id="formModel"
:prevent-submit="$attrs['prevent-submit']"
> >
<QCard> <QCard>
<slot <slot

View File

@ -92,13 +92,13 @@ function findMatches(search, item) {
} }
function addChildren(module, route, parent) { function addChildren(module, route, parent) {
if (route.menus) { const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
const mainMenus = route.menus[props.source]; if (!menus) return;
const matches = findMatches(mainMenus, route);
for (const child of matches) { const matches = findMatches(menus, route);
navigation.addMenuItem(module, child, parent);
} for (const child of matches) {
navigation.addMenuItem(module, child, parent);
} }
} }
@ -122,16 +122,26 @@ function getRoutes() {
if (props.source === 'card') { if (props.source === 'card') {
const currentRoute = route.matched[1]; const currentRoute = route.matched[1];
const currentModule = toLowerCamel(currentRoute.name); const currentModule = toLowerCamel(currentRoute.name);
const moduleDef = routes.find( let moduleDef = routes.find(
(route) => toLowerCamel(route.name) === currentModule (route) => toLowerCamel(route.name) === currentModule
); );
if (!moduleDef) return; if (!moduleDef) return;
if (!moduleDef?.menus) moduleDef = betaGetRoutes();
addChildren(currentModule, moduleDef, items.value); addChildren(currentModule, moduleDef, items.value);
} }
} }
function betaGetRoutes() {
let menuRoute;
let index = route.matched.length - 1;
while (!menuRoute && index > 0) {
if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
index--;
}
return menuRoute;
}
async function togglePinned(item, event) { async function togglePinned(item, event) {
if (event.defaultPrevented) return; if (event.defaultPrevented) return;
event.preventDefault(); event.preventDefault();

View File

@ -17,12 +17,10 @@ const stateQuery = useStateQueryStore();
const state = useState(); const state = useState();
const user = state.getUser(); const user = state.getUser();
const appName = 'Lilium'; const appName = 'Lilium';
const pinnedModulesRef = ref();
onMounted(() => stateStore.setMounted()); onMounted(() => stateStore.setMounted());
const pinnedModulesRef = ref();
</script> </script>
<template> <template>
<QHeader color="white" elevated> <QHeader color="white" elevated>
<QToolbar class="q-py-sm q-px-md"> <QToolbar class="q-py-sm q-px-md">
@ -59,22 +57,13 @@ const pinnedModulesRef = ref();
'no-visible': !stateQuery.isLoading().value, 'no-visible': !stateQuery.isLoading().value,
}" }"
size="xs" size="xs"
data-cy="loading-spinner"
/> />
<QSpace /> <QSpace />
<div id="searchbar" class="searchbar"></div> <div id="searchbar" class="searchbar"></div>
<QSpace /> <QSpace />
<div class="q-pl-sm q-gutter-sm row items-center no-wrap"> <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
<div id="actions-prepend"></div> <div id="actions-prepend"></div>
<QBtn
flat
v-if="!quasar.platform.is.mobile"
@click="pinnedModulesRef.redirect($route.params.id)"
icon="more_up"
>
<QTooltip>
{{ t('Go to Salix') }}
</QTooltip>
</QBtn>
<QBtn <QBtn
:class="{ 'q-pa-none': quasar.platform.is.mobile }" :class="{ 'q-pa-none': quasar.platform.is.mobile }"
id="pinnedModules" id="pinnedModules"
@ -106,7 +95,6 @@ const pinnedModulesRef = ref();
<VnBreadcrumbs v-if="$q.screen.lt.md" class="q-ml-md" /> <VnBreadcrumbs v-if="$q.screen.lt.md" class="q-ml-md" />
</QHeader> </QHeader>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.searchbar { .searchbar {
width: max-content; width: max-content;
@ -115,9 +103,3 @@ const pinnedModulesRef = ref();
background-color: var(--vn-section-color); background-color: var(--vn-section-color);
} }
</style> </style>
<i18n>
en:
Go to Salix: Go to Salix
es:
Go to Salix: Ir a Salix
</i18n>

View File

@ -44,7 +44,7 @@ const onDataSaved = (data) => {
<FormModelPopup <FormModelPopup
url-create="Items/regularize" url-create="Items/regularize"
model="Items" model="Items"
:title="t('Regularize stock')" :title="t('item.regularizeStock')"
:form-initial-data="regularizeFormData" :form-initial-data="regularizeFormData"
@on-data-saved="onDataSaved($event)" @on-data-saved="onDataSaved($event)"
> >
@ -55,6 +55,7 @@ const onDataSaved = (data) => {
v-model.number="data.quantity" v-model.number="data.quantity"
type="number" type="number"
autofocus autofocus
data-cy="regularizeStockInput"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>

View File

@ -1,6 +1,9 @@
<script setup> <script setup>
import quasarLang from 'src/utils/quasarLang';
import { onMounted, computed, ref } from 'vue'; import { onMounted, computed, ref } from 'vue';
import { Dark, Quasar } from 'quasar';
import { Dark } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import axios from 'axios'; import axios from 'axios';
@ -31,14 +34,7 @@ const userLocale = computed({
value = localeEquivalence[value] ?? value; value = localeEquivalence[value] ?? value;
try { quasarLang(value);
/* @vite-ignore */
import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
Quasar.lang.set(lang.default);
});
} catch (error) {
//
}
}, },
}); });
@ -87,10 +83,10 @@ async function saveDarkMode(value) {
async function saveLanguage(value) { async function saveLanguage(value) {
const query = `/VnUsers/${user.value.id}`; const query = `/VnUsers/${user.value.id}`;
try { try {
await axios.patch(query, { await axios.patch(query, { lang: value });
lang: value,
});
user.value.lang = value; user.value.lang = value;
useState().setUser(user.value);
onDataSaved(); onDataSaved();
} catch (error) { } catch (error) {
onDataError(); onDataError();

View File

@ -32,7 +32,10 @@ const $props = defineProps({
defineExpose({ addFilter, props: $props }); defineExpose({ addFilter, props: $props });
const model = defineModel(undefined, { required: true }); const model = defineModel(undefined, { required: true });
const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl }); const arrayData = useArrayData(
$props.dataKey,
$props.searchUrl ? { searchUrl: $props.searchUrl } : null
);
const columnFilter = computed(() => $props.column?.columnFilter); const columnFilter = computed(() => $props.column?.columnFilter);
const updateEvent = { 'update:modelValue': addFilter }; const updateEvent = { 'update:modelValue': addFilter };

View File

@ -1,20 +1,21 @@
<script setup> <script setup>
import { ref, onBeforeMount, onMounted, computed, watch } from 'vue'; import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useFilterParams } from 'src/composables/useFilterParams';
import CrudModel from 'src/components/CrudModel.vue'; import CrudModel from 'src/components/CrudModel.vue';
import FormModelPopup from 'components/FormModelPopup.vue'; import FormModelPopup from 'components/FormModelPopup.vue';
import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
import VnTableColumn from 'components/VnTable/VnColumn.vue'; import VnTableColumn from 'components/VnTable/VnColumn.vue';
import VnFilter from 'components/VnTable/VnFilter.vue'; import VnFilter from 'components/VnTable/VnFilter.vue';
import VnTableChip from 'components/VnTable/VnChip.vue'; import VnTableChip from 'components/VnTable/VnChip.vue';
import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue'; import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
import VnLv from 'components/ui/VnLv.vue'; import VnLv from 'components/ui/VnLv.vue';
import VnTableOrder from 'src/components/VnTable/VnOrder.vue'; import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
import VnTableFilter from './VnTableFilter.vue';
const $props = defineProps({ const $props = defineProps({
columns: { columns: {
@ -33,6 +34,10 @@ const $props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
rightSearchIcon: {
type: Boolean,
default: true,
},
rowClick: { rowClick: {
type: [Function, Boolean], type: [Function, Boolean],
default: null, default: null,
@ -54,8 +59,8 @@ const $props = defineProps({
default: true, default: true,
}, },
bottom: { bottom: {
type: Object, type: Boolean,
default: null, default: false,
}, },
cardClass: { cardClass: {
type: String, type: String,
@ -101,10 +106,6 @@ const $props = defineProps({
type: String, type: String,
default: '90vh', default: '90vh',
}, },
chipLocale: {
type: String,
default: null,
},
footer: { footer: {
type: Boolean, type: Boolean,
default: false, default: false,
@ -119,22 +120,21 @@ const stateStore = useStateStore();
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const quasar = useQuasar(); const quasar = useQuasar();
const $attrs = useAttrs();
const CARD_MODE = 'card'; const CARD_MODE = 'card';
const TABLE_MODE = 'table'; const TABLE_MODE = 'table';
const mode = ref(CARD_MODE); const mode = ref(CARD_MODE);
const selected = ref([]); const selected = ref([]);
const hasParams = ref(false); const hasParams = ref(false);
const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
const orders = ref(parseOrder(routeQuery.filter?.order));
const CrudModelRef = ref({}); const CrudModelRef = ref({});
const showForm = ref(false); const showForm = ref(false);
const splittedColumns = ref({ columns: [] }); const splittedColumns = ref({ columns: [] });
const columnsVisibilitySkipped = ref(); const columnsVisibilitySkipped = ref();
const createForm = ref(); const createForm = ref();
const tableFilterRef = ref([]);
const tableRef = ref(); const tableRef = ref();
const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders);
const tableModes = [ const tableModes = [
{ {
@ -150,6 +150,7 @@ const tableModes = [
disable: $props.disableOption?.card, disable: $props.disableOption?.card,
}, },
]; ];
onBeforeMount(() => { onBeforeMount(() => {
const urlParams = route.query[$props.searchUrl]; const urlParams = route.query[$props.searchUrl];
hasParams.value = urlParams && Object.keys(urlParams).length !== 0; hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@ -162,7 +163,9 @@ onMounted(() => {
: $props.defaultMode; : $props.defaultMode;
stateStore.rightDrawer = quasar.screen.gt.xs; stateStore.rightDrawer = quasar.screen.gt.xs;
columnsVisibilitySkipped.value = [ columnsVisibilitySkipped.value = [
...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name), ...splittedColumns.value.columns
.filter((c) => c.visible === false)
.map((c) => c.name),
...['tableActions'], ...['tableActions'],
]; ];
createForm.value = $props.create; createForm.value = $props.create;
@ -181,41 +184,8 @@ watch(
{ immediate: true } { immediate: true }
); );
watch(
() => route.query[$props.searchUrl],
(val) => setUserParams(val),
{ immediate: true, deep: true }
);
const isTableMode = computed(() => mode.value == TABLE_MODE); const isTableMode = computed(() => mode.value == TABLE_MODE);
const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
function setUserParams(watchedParams, watchedOrder) {
if (!watchedParams) return;
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
const filter =
typeof watchedParams?.filter == 'string'
? JSON.parse(watchedParams?.filter ?? '{}')
: watchedParams?.filter;
const where = filter?.where;
const order = watchedOrder ?? filter?.order;
watchedParams = { ...watchedParams, ...where };
delete watchedParams.filter;
delete params.value?.filter;
params.value = { ...params.value, ...sanitizer(watchedParams) };
orders.value = parseOrder(order);
}
function sanitizer(params) {
for (const [key, value] of Object.entries(params)) {
if (value && typeof value == 'object') {
const param = Object.values(value)[0];
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
}
}
return params;
}
function splitColumns(columns) { function splitColumns(columns) {
splittedColumns.value = { splittedColumns.value = {
@ -296,17 +266,6 @@ function getColAlign(col) {
return 'text-' + (col.align ?? 'left'); return 'text-' + (col.align ?? 'left');
} }
function parseOrder(urlOrders) {
const orderObject = {};
if (!urlOrders) return orderObject;
if (typeof urlOrders == 'string') urlOrders = [urlOrders];
for (const [index, orders] of urlOrders.entries()) {
const [name, direction] = orders.split(' ');
orderObject[name] = { direction, index: index + 1 };
}
return orderObject;
}
const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']); const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
defineExpose({ defineExpose({
create: createForm, create: createForm,
@ -355,61 +314,19 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
show-if-above show-if-above
> >
<QScrollArea class="fit"> <QScrollArea class="fit">
<VnFilterPanel <VnTableFilter
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"
:search-button="true" :columns="columns"
v-model="params" :redirect="redirect"
:search-url="searchUrl"
:redirect="!!redirect"
@set-user-params="setUserParams"
:disable-submit-event="true"
@remove="
(key) =>
tableFilterRef
.find((f) => f.props?.column.name == key)
?.addFilter()
"
> >
<template #body> <template
<div v-for="(_, slotName) in $slots"
class="row no-wrap flex-center" #[slotName]="slotData"
v-for="col of splittedColumns.columns.filter( :key="slotName"
(c) => c.columnFilter ?? true >
)" <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
:key="col.id"
>
<VnFilter
ref="tableFilterRef"
:column="col"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
:search-url="searchUrl"
/>
<VnTableOrder
v-if="
col?.columnFilter !== false &&
col?.name !== 'tableActions'
"
v-model="orders[col.orderBy ?? col.name]"
:name="col.orderBy ?? col.name"
:data-key="$attrs['data-key']"
:search-url="searchUrl"
:vertical="false"
/>
</div>
<slot
name="moreFilterPanel"
:params="params"
:columns="splittedColumns.columns"
/>
</template> </template>
<template #tags="{ tag, formatFn }" v-if="chipLocale"> </VnTableFilter>
<div class="q-gutter-x-xs">
<strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
</VnFilterPanel>
</QScrollArea> </QScrollArea>
</QDrawer> </QDrawer>
<CrudModel <CrudModel
@ -465,7 +382,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
:options="tableModes.filter((mode) => !mode.disable)" :options="tableModes.filter((mode) => !mode.disable)"
/> />
<QBtn <QBtn
v-if="$props.rightSearch" v-if="showRightIcon"
icon="filter_alt" icon="filter_alt"
class="bg-vn-section-color q-ml-sm" class="bg-vn-section-color q-ml-sm"
dense dense
@ -479,7 +396,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
:class="col.headerClass" :class="col.headerClass"
> >
<div <div
class="column self-start q-ml-xs ellipsis" class="column ellipsis"
:class="`text-${col?.align ?? 'left'}`" :class="`text-${col?.align ?? 'left'}`"
:style="$props.columnSearch ? 'height: 75px' : ''" :style="$props.columnSearch ? 'height: 75px' : ''"
> >
@ -521,7 +438,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
<!-- Columns --> <!-- Columns -->
<QTd <QTd
auto-width auto-width
class="no-margin q-px-xs" class="no-margin"
:class="[getColAlign(col), col.columnClass]" :class="[getColAlign(col), col.columnClass]"
:style="col.style" :style="col.style"
v-if="col.visible ?? true" v-if="col.visible ?? true"
@ -573,29 +490,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
/> />
</QTd> </QTd>
</template> </template>
<template #bottom v-if="bottom">
<slot name="bottom-table">
<QBtn
@click="
() =>
createAsDialog
? (showForm = !showForm)
: handleOnDataSaved(create)
"
class="cursor-pointer fill-icon"
color="primary"
icon="add_circle"
size="md"
round
flat
shortcut="+"
:disabled="!disabledAttr"
/>
<QTooltip>
{{ createForm.title }}
</QTooltip>
</slot>
</template>
<template #item="{ row, colsMap }"> <template #item="{ row, colsMap }">
<component <component
:is="$props.redirect ? 'router-link' : 'span'" :is="$props.redirect ? 'router-link' : 'span'"
@ -656,13 +550,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
:key="col.name" :key="col.name"
class="fields" class="fields"
> >
<VnLv <VnLv :label="col.label + ':'">
:label="
!col.component && col.label
? `${col.label}:`
: ''
"
>
<template #value> <template #value>
<span <span
@click="stopEventPropagation($event)" @click="stopEventPropagation($event)"
@ -726,6 +614,27 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
</QTr> </QTr>
</template> </template>
</QTable> </QTable>
<div class="full-width bottomButton" v-if="bottom">
<QBtn
@click="
() =>
createAsDialog
? (showForm = !showForm)
: handleOnDataSaved(create)
"
class="cursor-pointer fill-icon"
color="primary"
icon="add_circle"
size="md"
round
flat
shortcut="+"
:disabled="!disabledAttr"
/>
<QTooltip>
{{ createForm.title }}
</QTooltip>
</div>
</template> </template>
</CrudModel> </CrudModel>
<QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2"> <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
@ -803,7 +712,7 @@ es:
.grid-three { .grid-three {
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(400px, max-content)); grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
max-width: 100%; max-width: 100%;
grid-gap: 20px; grid-gap: 20px;
margin: 0 auto; margin: 0 auto;
@ -852,21 +761,6 @@ es:
top: 0; top: 0;
padding: 12px 0; padding: 12px 0;
} }
tbody {
.q-checkbox {
display: flex;
margin-bottom: 9px;
& .q-checkbox__label {
margin-left: 31px;
color: var(--vn-text-color);
}
& .q-checkbox__inner {
position: absolute;
left: 0;
color: var(--vn-label-color);
}
}
}
.sticky { .sticky {
position: sticky; position: sticky;
right: 0; right: 0;

View File

@ -0,0 +1,69 @@
<script setup>
import { ref } from 'vue';
import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
import VnFilter from 'components/VnTable/VnFilter.vue';
import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
defineProps({
columns: {
type: Array,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const tableFilterRef = ref([]);
function columnName(col) {
const column = { ...col, ...col.columnFilter };
let name = column.name;
if (column.alias) name = column.alias + '.' + name;
return name;
}
</script>
<template>
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
<template #body="{ params, orders }">
<div
class="row no-wrap flex-center"
v-for="col of columns.filter((c) => c.columnFilter ?? true)"
:key="col.id"
>
<VnFilter
ref="tableFilterRef"
:column="col"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
:search-url="searchUrl"
/>
<VnTableOrder
v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
v-model="orders[col.orderBy ?? col.name]"
:name="col.orderBy ?? col.name"
:data-key="$attrs['data-key']"
:search-url="searchUrl"
:vertical="true"
/>
</div>
<slot
name="moreFilterPanel"
:params="params"
:orders="orders"
:columns="columns"
/>
</template>
<template #tags="{ tag, formatFn, getLocale }">
<div class="q-gutter-x-xs">
<strong>{{ getLocale(`${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</VnFilterPanel>
</template>

View File

@ -152,7 +152,7 @@ onMounted(async () => {
<QCheckbox <QCheckbox
v-for="col in localColumns" v-for="col in localColumns"
:key="col.name" :key="col.name"
:label="col.label" :label="col.label ?? col.name"
v-model="col.visible" v-model="col.visible"
/> />
</div> </div>

View File

@ -1,4 +1,4 @@
import { describe, expect, it, beforeAll, beforeEach } from 'vitest'; import { describe, expect, it, beforeAll, beforeEach, vi } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper'; import { createWrapper } from 'app/test/vitest/helper';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
@ -13,6 +13,15 @@ describe('VnTable', () => {
}, },
}); });
vm = wrapper.vm; vm = wrapper.vm;
vi.mock('src/composables/useFilterParams', () => {
return {
useFilterParams: vi.fn(() => ({
params: {},
orders: {},
})),
};
});
}); });
beforeEach(() => (vm.selected = [])); beforeEach(() => (vm.selected = []));

View File

@ -0,0 +1,121 @@
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnVisibleColumn from '../VnVisibleColumn.vue';
import { axios } from 'app/test/vitest/helper';
describe('VnVisibleColumns', () => {
let wrapper;
let vm;
beforeEach(() => {
wrapper = createWrapper(VnVisibleColumn, {
propsData: {
tableCode: 'testTable',
skip: ['skippedColumn'],
},
});
vm = wrapper.vm;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('setUserConfigViewData()', () => {
it('should initialize localColumns with visible configuration', () => {
vm.columns = [
{ name: 'columnMockName', label: undefined },
{ name: 'columnMockAddress', label: undefined },
{ name: 'columnMockId', label: undefined },
];
const configuration = {
columnMockName: true,
columnMockAddress: false,
columnMockId: true,
};
const expectedColumns = [
{ name: 'columnMockName', label: undefined, visible: true },
{ name: 'columnMockAddress', label: undefined, visible: false },
{ name: 'columnMockId', label: undefined, visible: true },
];
vm.setUserConfigViewData(configuration, false);
expect(vm.localColumns).toEqual(expectedColumns);
});
it('should skip columns based on props', () => {
vm.columns = [
{ name: 'columnMockName', label: undefined },
{ name: 'columnMockId', label: undefined },
{ name: 'skippedColumn', label: 'Skipped Column' },
];
const configuration = {
columnMockName: true,
skippedColumn: false,
columnMockId: true,
};
const expectedColumns = [
{ name: 'columnMockName', label: undefined, visible: true },
{ name: 'columnMockId', label: undefined, visible: true },
];
vm.setUserConfigViewData(configuration, false);
expect(vm.localColumns).toEqual(expectedColumns);
});
});
describe('toggleMarkAll()', () => {
it('should set all localColumns to visible=true', () => {
vm.localColumns = [
{ name: 'columnMockName', visible: false },
{ name: 'columnMockId', visible: false },
];
vm.toggleMarkAll(true);
expect(vm.localColumns.every((col) => col.visible)).toBe(true);
});
it('should set all localColumns to visible=false', () => {
vm.localColumns = [
{ name: 'columnMockName', visible: true },
{ name: 'columnMockId', visible: true },
];
vm.toggleMarkAll(false);
expect(vm.localColumns.every((col) => col.visible)).toBe(false);
});
});
describe('saveConfig()', () => {
it('should call setUserConfigViewData and axios.post with correct params', async () => {
const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
data: [{ id: 1 }],
});
vm.localColumns = [
{ name: 'columnMockName', visible: true },
{ name: 'columnMockId', visible: false },
];
await vm.saveConfig();
expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
creates: [
{
userFk: vm.user.id,
tableCode: vm.tableCode,
tableConfig: vm.tableCode,
configuration: {
columnMockName: true,
columnMockId: false,
},
},
],
});
});
});
});

View File

@ -0,0 +1,248 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import CrudModel from 'components/CrudModel.vue';
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
describe('CrudModel', () => {
let wrapper;
let vm;
let data;
beforeAll(() => {
wrapper = createWrapper(CrudModel, {
global: {
stubs: [
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
mocks: {
validate: vi.fn(),
},
},
propsData: {
dataRequired: {
fk: 1,
},
dataKey: 'crudModelKey',
model: 'crudModel',
url: 'crudModelUrl',
saveFn: '',
},
});
wrapper=wrapper.wrapper;
vm=wrapper.vm;
});
beforeEach(() => {
vm.fetch([]);
vm.watchChanges = null;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('insert()', () => {
it('should new element in list with index 0 if formData not has data', () => {
vm.insert();
expect(vm.formData.length).toEqual(1);
expect(vm.formData[0].fk).toEqual(1);
expect(vm.formData[0].$index).toEqual(0);
});
});
describe('getChanges()', () => {
it('should return correct updates and creates', async () => {
vm.fetch([
{ id: 1, name: 'New name one' },
{ id: 2, name: 'New name two' },
{ id: 3, name: 'Bruce Wayne' },
]);
vm.originalData = [
{ id: 1, name: 'Tony Starks' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
vm.insert();
const result = vm.getChanges();
const expected = {
creates: [
{
$index: 3,
fk: 1,
},
],
updates: [
{
data: {
name: 'New name one',
},
where: {
id: 1,
},
},
{
data: {
name: 'New name two',
},
where: {
id: 2,
},
},
],
};
expect(result).toEqual(expected);
});
});
describe('getDifferences()', () => {
it('should return the differences between two objects', async () => {
const obj1 = {
a: 1,
b: 2,
c: 3,
};
const obj2 = {
a: null,
b: 4,
d: 5,
};
const result = vm.getDifferences(obj1, obj2);
expect(result).toEqual({
a: null,
b: 4,
d: 5,
});
});
});
describe('isEmpty()', () => {
let dummyObj;
let dummyArray;
let result;
it('should return true if object si null', async () => {
dummyObj = null;
result = vm.isEmpty(dummyObj);
expect(result).toBe(true);
});
it('should return true if object si undefined', async () => {
dummyObj = undefined;
result = vm.isEmpty(dummyObj);
expect(result).toBe(true);
});
it('should return true if object is empty', async () => {
dummyObj ={};
result = vm.isEmpty(dummyObj);
expect(result).toBe(true);
});
it('should return false if object is not empty', async () => {
dummyObj = {a:1, b:2, c:3};
result = vm.isEmpty(dummyObj);
expect(result).toBe(false);
});
it('should return true if array is empty', async () => {
dummyArray = [];
result = vm.isEmpty(dummyArray);
expect(result).toBe(true);
});
it('should return false if array is not empty', async () => {
dummyArray = [1,2,3];
result = vm.isEmpty(dummyArray);
expect(result).toBe(false);
})
});
describe('resetData()', () => {
it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
data = [{
name: 'Tony',
lastName: 'Stark',
age: 42,
}];
vm.resetData(data);
expect(vm.originalData).toEqual(data);
expect(vm.originalData[0].$index).toEqual(0);
expect(vm.formData).toEqual(data);
expect(vm.formData[0].$index).toEqual(0);
expect(vm.watchChanges).not.toBeNull();
});
it('should dont do nothing if data is null', async () => {
vm.resetData(null);
expect(vm.watchChanges).toBeNull();
});
it('should set originalData and formatData with data and generate watchChanges', async () => {
data = {
name: 'Tony',
lastName: 'Stark',
age: 42,
};
vm.resetData(data);
expect(vm.originalData).toEqual(data);
expect(vm.formData).toEqual(data);
expect(vm.watchChanges).not.toBeNull();
});
});
describe('saveChanges()', () => {
data = [{
name: 'Tony',
lastName: 'Stark',
age: 42,
}];
it('should call saveFn if exists', async () => {
await wrapper.setProps({ saveFn: vi.fn() });
vm.saveChanges(data);
expect(vm.saveFn).toHaveBeenCalledOnce();
expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false);
await wrapper.setProps({ saveFn: '' });
});
it("should use default url if there's not saveFn", async () => {
const postMock =vi.spyOn(axios, 'post');
vm.formData = [{
name: 'Bruce',
lastName: 'Wayne',
age: 45,
}]
await vm.saveChanges(data);
expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false);
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
});
});
});

View File

@ -0,0 +1,56 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import EditForm from 'components/EditTableCellValueForm.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
const fieldA = 'fieldA';
const fieldB = 'fieldB';
describe('EditForm', () => {
let vm;
const mockRows = [
{ id: 1, itemFk: 101 },
{ id: 2, itemFk: 102 },
];
const mockFieldsOptions = [
{ label: 'Field A', field: fieldA, component: 'input', attrs: {} },
{ label: 'Field B', field: fieldB, component: 'date', attrs: {} },
];
const editUrl = '/api/edit';
beforeAll(() => {
vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
vm = createWrapper(EditForm, {
props: {
rows: mockRows,
fieldsOptions: mockFieldsOptions,
editUrl,
},
}).vm;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('onSubmit()', () => {
it('should call axios.post with the correct parameters in the payload', async () => {
const selectedField = { field: fieldA, component: 'input', attrs: {} };
const newValue = 'Test Value';
vm.selectedField = selectedField;
vm.newValue = newValue;
await vm.onSubmit();
const payload = axios.post.mock.calls[0][1];
expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
expect(payload.field).toEqual(fieldA);
expect(payload.newValue).toEqual(newValue);
expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
expect(vm.isLoading).toEqual(false);
});
});
});

View File

@ -0,0 +1,82 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import FilterItemForm from 'src/components/FilterItemForm.vue';
import { vi, beforeAll, describe, expect, it } from 'vitest';
describe('FilterItemForm', () => {
let vm;
let wrapper;
beforeAll(() => {
wrapper = createWrapper(FilterItemForm, {
props: {
url: 'Items/withName',
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
vi.spyOn(axios, 'get').mockResolvedValue({
data: [
{
id: 999996,
name: 'bolas de madera',
size: 2,
inkFk: null,
producerFk: null,
},
],
});
});
it('should filter data and populate tableRows for table display', async () => {
vm.itemFilterParams.name = 'bolas de madera';
await vm.onSubmit();
const expectedFilter = {
include: [
{ relation: 'producer', scope: { fields: ['name'] } },
{ relation: 'ink', scope: { fields: ['name'] } },
],
where: {"name":{"like":"%bolas de madera%"}},
};
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
params: { filter: JSON.stringify(expectedFilter) },
});
expect(vm.tableRows).toEqual([
{
id: 999996,
name: 'bolas de madera',
size: 2,
inkFk: null,
producerFk: null,
},
]);
});
it('should handle an empty itemFilterParams correctly', async () => {
vm.itemFilterParams.name = null;
vm.itemFilterParams = {};
await vm.onSubmit();
const expectedFilter = {
include: [
{ relation: 'producer', scope: { fields: ['name'] } },
{ relation: 'ink', scope: { fields: ['name'] } },
],
where: {},
};
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
params: { filter: JSON.stringify(expectedFilter) },
});
});
it('should emit "itemSelected" with the correct id and close the form', () => {
vm.selectItem({ id: 12345 });
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
});
});

View File

@ -0,0 +1,149 @@
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import FormModel from 'src/components/FormModel.vue';
describe('FormModel', () => {
const model = 'mockModel';
const url = 'mockUrl';
const formInitialData = { mockKey: 'mockVal' };
describe('modelValue', () => {
it('should use the provided model', () => {
const { vm } = mount({ propsData: { model } });
expect(vm.modelValue).toBe(model);
});
it('should use the route meta title when model is not provided', () => {
const { vm } = mount({});
expect(vm.modelValue).toBe('formModel_mockTitle');
});
});
describe('onMounted()', () => {
let mockGet;
beforeAll(() => {
mockGet = vi.spyOn(axios, 'get').mockResolvedValue({ data: {} });
});
afterAll(() => {
mockGet.mockRestore();
});
it('should not fetch when has formInitialData', () => {
mount({ propsData: { url, model, autoLoad: true, formInitialData } });
expect(mockGet).not.toHaveBeenCalled();
});
it('should fetch when there is url and auto-load', () => {
mount({ propsData: { url, model, autoLoad: true } });
expect(mockGet).toHaveBeenCalled();
});
it('should not observe changes', () => {
const { vm } = mount({
propsData: { url, model, observeFormChanges: false, formInitialData },
});
expect(vm.hasChanges).toBe(true);
vm.reset();
expect(vm.hasChanges).toBe(true);
});
it('should observe changes', async () => {
const { vm } = mount({
propsData: { url, model, formInitialData },
});
vm.state.set(model, formInitialData);
expect(vm.hasChanges).toBe(false);
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
expect(vm.hasChanges).toBe(true);
vm.formData.mockKey = 'mockVal';
});
});
describe('trimData()', () => {
let vm;
beforeAll(() => {
vm = mount({}).vm;
});
it('should trim whitespace from string values', () => {
const data = { key1: ' value1 ', key2: ' value2 ' };
const trimmedData = vm.trimData(data);
expect(trimmedData).toEqual({ key1: 'value1', key2: 'value2' });
});
it('should not modify non-string values', () => {
const data = { key1: 123, key2: true, key3: null, key4: undefined };
const trimmedData = vm.trimData(data);
expect(trimmedData).toEqual(data);
});
});
describe('save()', async () => {
it('should not call if there are not changes', async () => {
const { vm } = mount({ propsData: { url, model } });
await vm.save();
expect(vm.hasChanges).toBe(false);
});
it('should call axios.patch with the right data', async () => {
const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
const { vm } = mount({ propsData: { url, model, formInitialData } });
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
expect(spy).toHaveBeenCalled();
vm.formData.mockKey = 'mockVal';
});
it('should call axios.post with the right data', async () => {
const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
const { vm } = mount({
propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
});
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
expect(spy).toHaveBeenCalled();
vm.formData.mockKey = 'mockVal';
});
it('should use the saveFn', async () => {
const { vm } = mount({
propsData: { url, model, formInitialData, saveFn: () => {} },
});
const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
expect(spyPatch).not.toHaveBeenCalled();
expect(spySaveFn).toHaveBeenCalled();
vm.formData.mockKey = 'mockVal';
});
it('should reload the data after save', async () => {
const { vm } = mount({
propsData: { url, model, formInitialData, reload: true },
});
vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
vm.formData.mockKey = 'mockVal';
});
});
});
function mount({ propsData = {} }) {
return createWrapper(FormModel, {
propsData,
});
}

View File

@ -1,32 +1,20 @@
<script setup> <script setup>
import { ref, onMounted, useSlots } from 'vue'; import { onMounted, useSlots } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useQuasar } from 'quasar';
const slots = useSlots(); import { useHasContent } from 'src/composables/useHasContent';
const hasContent = ref(false);
const rightPanel = ref(null);
onMounted(() => {
rightPanel.value = document.querySelector('#right-panel');
if (!rightPanel.value) return;
// Check if there's content to display
const observer = new MutationObserver(() => {
hasContent.value = rightPanel.value.childNodes.length;
});
observer.observe(rightPanel.value, {
subtree: true,
childList: true,
attributes: true,
});
if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
});
const { t } = useI18n(); const { t } = useI18n();
const quasar = useQuasar();
const stateStore = useStateStore(); const stateStore = useStateStore();
const slots = useSlots();
const hasContent = useHasContent('#right-panel');
onMounted(() => {
if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
stateStore.rightDrawer = false;
});
</script> </script>
<template> <template>
<Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()"> <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
@ -45,7 +33,7 @@ const stateStore = useStateStore();
</QBtn> </QBtn>
</div> </div>
</Teleport> </Teleport>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above> <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
<QScrollArea class="fit"> <QScrollArea class="fit">
<div id="right-panel"></div> <div id="right-panel"></div>
<slot v-if="!hasContent" name="right-panel" /> <slot v-if="!hasContent" name="right-panel" />

View File

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

View File

@ -14,6 +14,7 @@ defineProps({
hide-dropdown-icon hide-dropdown-icon
focus-on-mount focus-on-mount
@update:model-value="promise" @update:model-value="promise"
data-cy="vnBtnSelect_select"
/> />
</QBtnDropdown> </QBtnDropdown>
</template> </template>

View File

@ -0,0 +1,67 @@
<script setup>
import { onBeforeMount, computed } from 'vue';
import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
import { useArrayData } from 'src/composables/useArrayData';
import { useStateStore } from 'stores/useStateStore';
import useCardSize from 'src/composables/useCardSize';
import LeftMenu from 'components/LeftMenu.vue';
import VnSubToolbar from '../ui/VnSubToolbar.vue';
const props = defineProps({
dataKey: { type: String, required: true },
baseUrl: { type: String, default: undefined },
customUrl: { type: String, default: undefined },
filter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
searchDataKey: { type: String, default: undefined },
searchbarProps: { type: Object, default: undefined },
redirectOnError: { type: Boolean, default: false },
});
const stateStore = useStateStore();
const route = useRoute();
const router = useRouter();
const url = computed(() => {
if (props.baseUrl) {
return `${props.baseUrl}/${route.params.id}`;
}
return props.customUrl;
});
const arrayData = useArrayData(props.dataKey, {
url: url.value,
filter: props.filter,
});
onBeforeMount(async () => {
try {
if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
await arrayData.fetch({ append: false, updateRouter: false });
} catch {
const { matched: matches } = router.currentRoute.value;
const { path } = matches.at(-1);
router.push({ path: path.replace(/:id.*/, '') });
}
});
if (props.baseUrl) {
onBeforeRouteUpdate(async (to, from) => {
if (to.params.id !== from.params.id) {
arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
await arrayData.fetch({ append: false, updateRouter: false });
}
});
}
</script>
<template>
<Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
<component :is="descriptor" />
<QSeparator />
<LeftMenu source="card" />
</Teleport>
<VnSubToolbar />
<div :class="[useCardSize(), $attrs.class]">
<RouterView :key="route.path" />
</div>
</template>

View File

@ -2,9 +2,9 @@
import { ref } from 'vue'; import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnRow from '../ui/VnRow.vue'; import VnRow from '../ui/VnRow.vue';
import VnInput from './VnInput.vue';
import FetchData from '../FetchData.vue'; import FetchData from '../FetchData.vue';
import useNotify from 'src/composables/useNotify'; import useNotify from 'src/composables/useNotify';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const props = defineProps({ const props = defineProps({
submitFn: { type: Function, default: () => {} }, submitFn: { type: Function, default: () => {} },
@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
</QCardSection> </QCardSection>
<QForm ref="form"> <QForm ref="form">
<QCardSection> <QCardSection>
<VnInput <VnInputPassword
v-if="props.askOldPass" v-if="props.askOldPass"
:label="t('Old password')" :label="t('Old password')"
v-model="passwords.oldPassword" v-model="passwords.oldPassword"
type="password"
:required="true" :required="true"
:toggle-visibility="true"
autofocus autofocus
/> />
<VnInput <VnInputPassword
:label="t('New password')" :label="t('New password')"
v-model="passwords.newPassword" v-model="passwords.newPassword"
type="password"
:required="true" :required="true"
:toggle-visibility="true"
:info=" :info="
t('passwordRequirements', { t('passwordRequirements', {
length: requirements.length, length: requirements.length,
@ -95,10 +95,10 @@ defineExpose({ show: () => changePassDialog.value.show() });
autofocus autofocus
/> />
<VnInput <VnInputPassword
:label="t('Repeat password')" :label="t('Repeat password')"
v-model="passwords.repeatPassword" v-model="passwords.repeatPassword"
type="password" :toggle-visibility="true"
/> />
</QCardSection> </QCardSection>
</QForm> </QForm>

View File

@ -11,9 +11,9 @@ function getBadgeAttrs(date) {
let timeDiff = today - timeTicket; let timeDiff = today - timeTicket;
if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' }; if (timeDiff == 0) return { color: 'warning', class: 'black-text-color' };
if (timeDiff < 0) return { color: 'success', 'text-color': 'black' }; if (timeDiff < 0) return { color: 'success', class: 'black-text-color' };
return { color: 'transparent', 'text-color': 'white' }; return { color: 'transparent', class: 'normal-text-color' };
} }
function formatShippedDate(date) { function formatShippedDate(date) {
@ -29,3 +29,11 @@ function formatShippedDate(date) {
{{ formatShippedDate(date) }} {{ formatShippedDate(date) }}
</QBadge> </QBadge>
</template> </template>
<style lang="scss">
.black-text-color {
color: var(--vn-black-text-color);
}
.normal-text-color {
color: var(--vn-text-color);
}
</style>

View File

@ -297,13 +297,14 @@ defineExpose({
ref="dmsRef" ref="dmsRef"
:data-key="$props.model" :data-key="$props.model"
:url="$props.model" :url="$props.model"
:filter="dmsFilter" :user-filter="dmsFilter"
:order="['dmsFk DESC']" :order="['dmsFk DESC']"
:auto-load="true" auto-load
@on-fetch="setData" @on-fetch="setData"
> >
<template #body> <template #body>
<QTable <QTable
v-if="rows"
:columns="columns" :columns="columns"
:rows="rows" :rows="rows"
class="full-width q-mt-md" class="full-width q-mt-md"

View File

@ -42,6 +42,10 @@ const $props = defineProps({
type: Number, type: Number,
default: null, default: null,
}, },
uppercase: {
type: Boolean,
default: false,
},
}); });
const vnInputRef = ref(null); const vnInputRef = ref(null);
@ -116,6 +120,10 @@ const handleInsertMode = (e) => {
input.setSelectionRange(cursorPos + 1, cursorPos + 1); input.setSelectionRange(cursorPos + 1, cursorPos + 1);
}); });
}; };
const handleUppercase = () => {
value.value = value.value?.toUpperCase() || '';
};
</script> </script>
<template> <template>
@ -134,20 +142,23 @@ const handleInsertMode = (e) => {
hide-bottom-space hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_input'" :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
> >
<template v-if="$slots.prepend" #prepend> <template #prepend>
<slot name="prepend" /> <slot name="prepend" />
</template> </template>
<template #append> <template #append>
<QIcon <QIcon
name="close" name="close"
size="xs" size="xs"
v-if=" :style="{
hover && visibility:
value && hover &&
!$attrs.disabled && value &&
!$attrs.readonly && !$attrs.disabled &&
$props.clearable !$attrs.readonly &&
" $props.clearable
? 'visible'
: 'hidden',
}"
@click=" @click="
() => { () => {
value = null; value = null;
@ -156,6 +167,15 @@ const handleInsertMode = (e) => {
} }
" "
></QIcon> ></QIcon>
<QIcon
name="match_case"
size="xs"
v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
@click="handleUppercase"
class="uppercase-icon"
/>
<slot name="append" v-if="$slots.append && !$attrs.disabled" /> <slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon v-if="info" name="info"> <QIcon v-if="info" name="info">
<QTooltip max-width="350px"> <QTooltip max-width="350px">
@ -166,6 +186,7 @@ const handleInsertMode = (e) => {
</QInput> </QInput>
</div> </div>
</template> </template>
<i18n> <i18n>
en: en:
inputMin: Must be more than {value} inputMin: Must be more than {value}
@ -175,9 +196,4 @@ const handleInsertMode = (e) => {
inputMin: Debe ser mayor a {value} inputMin: Debe ser mayor a {value}
maxLength: El valor excede los {value} carácteres maxLength: El valor excede los {value} carácteres
inputMax: Debe ser menor a {value} inputMax: Debe ser menor a {value}
</i18n> </i18n>
<style lang="scss">
.q-field__append {
padding-inline: 0;
}
</style>

View File

@ -1,14 +1,12 @@
<script setup> <script setup>
import { onMounted, watch, computed, ref, useAttrs } from 'vue'; import { onMounted, watch, computed, ref, useAttrs } from 'vue';
import { date } from 'quasar'; import { date } from 'quasar';
import { useI18n } from 'vue-i18n';
import VnDate from './VnDate.vue'; import VnDate from './VnDate.vue';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
const $attrs = useAttrs(); const $attrs = useAttrs();
const { isRequired, requiredFieldRule } = useRequired($attrs); const { isRequired, requiredFieldRule } = useRequired($attrs);
const model = defineModel({ type: [String, Date] }); const model = defineModel({ type: [String, Date] });
const { t } = useI18n();
const $props = defineProps({ const $props = defineProps({
isOutlined: { isOutlined: {
@ -106,7 +104,8 @@ const manageDate = (date) => {
:class="{ required: isRequired }" :class="{ required: isRequired }"
:rules="mixinRules" :rules="mixinRules"
:clearable="false" :clearable="false"
@click="isPopupOpen = true" @click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space hide-bottom-space
> >
<template #append> <template #append>
@ -125,13 +124,6 @@ const manageDate = (date) => {
isPopupOpen = false; isPopupOpen = false;
" "
/> />
<QIcon
v-if="showEvent"
name="event"
class="cursor-pointer"
@click="isPopupOpen = !isPopupOpen"
:title="t('Open date')"
/>
</template> </template>
<QMenu <QMenu
v-if="$q.screen.gt.xs" v-if="$q.screen.gt.xs"
@ -151,15 +143,6 @@ const manageDate = (date) => {
</QInput> </QInput>
</div> </div>
</template> </template>
<style lang="scss">
.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
border-bottom-style: solid;
}
.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
border-style: solid;
}
</style>
<i18n> <i18n>
es: es:
Open date: Abrir fecha Open date: Abrir fecha

View File

@ -1,13 +1,28 @@
<script setup> <script setup>
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import { ref } from 'vue';
import { useAttrs } from 'vue'; defineProps({
step: { type: Number, default: 0.01 },
decimalPlaces: { type: Number, default: 2 },
positive: { type: Boolean, default: true },
});
const model = defineModel({ type: [Number, String] }); const model = defineModel({ type: [Number, String] });
const $attrs = useAttrs();
const step = ref($attrs.step || 0.01);
</script> </script>
<template> <template>
<VnInput v-bind="$attrs" v-model.number="model" type="number" :step="step" /> <VnInput
v-bind="$attrs"
v-model.number="model"
type="number"
:step="step"
@input="
(evt) => {
const val = evt.target.value;
if (positive && val < 0) return (model = 0);
const [, decimal] = val.split('.');
if (val && decimal?.length > decimalPlaces)
model = parseFloat(val).toFixed(decimalPlaces);
}
"
/>
</template> </template>

View File

@ -0,0 +1,31 @@
<script setup>
import VnInput from 'src/components/common/VnInput.vue';
import { ref } from 'vue';
const model = defineModel({ type: [Number, String] });
const $props = defineProps({
toggleVisibility: {
type: Boolean,
default: false,
},
});
const showPassword = ref(false);
</script>
<template>
<VnInput
v-bind="{ ...$attrs }"
v-model="model"
:type="
$props.toggleVisibility ? (showPassword ? 'text' : 'password') : $attrs.type
"
>
<template #append v-if="toggleVisibility">
<QIcon
:name="showPassword ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="showPassword = !showPassword"
/>
</template>
</VnInput>
</template>

View File

@ -1,13 +1,11 @@
<script setup> <script setup>
import { computed, ref, useAttrs } from 'vue'; import { computed, ref, useAttrs } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar'; import { date } from 'quasar';
import VnTime from './VnTime.vue'; import VnTime from './VnTime.vue';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
const $attrs = useAttrs(); const $attrs = useAttrs();
const { isRequired, requiredFieldRule } = useRequired($attrs); const { isRequired, requiredFieldRule } = useRequired($attrs);
const { t } = useI18n();
const model = defineModel({ type: String }); const model = defineModel({ type: String });
const props = defineProps({ const props = defineProps({
timeOnly: { timeOnly: {
@ -80,7 +78,8 @@ function dateToTime(newDate) {
:class="{ required: isRequired }" :class="{ required: isRequired }"
style="min-width: 100px" style="min-width: 100px"
:rules="mixinRules" :rules="mixinRules"
@click="isPopupOpen = false" @click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
type="time" type="time"
hide-bottom-space hide-bottom-space
> >
@ -100,12 +99,6 @@ function dateToTime(newDate) {
isPopupOpen = false; isPopupOpen = false;
" "
/> />
<QIcon
name="Schedule"
class="cursor-pointer"
@click="isPopupOpen = !isPopupOpen"
:title="t('Open time')"
/>
</template> </template>
<QMenu <QMenu
v-if="$q.screen.gt.xs" v-if="$q.screen.gt.xs"

View File

@ -2,7 +2,7 @@
import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue'; import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
import VnSelectDialog from 'components/common/VnSelectDialog.vue'; import VnSelectDialog from 'components/common/VnSelectDialog.vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { computed } from 'vue'; import { ref, watch } from 'vue';
import { useAttrs } from 'vue'; import { useAttrs } from 'vue';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
const { t } = useI18n(); const { t } = useI18n();
@ -16,6 +16,14 @@ const props = defineProps({
}, },
}); });
watch(
() => props.location,
(newValue) => {
if (!modelValue.value) return;
modelValue.value = formatLocation(newValue) ?? null;
}
);
const mixinRules = [requiredFieldRule]; const mixinRules = [requiredFieldRule];
const locationProperties = [ const locationProperties = [
'postcode', 'postcode',
@ -26,7 +34,7 @@ const locationProperties = [
(obj) => obj.country?.name, (obj) => obj.country?.name,
]; ];
const formatLocation = (obj, properties) => { const formatLocation = (obj, properties = locationProperties) => {
const parts = properties.map((prop) => { const parts = properties.map((prop) => {
if (typeof prop === 'string') { if (typeof prop === 'string') {
return obj[prop]; return obj[prop];
@ -43,9 +51,7 @@ const formatLocation = (obj, properties) => {
return filteredParts.join(', '); return filteredParts.join(', ');
}; };
const modelValue = computed(() => const modelValue = ref(props.location ? formatLocation(props.location) : null);
props.location ? formatLocation(props.location, locationProperties) : null
);
function showLabel(data) { function showLabel(data) {
const dataProperties = [ const dataProperties = [

View File

@ -1,8 +1,8 @@
<script setup> <script setup>
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'components/LeftMenu.vue'; import { onMounted, ref } from 'vue';
import { onMounted } from 'vue';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import LeftMenu from '../LeftMenu.vue';
const stateStore = useStateStore(); const stateStore = useStateStore();
const $props = defineProps({ const $props = defineProps({
@ -14,12 +14,29 @@ const $props = defineProps({
onMounted( onMounted(
() => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false) () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
); );
const teleportRef = ref({});
const hasContent = ref();
let observer;
onMounted(() => {
if (!teleportRef.value) return;
const checkContent = () => {
hasContent.value = teleportRef.value?.innerHTML?.trim() !== '';
};
observer = new MutationObserver(checkContent);
observer.observe(teleportRef.value, { childList: true, subtree: true });
checkContent();
});
</script> </script>
<template> <template>
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256"> <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
<QScrollArea class="fit text-grey-8"> <QScrollArea class="fit text-grey-8">
<LeftMenu /> <div id="left-panel" ref="teleportRef"></div>
<LeftMenu v-if="!hasContent" />
</QScrollArea> </QScrollArea>
</QDrawer> </QDrawer>
<QPageContainer> <QPageContainer>

View File

@ -0,0 +1,110 @@
<script setup>
import RightMenu from './RightMenu.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnTableFilter from '../VnTable/VnTableFilter.vue';
import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
import { useArrayData } from 'src/composables/useArrayData';
import { useRoute, useRouter } from 'vue-router';
import { useHasContent } from 'src/composables/useHasContent';
const $props = defineProps({
section: {
type: String,
default: null,
},
dataKey: {
type: String,
default: null,
},
searchBar: {
type: Boolean,
default: true,
},
prefix: {
type: String,
default: null,
},
rightFilter: {
type: Boolean,
default: true,
},
columns: {
type: Array,
default: null,
},
arrayDataProps: {
type: Object,
default: null,
},
redirect: {
type: Boolean,
default: true,
},
keepData: {
type: Boolean,
default: true,
},
});
const route = useRoute();
const router = useRouter();
let arrayData;
const sectionValue = computed(() => $props.section ?? $props.dataKey);
const isMainSection = ref(false);
const searchbarId = 'section-searchbar';
const hasContent = useHasContent(`#${searchbarId}`);
onBeforeMount(() => {
if ($props.dataKey)
arrayData = useArrayData($props.dataKey, {
searchUrl: 'table',
keepData: $props.keepData,
...$props.arrayDataProps,
navigate: $props.redirect,
});
checkIsMain();
});
onMounted(() => {
const unsubscribe = router.afterEach(() => {
checkIsMain();
});
onUnmounted(unsubscribe);
});
function checkIsMain() {
isMainSection.value = sectionValue.value == route.name;
if (!isMainSection.value && arrayData) {
arrayData.reset(['userParams', 'filter']);
arrayData.setCurrentFilter();
}
}
</script>
<template>
<slot name="searchbar">
<VnSearchbar
v-if="searchBar && !hasContent"
v-bind="arrayDataProps"
:data-key="dataKey"
:label="$t(`${prefix}.search`)"
:info="$t(`${prefix}.searchInfo`)"
/>
<div :id="searchbarId"></div>
</slot>
<RightMenu>
<template #right-panel v-if="$slots['rightMenu'] || rightFilter">
<slot name="rightMenu">
<VnTableFilter
v-if="rightFilter && columns"
:data-key="dataKey"
:array-data="arrayData"
:columns="columns"
/>
</slot>
</template>
</RightMenu>
<slot name="body" v-if="isMainSection" />
<RouterView v-else />
</template>

View File

@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
import dataByOrder from 'src/utils/dataByOrder'; import dataByOrder from 'src/utils/dataByOrder';
import { QItemLabel } from 'quasar';
const emit = defineEmits(['update:modelValue', 'update:options', 'remove']); const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
const $attrs = useAttrs(); const $attrs = useAttrs();
@ -26,13 +27,17 @@ const $props = defineProps({
default: () => [], default: () => [],
}, },
optionLabel: { optionLabel: {
type: [String], type: [String, Function],
default: 'name', default: 'name',
}, },
optionValue: { optionValue: {
type: String, type: String,
default: 'id', default: 'id',
}, },
optionCaption: {
type: String,
default: null,
},
optionFilter: { optionFilter: {
type: String, type: String,
default: null, default: null,
@ -101,11 +106,22 @@ const $props = defineProps({
type: String, type: String,
default: null, default: null,
}, },
isOutlined: {
type: Boolean,
default: false,
},
}); });
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])]; const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } = const {
toRefs($props); optionLabel,
optionValue,
optionCaption,
optionFilter,
optionFilterValue,
options,
modelValue,
} = toRefs($props);
const myOptions = ref([]); const myOptions = ref([]);
const myOptionsOriginal = ref([]); const myOptionsOriginal = ref([]);
const vnSelectRef = ref(); const vnSelectRef = ref();
@ -115,6 +131,15 @@ const noOneOpt = ref({
[optionValue.value]: false, [optionValue.value]: false,
[optionLabel.value]: noOneText, [optionLabel.value]: noOneText,
}); });
const styleAttrs = computed(() => {
return $props.isOutlined
? {
dense: true,
outlined: true,
rounded: true,
}
: {};
});
const isLoading = ref(false); const isLoading = ref(false);
const useURL = computed(() => $props.url); const useURL = computed(() => $props.url);
const value = computed({ const value = computed({
@ -148,7 +173,11 @@ onMounted(() => {
const arrayDataKey = const arrayDataKey =
$props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label); $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false }); const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
function findKeyInOptions() { function findKeyInOptions() {
if (!$props.options) return; if (!$props.options) return;
@ -176,10 +205,10 @@ function filter(val, options) {
} }
if (!row) return; if (!row) return;
const id = row[$props.optionValue]; const id = String(row[$props.optionValue]);
const optionLabel = String(row[$props.optionLabel]).toLowerCase(); const optionLabel = String(row[$props.optionLabel]).toLowerCase();
return id == search || optionLabel.includes(search); return id.includes(search) || optionLabel.includes(search);
}); });
} }
@ -203,12 +232,15 @@ async function fetchFilter(val) {
} else defaultWhere = { [key]: getVal(val) }; } else defaultWhere = { [key]: getVal(val) };
const where = { ...(val ? defaultWhere : {}), ...$props.where }; const where = { ...(val ? defaultWhere : {}), ...$props.where };
$props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val)); $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
const fetchOptions = { where, include, limit }; const filterOptions = { where, include, limit };
if (fields) fetchOptions.fields = fields; if (fields) filterOptions.fields = fields;
if (sortBy) fetchOptions.order = sortBy; if (sortBy) filterOptions.order = sortBy;
arrayData.reset(['skip', 'filter.skip', 'page']); arrayData.resetPagination();
const { data } = await arrayData.applyFilter({ filter: fetchOptions }); const { data } = await arrayData.applyFilter(
{ filter: filterOptions },
{ updateRouter: false }
);
setOptions(data); setOptions(data);
return data; return data;
} }
@ -265,7 +297,7 @@ async function onScroll({ to, direction, from, index }) {
} }
} }
defineExpose({ opts: myOptions }); defineExpose({ opts: myOptions, vnSelectRef });
function handleKeyDown(event) { function handleKeyDown(event) {
if (event.key === 'Tab' && !event.shiftKey) { if (event.key === 'Tab' && !event.shiftKey) {
@ -288,7 +320,7 @@ function handleKeyDown(event) {
} }
const focusableElements = document.querySelectorAll( const focusableElements = document.querySelectorAll(
'a, button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])' 'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
); );
const currentIndex = Array.prototype.indexOf.call( const currentIndex = Array.prototype.indexOf.call(
focusableElements, focusableElements,
@ -299,6 +331,11 @@ function handleKeyDown(event) {
} }
} }
} }
function getCaption(opt) {
if (optionCaption.value === false) return;
return opt[optionCaption.value] || opt[optionValue.value];
}
</script> </script>
<template> <template>
@ -307,9 +344,8 @@ function handleKeyDown(event) {
:options="myOptions" :options="myOptions"
:option-label="optionLabel" :option-label="optionLabel"
:option-value="optionValue" :option-value="optionValue"
v-bind="$attrs" v-bind="{ ...$attrs, ...styleAttrs }"
@filter="filterHandler" @filter="filterHandler"
@keydown="handleKeyDown"
:emit-value="nullishToTrue($attrs['emit-value'])" :emit-value="nullishToTrue($attrs['emit-value'])"
:map-options="nullishToTrue($attrs['map-options'])" :map-options="nullishToTrue($attrs['map-options'])"
:use-input="nullishToTrue($attrs['use-input'])" :use-input="nullishToTrue($attrs['use-input'])"
@ -324,13 +360,15 @@ function handleKeyDown(event) {
:input-debounce="useURL ? '300' : '0'" :input-debounce="useURL ? '300' : '0'"
:loading="isLoading" :loading="isLoading"
@virtual-scroll="onScroll" @virtual-scroll="onScroll"
@keydown="handleKeyDown"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'" :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
:data-url="url"
> >
<template #append> <template #append>
<QIcon <QIcon
v-show="isClearable && value" v-show="isClearable && value"
name="close" name="close"
@click.stop=" @click="
() => { () => {
value = null; value = null;
emit('remove'); emit('remove');
@ -358,6 +396,22 @@ function handleKeyDown(event) {
</div> </div>
<slot v-else :name="slotName" v-bind="slotData ?? {}" :key="slotName" /> <slot v-else :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template> </template>
<template #option="{ opt, itemProps }">
<QItem v-bind="itemProps">
<QItemSection v-if="typeof opt !== 'object'"> {{ opt }}</QItemSection>
<QItemSection v-else-if="opt[optionValue] == opt[optionLabel]">
<QItemLabel>{{ opt[optionLabel] }}</QItemLabel>
</QItemSection>
<QItemSection v-else>
<QItemLabel>
{{ opt[optionLabel] }}
</QItemLabel>
<QItemLabel caption v-if="getCaption(opt)">
{{ `#${getCaption(opt)}` }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</QSelect> </QSelect>
</template> </template>

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { computed } from 'vue'; import { ref, computed } from 'vue';
import { useRole } from 'src/composables/useRole'; import { useRole } from 'src/composables/useRole';
import { useAcl } from 'src/composables/useAcl'; import { useAcl } from 'src/composables/useAcl';
@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
const emit = defineEmits(['update:modelValue']); const emit = defineEmits(['update:modelValue']);
const value = defineModel({ type: [String, Number, Object] }); const value = defineModel({ type: [String, Number, Object] });
const select = ref(null);
const $props = defineProps({ const $props = defineProps({
rolesAllowedToCreate: { rolesAllowedToCreate: {
type: Array, type: Array,
@ -33,10 +34,13 @@ const isAllowedToCreate = computed(() => {
if ($props.acls.length) return acl.hasAny($props.acls); if ($props.acls.length) return acl.hasAny($props.acls);
return role.hasAny($props.rolesAllowedToCreate); return role.hasAny($props.rolesAllowedToCreate);
}); });
defineExpose({ vnSelectDialogRef: select });
</script> </script>
<template> <template>
<VnSelect <VnSelect
ref="select"
v-model="value" v-model="value"
v-bind="$attrs" v-bind="$attrs"
@update:model-value="(...args) => emit('update:modelValue', ...args)" @update:model-value="(...args) => emit('update:modelValue', ...args)"

View File

@ -51,10 +51,11 @@ const url = computed(() => {
option-value="id" option-value="id"
option-label="nickname" option-label="nickname"
:fields="['id', 'name', 'nickname', 'code']" :fields="['id', 'name', 'nickname', 'code']"
:filter-options="['id', 'name', 'nickname', 'code']"
sort-by="nickname ASC" sort-by="nickname ASC"
> >
<template #prepend v-if="$props.hasAvatar"> <template #prepend v-if="$props.hasAvatar">
<VnAvatar :worker-id="value" color="primary" :title="title" /> <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
</template> </template>
<template #append v-if="$props.hasInfo"> <template #append v-if="$props.hasInfo">
<QIcon name="info" class="cursor-pointer"> <QIcon name="info" class="cursor-pointer">
@ -71,7 +72,8 @@ const url = computed(() => {
{{ scope.opt.nickname }} {{ scope.opt.nickname }}
</QItemLabel> </QItemLabel>
<QItemLabel caption v-else> <QItemLabel caption v-else>
{{ scope.opt.nickname }}, {{ scope.opt.code }} #{{ scope.opt.id }}, {{ scope.opt.nickname }},
{{ scope.opt.code }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>

View File

@ -0,0 +1,87 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import VnDmsList from 'src/components/common/VnDmsList.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
describe('VnDmsList', () => {
let vm;
const dms = {
userFk: 1,
name: 'DMS 1'
};
beforeAll(() => {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
vm = createWrapper(VnDmsList, {
props: {
model: 'WorkerDms/1110/filter',
defaultDmsCode: 'hhrrData',
filter: 'wd.workerFk',
updateModel: 'Workers',
deleteModel: 'WorkerDms',
downloadModel: 'WorkerDms'
}
}).vm;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('setData()', () => {
const data = [
{
userFk: 1,
name: 'Jessica',
lastName: 'Jones',
file: '4.jpg',
created: '2021-07-28 21:00:00'
},
{
userFk: 2,
name: 'Bruce',
lastName: 'Banner',
created: '2022-07-28 21:00:00',
dms: {
userFk: 2,
name: 'Bruce',
lastName: 'BannerDMS',
created: '2022-07-28 21:00:00',
file: '4.jpg',
}
},
{
userFk: 3,
name: 'Natasha',
lastName: 'Romanoff',
file: '4.jpg',
created: '2021-10-28 21:00:00'
}
]
it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
vm.setData(data);
expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
expect([vm.rows][0][1].lastName).toEqual('Romanoff');
});
});
describe('parseDms()', () => {
const resultDms = { ...dms, userId:1};
it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
const parsedDms = vm.parseDms(dms);
expect(parsedDms).toEqual(resultDms);
});
});
describe('showFormDialog()', () => {
const resultDms = { ...dms, userId:1};
it('should call fn parseDms() and set show true if dms is defined', () => {
vm.showFormDialog(dms);
expect(vm.formDialog.show).toEqual(true);
expect(vm.formDialog.dms).toEqual(resultDms);
});
});
});

View File

@ -0,0 +1,91 @@
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;
let input;
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
wrapper = createWrapper(VnInput, {
props: {
modelValue: value,
isOutlined, emptyToNull, insertable,
maxlength: 101
},
attrs: {
label: 'test',
required: true,
maxlength: 101,
maxLength: 10,
'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)
await input.setValue('123');
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
});
it('should emit update:modelValue with null when input is empty', async () => {
generateWrapper('12345', false, true, true);
await input.setValue('');
expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('123', false, false, false);
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('123', true, false, false);
expect(vm.styleAttrs.outlined).toBe(true);
});
});
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()
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);
});
});
describe('focus', () => {
it('should call focus method when input is focused', async () => {
generateWrapper('123', false, false, true);
const focusSpy = vi.spyOn(input.element, 'focus');
vm.focus();
expect(focusSpy).toHaveBeenCalled();
});
});
});

View File

@ -0,0 +1,72 @@
import { createWrapper } from 'app/test/vitest/helper.js';
import { describe, it, expect } from 'vitest';
import VnInputDate from 'components/common/VnInputDate.vue';
let vm;
let wrapper;
function generateWrapper(date, outlined, required) {
wrapper = createWrapper(VnInputDate, {
props: {
modelValue: date,
},
attrs: {
isOutlined: outlined,
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);
await vm.$nextTick();
expect(vm.formattedDate).toBe('25/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('should not update the model value when an invalid date is set', 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');
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25', false, false);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25', true, false);
await vm.$nextTick();
expect(vm.styleAttrs.outlined).toBe(true);
});
});
describe('required', () => {
it('should not applies required class when isRequired is false', async () => {
generateWrapper('2023-12-25', false, false);
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);
await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
});
});
});

View File

@ -0,0 +1,63 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnInputTime from 'components/common/VnInputTime.vue';
describe('VnInputTime', () => {
let wrapper;
let vm;
beforeAll(() => {
wrapper = createWrapper(VnInputTime, {
props: {
isOutlined: true,
timeOnly: false,
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should return the correct data if isOutlined is true', () => {
expect(vm.isOutlined).toBe(true);
expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
});
it('should return the formatted data', () => {
expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
});
describe('formattedTime', () => {
it('should return the formatted time for a valid ISO date', () => {
vm.model = '2025-01-02T15:45:00';
expect(vm.formattedTime).toBe('15:45');
});
it('should handle null model value gracefully', () => {
vm.model = null;
expect(vm.formattedTime).toBe(null);
});
it('should handle time-only input correctly', async () => {
await wrapper.setProps({ timeOnly: true });
vm.formattedTime = '14:30';
expect(vm.model).toBe('14:30');
});
it('should pad short time values correctly', async () => {
await wrapper.setProps({ timeOnly: true });
vm.formattedTime = '9';
expect(vm.model).toBe('09:00');
});
it('should not update the model if the value is unchanged', () => {
vm.model = '14:30';
const previousModel = vm.model;
vm.formattedTime = '14:30';
expect(vm.model).toBe(previousModel);
});
});
});

View File

@ -0,0 +1,95 @@
import { describe, it, expect } from 'vitest';
import VnJsonValue from 'src/components/common/VnJsonValue.vue';
import { createWrapper } from 'app/test/vitest/helper';
const buildComponent = (props) => {
return createWrapper(VnJsonValue, {
props,
}).wrapper;
};
describe('VnJsonValue', () => {
it('renders null value correctly', async () => {
const wrapper = buildComponent({ value: null });
const span = wrapper.find('span');
expect(span.text()).toBe('∅');
expect(span.classes()).toContain('json-null');
});
it('renders boolean true correctly', async () => {
const wrapper = buildComponent({ value: true });
const span = wrapper.find('span');
expect(span.text()).toBe('✓');
expect(span.classes()).toContain('json-true');
});
it('renders boolean false correctly', async () => {
const wrapper = buildComponent({ value: false });
const span = wrapper.find('span');
expect(span.text()).toBe('✗');
expect(span.classes()).toContain('json-false');
});
it('renders a short string correctly', async () => {
const wrapper = buildComponent({ value: 'Hello' });
const span = wrapper.find('span');
expect(span.text()).toBe('Hello');
expect(span.classes()).toContain('json-string');
});
it('renders a long string correctly with ellipsis', async () => {
const longString = 'a'.repeat(600);
const wrapper = buildComponent({ value: longString });
const span = wrapper.find('span');
expect(span.text()).toContain('...');
expect(span.text().length).toBeLessThanOrEqual(515);
expect(span.attributes('title')).toBe(longString);
expect(span.classes()).toContain('json-string');
});
it('renders a number correctly', async () => {
const wrapper = buildComponent({ value: 123.4567 });
const span = wrapper.find('span');
expect(span.text()).toBe('123.457');
expect(span.classes()).toContain('json-number');
});
it('renders an integer correctly', async () => {
const wrapper = buildComponent({ value: 42 });
const span = wrapper.find('span');
expect(span.text()).toBe('42');
expect(span.classes()).toContain('json-number');
});
it('renders a date correctly', async () => {
const date = new Date('2023-01-01');
const wrapper = buildComponent({ value: date });
const span = wrapper.find('span');
expect(span.text()).toBe('2023-01-01');
expect(span.classes()).toContain('json-object');
});
it('renders an object correctly', async () => {
const obj = { key: 'value' };
const wrapper = buildComponent({ value: obj });
const span = wrapper.find('span');
expect(span.text()).toBe(obj.toString());
expect(span.classes()).toContain('json-object');
});
it('renders an array correctly', async () => {
const arr = [1, 2, 3];
const wrapper = buildComponent({ value: arr });
const span = wrapper.find('span');
expect(span.text()).toBe(arr.toString());
expect(span.classes()).toContain('json-object');
});
it('updates value when prop changes', async () => {
const wrapper = buildComponent({ value: true });
await wrapper.setProps({ value: 123 });
const span = wrapper.find('span');
expect(span.text()).toBe('123');
expect(span.classes()).toContain('json-number');
});
});

View File

@ -0,0 +1,91 @@
import { createWrapper } from 'app/test/vitest/helper';
import VnLocation from 'components/common/VnLocation.vue';
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
function buildComponent(data) {
return createWrapper(VnLocation, {
global: {
props: {
location: data
}
},
}).vm;
}
afterEach(() => {
vi.clearAllMocks();
});
describe('formatLocation', () => {
let locationBase;
beforeEach(() => {
locationBase = {
postcode: '46680',
city: 'Algemesi',
province: { name: 'Valencia' },
country: { name: 'Spain' }
};
});
it('should return the postcode, city, province and country', () => {
const location = { ...locationBase };
const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('46680, Algemesi(Valencia), Spain');
});
it('should return the postcode and country', () => {
const location = { ...locationBase, city: undefined };
const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('46680, Spain');
});
it('should return the city, province and country', () => {
const location = { ...locationBase, postcode: undefined };
const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('Algemesi(Valencia), Spain');
});
it('should return the country', () => {
const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('Spain');
});
});
describe('showLabel', () => {
let locationBase;
beforeEach(() => {
locationBase = {
code: '46680',
town: 'Algemesi',
province: 'Valencia',
country: 'Spain'
};
});
it('should show the label with postcode, city, province and country', () => {
const location = { ...locationBase };
const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('46680, Algemesi(Valencia), Spain');
});
it('should show the label with postcode and country', () => {
const location = { ...locationBase, town: undefined };
const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('46680, Spain');
});
it('should show the label with city, province and country', () => {
const location = { ...locationBase, code: undefined };
const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('Algemesi(Valencia), Spain');
});
it('should show the label with country', () => {
const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('Spain');
});
});

View File

@ -0,0 +1,107 @@
import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import VnNotes from 'src/components/ui/VnNotes.vue';
describe('VnNotes', () => {
let vm;
let wrapper;
let spyFetch;
let postMock;
let expectedBody;
const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
function generateExpectedBody() {
expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
}
async function setTestParams(text, observationType, type){
vm.newNote.text = text;
vm.newNote.observationTypeFk = observationType;
wrapper.setProps({ selectType: type });
}
beforeAll(async () => {
vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
wrapper = createWrapper(VnNotes, {
propsData: {
url: '/test',
body: { name: 'Tony', lastName: 'Stark' },
}
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
});
beforeEach(() => {
postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
});
afterEach(() => {
vi.clearAllMocks();
expectedBody = {};
});
describe('insert', () => {
it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
await setTestParams( null, null, true );
await vm.insert();
expect(postMock).not.toHaveBeenCalled();
expect(spyFetch).not.toHaveBeenCalled();
});
it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
await setTestParams( "", null, false );
await vm.insert();
expect(postMock).not.toHaveBeenCalled();
expect(spyFetch).not.toHaveBeenCalled();
});
it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
await setTestParams( "Test Note", null, true );
await vm.insert();
expect(postMock).not.toHaveBeenCalled();
expect(spyFetch).not.toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
await setTestParams( "Test Note", null, false );
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(spyFetch).toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {
await setTestParams( "Test Note", 1, false );
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(spyFetch).toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
await setTestParams( "Test Note", 1, true );
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(spyFetch).toHaveBeenCalled();
});
});
});

View File

@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import VnMoreOptions from './VnMoreOptions.vue';
const $props = defineProps({ const $props = defineProps({
url: { url: {
@ -47,7 +48,6 @@ let store;
let entity; let entity;
const isLoading = ref(false); const isLoading = ref(false);
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName); const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
const menuRef = ref();
defineExpose({ getData }); defineExpose({ getData });
onBeforeMount(async () => { onBeforeMount(async () => {
@ -159,25 +159,11 @@ const toModule = computed(() =>
</QTooltip> </QTooltip>
</QBtn> </QBtn>
</RouterLink> </RouterLink>
<QBtn <VnMoreOptions v-if="$slots.menu">
v-if="$slots.menu" <template #menu="{ menuRef }">
color="white" <slot name="menu" :entity="entity" :menu-ref="menuRef" />
dense </template>
flat </VnMoreOptions>
icon="more_vert"
round
size="md"
data-cy="descriptor-more-opts"
>
<QTooltip>
{{ t('components.cardDescriptor.moreOptions') }}
</QTooltip>
<QMenu :ref="menuRef">
<QList>
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
</QList>
</QMenu>
</QBtn>
</div> </div>
<slot name="before" /> <slot name="before" />
<div class="body q-py-sm"> <div class="body q-py-sm">
@ -222,8 +208,8 @@ const toModule = computed(() =>
/> />
</template> </template>
<style lang="scss" scoped> <style lang="scss">
:deep(.body) { .body {
background-color: var(--vn-section-color); background-color: var(--vn-section-color);
.text-h5 { .text-h5 {
font-size: 20px; font-size: 20px;
@ -262,7 +248,9 @@ const toModule = computed(() =>
} }
} }
} }
</style>
<style lang="scss" scoped>
.title { .title {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -2,9 +2,9 @@
import { ref, computed, watch, onBeforeMount } from 'vue'; import { ref, computed, watch, onBeforeMount } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import SkeletonSummary from 'components/ui/SkeletonSummary.vue'; import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import { isDialogOpened } from 'src/filters'; import { isDialogOpened } from 'src/filters';
import VnMoreOptions from './VnMoreOptions.vue';
const props = defineProps({ const props = defineProps({
url: { url: {
@ -81,11 +81,16 @@ async function fetch() {
<span v-else></span> <span v-else></span>
</slot> </slot>
<slot name="header" :entity="entity" dense> <slot name="header" :entity="entity" dense>
<VnLv :label="`${entity.id} -`" :value="entity.name" /> {{ entity.id + ' - ' + entity.name }}
</slot>
<slot name="header-right" :entity="entity">
<span></span>
</slot> </slot>
<span class="row no-wrap">
<slot name="header-right" :entity="entity" />
<VnMoreOptions v-if="$slots.menu && isDialogOpened()">
<template #menu="{ menuRef }">
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
</template>
</VnMoreOptions>
</span>
</div> </div>
<div class="summaryBody row q-mb-md"> <div class="summaryBody row q-mb-md">
<slot name="body" :entity="entity" /> <slot name="body" :entity="entity" />
@ -170,7 +175,7 @@ async function fetch() {
display: inline-block; display: inline-block;
} }
.header.link:hover { .header.link:hover {
color: lighten($primary, 20%); color: rgba(var(--q-primary), 0.8);
} }
.q-checkbox { .q-checkbox {
& .q-checkbox__label { & .q-checkbox__label {

View File

@ -16,7 +16,12 @@ const $props = defineProps({
required: false, required: false,
default: 'value', default: 'value',
}, },
columns: {
type: Number,
default: 3,
},
}); });
const tags = computed(() => { const tags = computed(() => {
return Object.keys($props.item) return Object.keys($props.item)
.filter((i) => i.startsWith(`${$props.tag}`)) .filter((i) => i.startsWith(`${$props.tag}`))
@ -28,10 +33,21 @@ const tags = computed(() => {
return acc; return acc;
}, {}); }, {});
}); });
const columnStyle = computed(() => {
if ($props.columns) {
return {
'grid-template-columns': `repeat(${$props.columns}, 1fr)`,
'max-width': `${$props.columns * 4}rem`,
};
}
return {};
});
</script> </script>
<template> <template>
<div class="fetchedTags"> <div class="fetchedTags">
<div class="wrap"> <div class="wrap" :style="columnStyle">
<div <div
v-for="(val, key) in tags" v-for="(val, key) in tags"
:key="key" :key="key"
@ -39,37 +55,43 @@ const tags = computed(() => {
:title="`${key}: ${val}`" :title="`${key}: ${val}`"
:class="{ empty: !val }" :class="{ empty: !val }"
> >
{{ val }} <span class="text">{{ val }} </span>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.fetchedTags { .fetchedTags {
align-items: center; align-items: center;
.wrap { .wrap {
width: 100%; display: grid;
flex-wrap: wrap;
display: flex;
} }
.inline-tag { .inline-tag {
display: flex;
align-items: center;
justify-content: center;
height: 1rem; height: 1rem;
margin: 0.05rem; margin: 0.05rem;
color: $color-font-secondary; color: var(--vn-label-color);
text-align: center; text-align: center;
font-size: smaller; font-size: smaller;
padding: 1px; padding: 1px;
flex: 1; border: 1px solid var(--vn-label-color);
border: 1px solid $color-spacer;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
min-width: 4rem; min-width: 4rem;
max-width: 4rem; max-width: 4rem;
} }
.text {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: smaller;
}
.empty { .empty {
border: 1px solid #2b2b2b; border: 1px solid var(--vn-empty-tag);
} }
} }
</style> </style>

View File

@ -1,38 +1,49 @@
<template> <template>
<div class="header bg-primary q-pa-sm q-mb-md"> <div class="header bg-primary q-pa-sm q-mb-md">
<QSkeleton type="rect" square /> <QSkeleton type="rect" square />
<QSkeleton type="rect" square />
</div> </div>
<div class="row q-pa-md q-col-gutter-md q-mb-md"> <div class="row q-pa-md q-col-gutter-md q-mb-md">
<QSkeleton type="rect" class="q-mb-md" square /> <div class="col">
<QSkeleton type="text" square /> <QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> </div>
<QSkeleton type="text" square /> <div class="col">
<QSkeleton type="text" square /> <QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> </div>
<QSkeleton type="text" square /> <div class="col">
<QSkeleton type="text" square /> <QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="rect" class="q-mb-md" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> </div>
<QSkeleton type="rect" class="q-mb-md" square /> <div class="col">
<QSkeleton type="text" square /> <QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square /> <QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
</div> </div>
</template> </template>

View File

@ -98,6 +98,7 @@ function cancel() {
/> />
<QBtn <QBtn
:label="t('globals.confirm')" :label="t('globals.confirm')"
:title="t('globals.confirm')"
color="primary" color="primary"
:loading="isLoading" :loading="isLoading"
@click="confirm()" @click="confirm()"

View File

@ -1,12 +1,14 @@
<script setup> <script setup>
import { onMounted, ref, computed, watch } from 'vue'; import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { useRoute } from 'vue-router';
import toDate from 'filters/toDate'; import toDate from 'filters/toDate';
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue'; import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
import { useFilterParams } from 'src/composables/useFilterParams';
import { useRoute } from 'vue-router';
const { t } = useI18n(); const { t, te } = useI18n();
const route = useRoute();
const $props = defineProps({ const $props = defineProps({
modelValue: { modelValue: {
type: Object, type: Object,
@ -55,6 +57,10 @@ const $props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
arrayData: {
type: Object,
default: null,
},
}); });
const emit = defineEmits([ const emit = defineEmits([
@ -67,52 +73,19 @@ const emit = defineEmits([
'setUserParams', 'setUserParams',
]); ]);
const arrayData = useArrayData($props.dataKey, { const arrayData =
exprBuilder: $props.exprBuilder, $props.arrayData ??
searchUrl: $props.searchUrl, useArrayData($props.dataKey, {
navigate: $props.redirect ? {} : null, exprBuilder: $props.exprBuilder,
}); searchUrl: $props.searchUrl,
const route = useRoute(); navigate: $props.redirect ? {} : null,
});
const store = arrayData.store; const store = arrayData.store;
const userParams = ref({}); const userParams = ref(useFilterParams($props.dataKey).params);
const userOrders = ref(useFilterParams($props.dataKey).orders);
defineExpose({ search, sanitizer, params: userParams }); defineExpose({ search, params: userParams, remove });
onMounted(() => {
if (!userParams.value) userParams.value = $props.modelValue ?? {};
emit('init', { params: userParams.value });
});
function setUserParams(watchedParams) {
if (!watchedParams || Object.keys(watchedParams).length == 0) return;
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
if (typeof watchedParams?.filter == 'string')
watchedParams.filter = JSON.parse(watchedParams.filter);
watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
const order = watchedParams.filter?.order;
delete watchedParams.filter;
userParams.value = sanitizer(watchedParams);
emit('setUserParams', userParams.value, order);
}
watch(
() => route.query[$props.searchUrl],
(val, oldValue) => (val || oldValue) && setUserParams(val)
);
watch(
() => arrayData.store.userParams,
(val, oldValue) => (val || oldValue) && setUserParams(val),
{ immediate: true }
);
watch(
() => $props.modelValue,
(val) => (userParams.value = val ?? {})
);
const isLoading = ref(false); const isLoading = ref(false);
async function search(evt) { async function search(evt) {
@ -123,10 +96,9 @@ async function search(evt) {
isLoading.value = true; isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue }; const filter = { ...userParams.value, ...$props.modelValue };
store.userParamsChanged = true; store.userParamsChanged = true;
const { params: newParams } = await arrayData.addFilter({ await arrayData.addFilter({
params: filter, params: filter,
}); });
userParams.value = newParams;
if (!$props.showAll && !Object.values(filter).length) store.data = []; if (!$props.showAll && !Object.values(filter).length) store.data = [];
emit('search'); emit('search');
@ -139,7 +111,7 @@ async function clearFilters() {
try { try {
isLoading.value = true; isLoading.value = true;
store.userParamsChanged = true; store.userParamsChanged = true;
arrayData.reset(['skip', 'filter.skip', 'page']); arrayData.resetPagination();
// Filtrar los params no removibles // Filtrar los params no removibles
const removableFilters = Object.keys(userParams.value).filter((param) => const removableFilters = Object.keys(userParams.value).filter((param) =>
$props.unremovableParams.includes(param) $props.unremovableParams.includes(param)
@ -149,9 +121,8 @@ async function clearFilters() {
for (const key of removableFilters) { for (const key of removableFilters) {
newParams[key] = userParams.value[key]; newParams[key] = userParams.value[key];
} }
userParams.value = {};
userParams.value = { ...newParams }; // Actualizar los params con los removibles await arrayData.applyFilter({ params: { ...newParams } });
await arrayData.applyFilter({ params: userParams.value });
if (!$props.showAll) { if (!$props.showAll) {
store.data = []; store.data = [];
@ -214,20 +185,13 @@ function formatValue(value) {
return `"${value}"`; return `"${value}"`;
} }
function sanitizer(params) { const getLocale = (label) => {
for (const [key, value] of Object.entries(params)) { const param = label.split('.').at(-1);
if (key === 'and' && Array.isArray(value)) { const globalLocale = `globals.params.${param}`;
value.forEach((item) => { if (te(globalLocale)) return t(globalLocale);
Object.assign(params, item); else if (te(t(`params.${param}`)));
}); else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
delete params[key]; };
} else if (value && typeof value === 'object') {
const param = Object.values(value)[0];
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
}
}
return params;
}
</script> </script>
<template> <template>
@ -238,7 +202,11 @@ function sanitizer(params) {
style="position: fixed; z-index: 1; right: 0; bottom: 0" style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search" icon="search"
@click="search()" @click="search()"
></QBtn> >
<QTooltip bottom anchor="bottom right">
{{ t('globals.search') }}
</QTooltip>
</QBtn>
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()"> <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
<QList dense> <QList dense>
<QItem class="q-mt-xs"> <QItem class="q-mt-xs">
@ -277,7 +245,12 @@ function sanitizer(params) {
@remove="remove(chip.label)" @remove="remove(chip.label)"
data-cy="vnFilterPanelChip" data-cy="vnFilterPanelChip"
> >
<slot name="tags" :tag="chip" :format-fn="formatValue"> <slot
name="tags"
:tag="chip"
:format-fn="formatValue"
:get-locale="getLocale"
>
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">
<strong>{{ chip.label }}:</strong> <strong>{{ chip.label }}:</strong>
<span>"{{ formatValue(chip.value) }}"</span> <span>"{{ formatValue(chip.value) }}"</span>
@ -290,6 +263,7 @@ function sanitizer(params) {
:params="userParams" :params="userParams"
:tags="customTags" :tags="customTags"
:format-fn="formatValue" :format-fn="formatValue"
:get-locale="getLocale"
:search-fn="search" :search-fn="search"
/> />
</div> </div>
@ -297,7 +271,13 @@ function sanitizer(params) {
<QSeparator /> <QSeparator />
</QList> </QList>
<QList dense class="list q-gutter-y-sm q-mt-sm"> <QList dense class="list q-gutter-y-sm q-mt-sm">
<slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot> <slot
name="body"
:get-locale="getLocale"
:params="userParams"
:orders="userOrders"
:search-fn="search"
></slot>
</QList> </QList>
</QForm> </QForm>
<QInnerLoading <QInnerLoading

View File

@ -30,7 +30,7 @@ onBeforeMount(async () => {
.data; .data;
if (!channel) channel = defaultChannel; if (!channel) channel = defaultChannel;
phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase()); phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
config[ config[
type type
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`; ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;

View File

@ -39,7 +39,7 @@ const val = computed(() => $props.value);
<template v-else> <template v-else>
<div v-if="label || $slots.label" class="label"> <div v-if="label || $slots.label" class="label">
<slot name="label"> <slot name="label">
<span>{{ label }}</span> <span style="color: var(--vn-label-color)">{{ label }}</span>
</slot> </slot>
</div> </div>
<div class="value"> <div class="value">

View File

@ -0,0 +1,20 @@
<template>
<QBtn
color="white"
dense
flat
icon="more_vert"
round
size="md"
data-cy="descriptor-more-opts"
>
<QTooltip>
{{ $t('components.cardDescriptor.moreOptions') }}
</QTooltip>
<QMenu ref="menuRef">
<QList>
<slot name="menu" :menu-ref="$refs.menuRef" />
</QList>
</QMenu>
</QBtn>
</template>

View File

@ -110,7 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
:url="$props.url" :url="$props.url"
order="created DESC" order="created DESC"
:limit="0" :limit="0"
:filter="$props.filter" :user-filter="$props.filter"
auto-load auto-load
ref="vnPaginateRef" ref="vnPaginateRef"
class="show" class="show"

View File

@ -74,6 +74,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
mapKey: {
type: String,
default: '',
},
}); });
const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']); const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@ -96,15 +100,20 @@ const arrayData = useArrayData(props.dataKey, {
exprBuilder: props.exprBuilder, exprBuilder: props.exprBuilder,
keepOpts: props.keepOpts, keepOpts: props.keepOpts,
searchUrl: props.searchUrl, searchUrl: props.searchUrl,
mapKey: props.mapKey,
}); });
const store = arrayData.store; const store = arrayData.store;
onMounted(async () => { onMounted(async () => {
if (props.autoLoad && !store.data?.length) await fetch(); if (props.autoLoad && !store.data?.length) await fetch();
else emit('onFetch', store.data);
mounted.value = true; mounted.value = true;
}); });
onBeforeUnmount(() => arrayData.reset()); onBeforeUnmount(() => {
if (!store.keepData) arrayData.reset(['data']);
arrayData.resetPagination();
});
watch( watch(
() => props.data, () => props.data,
@ -132,8 +141,8 @@ const addFilter = async (filter, params) => {
async function fetch(params) { async function fetch(params) {
useArrayData(props.dataKey, params); useArrayData(props.dataKey, params);
arrayData.reset(['filter.skip', 'skip', 'page']); arrayData.resetPagination();
await arrayData.fetch({ append: false, updateRouter: mounted.value }); await arrayData.fetch({ append: false });
return emitStoreData(); return emitStoreData();
} }
@ -195,13 +204,20 @@ async function onLoad(index, done) {
done(isDone); done(isDone);
} }
defineExpose({ fetch, update, addFilter, paginate }); defineExpose({
fetch,
update,
addFilter,
paginate,
userParams: arrayData.store.userParams,
currentFilter: arrayData.store.currentFilter,
});
</script> </script>
<template> <template>
<div class="full-width"> <div class="full-width">
<div <div
v-if="!props.autoLoad && !store.data && !isLoading" v-if="!store.data && !store.data?.length && !isLoading"
class="info-row q-pa-md text-center" class="info-row q-pa-md text-center"
> >
<h5> <h5>

View File

@ -1,14 +1,16 @@
<script setup> <script setup>
import { onMounted, ref, watch } from 'vue'; import { onMounted, ref, computed, watch } from 'vue';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useStateStore } from 'src/stores/useStateStore'; import { useStateStore } from 'src/stores/useStateStore';
import { useRoute } from 'vue-router';
const quasar = useQuasar(); const quasar = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
const state = useStateStore(); const state = useStateStore();
const route = useRoute();
const props = defineProps({ const props = defineProps({
dataKey: { dataKey: {
@ -51,10 +53,6 @@ const props = defineProps({
type: Object, type: Object,
default: null, default: null,
}, },
staticParams: {
type: Array,
default: () => [],
},
exprBuilder: { exprBuilder: {
type: Function, type: Function,
default: null, default: null,
@ -67,6 +65,10 @@ const props = defineProps({
type: Function, type: Function,
default: undefined, default: undefined,
}, },
searchRemoveParams: {
type: Boolean,
default: true,
},
}); });
const searchText = ref(); const searchText = ref();
@ -83,6 +85,17 @@ if (props.redirect)
}; };
let arrayData = useArrayData(props.dataKey, arrayDataProps); let arrayData = useArrayData(props.dataKey, arrayDataProps);
let store = arrayData.store; let store = arrayData.store;
const to = computed(() => {
const url = { path: route.path, query: { ...(route.query ?? {}) } };
const searchUrl = arrayData.store.searchUrl;
const currentFilter = {
...arrayData.store.currentFilter,
search: searchText.value || undefined,
};
if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
return url;
});
watch( watch(
() => props.dataKey, () => props.dataKey,
@ -100,16 +113,21 @@ onMounted(() => {
}); });
async function search() { async function search() {
const staticParams = Object.entries(store.userParams); arrayData.resetPagination();
arrayData.reset(['skip', 'page']);
const filter = { let filter = { params: { search: searchText.value } };
params: {
...Object.fromEntries(staticParams), if (!props.searchRemoveParams || !searchText.value) {
search: searchText.value, filter = {
}, params: {
...{ filter: props.filter }, ...store.userParams,
}; search: searchText.value,
},
filter: store.filter,
};
} else {
arrayData.reset(['currentFilter', 'userParams']);
}
if (props.whereFilter) { if (props.whereFilter) {
filter.filter = { filter.filter = {
@ -118,28 +136,38 @@ async function search() {
delete filter.params.search; delete filter.params.search;
} }
await arrayData.applyFilter(filter); await arrayData.applyFilter(filter);
searchText.value = undefined;
} }
</script> </script>
<template> <template>
<Teleport to="#searchbar" v-if="state.isHeaderMounted()"> <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
<QForm @submit="search" id="searchbarForm"> <QForm @submit="search" id="searchbarForm">
<RouterLink
:to="to"
@click="
!$event.shiftKey && !$event.ctrlKey && search();
$refs.input.focus();
"
>
<QIcon
v-if="!quasar.platform.is.mobile"
class="cursor-pointer"
name="search"
size="sm"
>
<QTooltip>{{ t('link') }}</QTooltip>
</QIcon>
</RouterLink>
<VnInput <VnInput
id="searchbar" id="searchbar"
ref="input"
v-model.trim="searchText" v-model.trim="searchText"
:placeholder="t(props.label)" :placeholder="t(props.label)"
dense dense
standout
autofocus autofocus
data-cy="vnSearchBar" data-cy="vn-searchbar"
borderless
> >
<template #prepend>
<QIcon
v-if="!quasar.platform.is.mobile"
class="cursor-pointer"
name="search"
@click="search"
/>
</template>
<template #append> <template #append>
<QIcon <QIcon
v-if="props.info && $q.screen.gt.xs" v-if="props.info && $q.screen.gt.xs"
@ -164,20 +192,52 @@ async function search() {
.q-field { .q-field {
transition: width 0.36s; transition: width 0.36s;
} }
</style>
<style lang="scss"> :deep(.q-field__native) {
padding-top: 10px;
padding-left: 5px;
}
:deep(.q-field--dark .q-field__native:focus) {
color: black;
}
:deep(.q-field--focused) {
.q-icon {
color: black;
}
}
.cursor-info { .cursor-info {
cursor: help; cursor: help;
} }
#searchbar {
.q-field--standout.q-field--highlighted .q-field__control { .q-form {
display: flex;
align-items: center;
border-radius: 4px;
padding: 0 5px;
background-color: var(--vn-search-color);
&:hover {
background-color: var(--vn-search-color-hover);
}
&:focus-within {
background-color: white; background-color: white;
color: black;
.q-field__native,
.q-icon { .q-icon {
color: black !important; color: black;
} }
} }
} }
.q-icon {
color: var(--vn-label-color);
}
</style> </style>
<i18n>
en:
link: click to search, ctrl + click to open in a new tab, shift + click to open in a new window
es:
link: clic para buscar, ctrl + clic para abrir en una nueva pestaña, shift + clic para abrir en una nueva ventana
</i18n>

View File

@ -54,6 +54,7 @@ function formatNumber(number) {
:offset="100" :offset="100"
:limit="5" :limit="5"
auto-load auto-load
map-key="smsFk"
> >
<template #body="{ rows }"> <template #body="{ rows }">
<QCard <QCard

View File

@ -0,0 +1,78 @@
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import CardSummary from 'src/components/ui/CardSummary.vue';
import * as vueRouter from 'vue-router';
describe('CardSummary', () => {
let vm;
let wrapper;
beforeAll(() => {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
});
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
query: {},
params: {},
meta: { moduleName: 'mockName' },
path: 'mockName/1/summary',
name: 'CardSummary',
});
beforeEach(() => {
wrapper = createWrapper(CardSummary, {
propsData: {
dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl',
filter: 'cardFilter',
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should fetch data correctly', async () => {
const fetchSpy = vi
.spyOn(vm.arrayData, 'fetch')
.mockResolvedValue({ data: [{ id: 1, name: 'Test Entity' }] });
await vm.fetch();
expect(fetchSpy).toHaveBeenCalledWith({ append: false, updateRouter: false });
expect(wrapper.emitted('onFetch')).toBeTruthy();
expect(vm.isLoading).toBe(false);
});
it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl');
expect(vm.store.filter).toEqual('cardFilter');
});
it('should compute entity correctly from store data', () => {
vm.store.data = [{ id: 1, name: 'Entity 1' }];
expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
});
it('should handle empty data gracefully', () => {
vm.store.data = [];
expect(vm.entity).toBeUndefined();
});
it('should respond to prop changes and refetch data', async () => {
const newUrl = 'CardSummary/35';
const newKey = 'cardSummaryKey/35';
const fetchSpy = vi.spyOn(vm.arrayData, 'fetch');
await wrapper.setProps({ url: newUrl, filter: { key: newKey } });
expect(fetchSpy).toHaveBeenCalled();
expect(vm.store.url).toBe(newUrl);
expect(vm.store.filter).toEqual({ key: newKey });
});
it('should return true if route path ends with /summary' , () => {
expect(vm.isSummary).toBe(true);
});
});

View File

@ -0,0 +1,81 @@
import { describe, expect, it } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import FetchedTags from 'src/components/ui/FetchedTags.vue';
describe('tags computed property', () => {
it('returns an object with the correct keys and values', () => {
const vm = createWrapper(FetchedTags, {
props: {
item: {
tag1: 'JavaScript',
value1: 'Programming Language',
tag2: 'Vue',
value2: 'Framework',
tag3: 'EmptyTag',
},
tag: 'tag',
value: 'value',
columns: 2,
},
}).vm;
expect(vm.tags).toEqual({
JavaScript: 'Programming Language',
Vue: 'Framework',
EmptyTag: '',
});
});
it('returns an empty object if the item prop is an empty object', () => {
const vm = createWrapper(FetchedTags, {
props: {
item: {},
tag: 'tag',
value: 'value',
},
}).vm;
expect(vm.tags).toEqual({});
});
it('should calculate the correct columnStyle when columns prop is defined', () => {
const vm = createWrapper(FetchedTags, {
props: {
item: {
tag1: 'JavaScript',
value1: 'Programming Language',
tag2: 'Vue',
value2: 'Framework',
tag3: 'EmptyTag',
},
tag: 'tag',
value: 'value',
columns: 2,
},
}).vm;
const expectedStyle = {
'grid-template-columns': 'repeat(2, 1fr)',
'max-width': '8rem',
};
expect(vm.columnStyle).toEqual(expectedStyle);
});
it('should return an empty object for columnStyle when columns prop is not defined', () => {
const vm = createWrapper(FetchedTags, {
props: {
item: {
tag1: 'JavaScript',
value1: 'Programming Language',
tag2: 'Vue',
value2: 'Framework',
tag3: 'EmptyTag',
},
tag: 'tag',
value: 'value',
columns: null,
},
}).vm;
expect(vm.columnStyle).toEqual({});
});
});

View File

@ -4,7 +4,11 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
describe('VnPaginate', () => { describe('VnPaginate', () => {
const expectedUrl = '/api/customers'; const expectedUrl = '/api/customers';
const defaultData = [
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
let vm; let vm;
beforeAll(() => { beforeAll(() => {
const options = { const options = {
@ -28,11 +32,7 @@ describe('VnPaginate', () => {
describe('paginate()', () => { describe('paginate()', () => {
it('should call to the paginate() method and set the data on the rows property', async () => { it('should call to the paginate() method and set the data on the rows property', async () => {
vi.spyOn(vm.arrayData, 'loadMore'); vi.spyOn(vm.arrayData, 'loadMore');
vm.store.data = [ vm.store.data = defaultData;
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
await vm.paginate(); await vm.paginate();
@ -42,26 +42,25 @@ describe('VnPaginate', () => {
it('should call to the paginate() method and then call it again to paginate', async () => { it('should call to the paginate() method and then call it again to paginate', async () => {
vi.spyOn(axios, 'get').mockResolvedValue({ vi.spyOn(axios, 'get').mockResolvedValue({
data: [ data: defaultData,
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
],
}); });
vm.store.hasMoreData = true; vm.store.hasMoreData = true;
await vm.$nextTick(); await vm.$nextTick();
vm.store.data = [ vm.store.data = defaultData;
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
await vm.paginate(); await vm.paginate();
expect(vm.store.skip).toEqual(3); expect(vm.store.skip).toEqual(3);
expect(vm.store.data.length).toEqual(6); expect(vm.store.data.length).toEqual(6);
vi.spyOn(axios, 'get').mockResolvedValue({
data: [
{ id: 4, name: 'Peter Parker' },
{ id: 5, name: 'Clark Kent' },
{ id: 6, name: 'Barry Allen' },
],
});
await vm.paginate(); await vm.paginate();
expect(vm.store.skip).toEqual(6); expect(vm.store.skip).toEqual(6);
@ -85,11 +84,7 @@ describe('VnPaginate', () => {
const index = 1; const index = 1;
const done = vi.fn(); const done = vi.fn();
vm.store.data = [ vm.store.data = defaultData;
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
await vm.onLoad(index, done); await vm.onLoad(index, done);
@ -105,11 +100,7 @@ describe('VnPaginate', () => {
], ],
}); });
vm.store.data = [ vm.store.data = defaultData;
{ id: 1, name: 'Tony Stark' },
{ id: 2, name: 'Jessica Jones' },
{ id: 3, name: 'Bruce Wayne' },
];
expect(vm.pagination.page).toEqual(1); expect(vm.pagination.page).toEqual(1);

View File

@ -0,0 +1,89 @@
import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnImg from 'src/components/ui/VnImg.vue';
let wrapper;
let vm;
const isEmployeeMock = vi.fn();
function generateWrapper(storage = 'images') {
wrapper = createWrapper(VnImg, {
props: {
id: 123,
zoomResolution: '400x400',
storage,
}
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
vm.timeStamp = 'timestamp';
};
vi.mock('src/composables/useSession', () => ({
useSession: () => ({
getTokenMultimedia: () => 'token',
}),
}));
vi.mock('src/composables/useRole', () => ({
useRole: () => ({
isEmployee: isEmployeeMock,
}),
}));
describe('VnImg', () => {
beforeEach(() => {
isEmployeeMock.mockReset();
});
afterEach(() => {
vi.clearAllMocks();
});
describe('getUrl', () => {
it('should return /api/{storage}/{id}/downloadFile?access_token={token} when storage is dms', async () => {
isEmployeeMock.mockReturnValue(false);
generateWrapper('dms');
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/api/dms/123/downloadFile?access_token=token');
});
it('should return /no-user.png when role is not employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(false);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/no-user.png');
});
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is false and role is employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(true);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
});
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(true);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl(true);
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
});
});
describe('reload', () => {
it('should update the timestamp', async () => {
generateWrapper();
const initialTimestamp = wrapper.vm.timeStamp;
wrapper.vm.reload();
const newTimestamp = wrapper.vm.timeStamp;
expect(initialTimestamp).not.toEqual(newTimestamp);
});
});
});

View File

@ -0,0 +1,45 @@
import { describe, expect, it, vi } from 'vitest';
import axios from 'axios';
import { getExchange } from 'src/composables/getExchange';
vi.mock('axios');
describe('getExchange()', () => {
it('should return the correct exchange rate', async () => {
axios.get.mockResolvedValue({
data: { value: 1.2 },
});
const amount = 100;
const currencyFk = 1;
const dated = '2023-01-01';
const result = await getExchange(amount, currencyFk, dated);
expect(result).toBe('83.33');
});
it('should return the correct exchange rate with custom decimal places', async () => {
axios.get.mockResolvedValue({
data: { value: 1.2 },
});
const amount = 100;
const currencyFk = 1;
const dated = '2023-01-01';
const decimalPlaces = 3;
const result = await getExchange(amount, currencyFk, dated, decimalPlaces);
expect(result).toBe('83.333');
});
it('should return null if the API call fails', async () => {
axios.get.mockRejectedValue(new Error('Network error'));
const amount = 100;
const currencyFk = 1;
const dated = '2023-01-01';
const result = await getExchange(amount, currencyFk, dated);
expect(result).toBeNull();
});
});

View File

@ -0,0 +1,55 @@
import { vi, describe, expect, it } from 'vitest';
import { getTotal } from 'src/composables/getTotal';
vi.mock('src/filters', () => ({
toCurrency: vi.fn((value, currency) => `${currency} ${value.toFixed(2)}`),
}));
describe('getTotal()', () => {
const rows = [
{ amount: 10.5, tax: 2.1 },
{ amount: 20.75, tax: 3.25 },
{ amount: 30.25, tax: 4.75 },
];
it('should calculate the total for a given key', () => {
const total = getTotal(rows, 'amount');
expect(total).toBe('61.50');
});
it('should calculate the total with a callback function', () => {
const total = getTotal(rows, null, { cb: (row) => row.amount + row.tax });
expect(total).toBe('71.60');
});
it('should format the total as currency', () => {
const total = getTotal(rows, 'amount', { currency: 'USD' });
expect(total).toBe('USD 61.50');
});
it('should format the total as currency with default currency', () => {
const total = getTotal(rows, 'amount', { currency: 'default' });
expect(total).toBe('undefined 61.50');
});
it('should calculate the total with integer formatting', () => {
const total = getTotal(rows, 'amount', { decimalPlaces: 0 });
expect(total).toBe('62');
});
it('should calculate the total with custom decimal places', () => {
const total = getTotal(rows, 'amount', { decimalPlaces: 1 });
expect(total).toBe('61.5');
});
it('should handle rows with missing keys', () => {
const rowsWithMissingKeys = [{ amount: 10.5 }, { amount: 20.75 }, {}];
const total = getTotal(rowsWithMissingKeys, 'amount');
expect(total).toBe('31.25');
});
it('should handle empty rows', () => {
const total = getTotal([], 'amount');
expect(total).toBe('0.00');
});
});

View File

@ -0,0 +1,9 @@
import { describe, expect, it } from 'vitest';
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
describe('useAccountShortToStandard()', () => {
it('should pad the decimal part with zeros for short numbers', () => {
expect(useAccountShortToStandard('123.45')).toBe('1230000045');
expect(useAccountShortToStandard('123.')).toBe('1230000000');
});
});

View File

@ -0,0 +1,16 @@
import axios from 'axios';
export async function getExchange(amount, currencyFk, dated, decimalPlaces = 2) {
try {
const { data } = await axios.get('ReferenceRates/findOne', {
params: {
filter: {
fields: ['value'],
where: { currencyFk, dated },
},
},
});
return (amount / data.value).toFixed(decimalPlaces);
} catch (e) {
return null;
}
}

View File

@ -1,10 +1,10 @@
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
export function getTotal(rows, key, opts = {}) { export function getTotal(rows, key, opts = {}) {
const { currency, cb } = opts; const { currency, cb, decimalPlaces } = opts;
const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0); const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
return currency return currency
? toCurrency(total, currency == 'default' ? undefined : currency) ? toCurrency(total, currency == 'default' ? undefined : currency)
: total; : parseFloat(total).toFixed(decimalPlaces ?? 2);
} }

View File

@ -0,0 +1,4 @@
export function useAccountShortToStandard(val) {
if (!val || !/^\d+(\.\d*)$/.test(val)) return;
return val?.replace('.', '0'.repeat(11 - val.length));
}

View File

@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
const arrayDataStore = useArrayDataStore(); const arrayDataStore = useArrayDataStore();
export function useArrayData(key = useRoute().meta.moduleName, userOptions) { export function useArrayData(key, userOptions) {
key ??= useRoute().meta.moduleName;
if (!key) throw new Error('ArrayData: A key is required to use this composable'); if (!key) throw new Error('ArrayData: A key is required to use this composable');
if (!arrayDataStore.get(key)) arrayDataStore.set(key); if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@ -25,13 +27,17 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
const searchUrl = store.searchUrl; const searchUrl = store.searchUrl;
if (query[searchUrl]) { if (query[searchUrl]) {
const params = JSON.parse(query[searchUrl]); const params = JSON.parse(query[searchUrl]);
const filter = params?.filter && JSON.parse(params?.filter ?? '{}'); const filter =
params?.filter && typeof params?.filter == 'object'
? params?.filter
: JSON.parse(params?.filter ?? '{}');
delete params.filter; delete params.filter;
store.userParams = { ...store.userParams, ...params }; store.userParams = params;
store.userFilter = { ...filter, ...store.userFilter }; store.filter = { ...filter, ...store.userFilter };
if (filter?.order) store.order = filter.order; if (filter?.order) store.order = filter.order;
} }
setCurrentFilter();
}); });
if (key && userOptions) setOptions(); if (key && userOptions) setOptions();
@ -49,6 +55,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
'exprBuilder', 'exprBuilder',
'searchUrl', 'searchUrl',
'navigate', 'navigate',
'mapKey',
'keepData',
]; ];
if (typeof userOptions === 'object') { if (typeof userOptions === 'object') {
for (const option in userOptions) { for (const option in userOptions) {
@ -60,6 +68,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
store[option] = userOptions.keepOpts?.includes(option) store[option] = userOptions.keepOpts?.includes(option)
? Object.assign(defaultOpts, store[option]) ? Object.assign(defaultOpts, store[option])
: defaultOpts; : defaultOpts;
if (option === 'userParams') store.defaultParams = store[option];
} }
} }
} }
@ -70,31 +79,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
cancelRequest(); cancelRequest();
canceller = new AbortController(); canceller = new AbortController();
const { params, limit } = setCurrentFilter();
const filter = {
limit: store.limit,
};
let userParams = { ...store.userParams };
Object.assign(filter, store.userFilter);
let where;
if (filter?.where || store.filter?.where)
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
Object.assign(filter, store.filter);
filter.where = where;
const params = { filter };
Object.assign(params, userParams);
if (params.filter) params.filter.skip = store.skip;
if (store?.order && typeof store?.order == 'string') store.order = [store.order];
if (store.order?.length) params.filter.order = [...store.order];
else delete params.filter.order;
store.currentFilter = JSON.parse(JSON.stringify(params));
delete store.currentFilter.filter.include;
store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
let exprFilter; let exprFilter;
if (store?.exprBuilder) { if (store?.exprBuilder) {
@ -116,20 +101,16 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
params, params,
}); });
const { limit } = filter;
store.hasMoreData = limit && response.data.length >= limit; store.hasMoreData = limit && response.data.length >= limit;
if (append) { if (!append && !isDialogOpened() && updateRouter) {
if (!store.data) store.data = []; if (updateStateParams(response.data)?.redirect && !store.keepData) return;
for (const row of response.data) store.data.push(row);
} else {
store.data = response.data;
if (!isDialogOpened()) updateRouter && updateStateParams();
} }
store.isLoading = false; store.isLoading = false;
canceller = null; canceller = null;
processData(response.data, { map: !!store.mapKey, append });
return response; return response;
} }
@ -147,6 +128,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts); if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
} }
function resetPagination() {
if (arrayDataStore.get(key)) arrayDataStore.resetPagination(key);
}
function cancelRequest() { function cancelRequest() {
if (canceller) { if (canceller) {
canceller.abort(); canceller.abort();
@ -154,12 +139,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
} }
async function applyFilter({ filter, params }) { async function applyFilter({ filter, params }, fetchOptions = {}) {
if (filter) store.userFilter = filter; if (filter) store.userFilter = filter;
store.filter = {}; store.filter = {};
if (params) store.userParams = { ...params }; if (params) store.userParams = { ...params };
const response = await fetch({}); const response = await fetch(fetchOptions);
return response; return response;
} }
@ -170,7 +155,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
userParams = sanitizerParams(userParams, store?.exprBuilder); userParams = sanitizerParams(userParams, store?.exprBuilder);
store.userParams = userParams; store.userParams = userParams;
reset(['skip', 'filter.skip', 'page']); resetPagination();
await fetch({}); await fetch({});
return { filter, params }; return { filter, params };
@ -197,7 +182,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
store.order = order; store.order = order;
reset(['skip', 'filter.skip', 'page']); resetPagination();
fetch({}); fetch({});
index++; index++;
@ -255,7 +240,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
if (Object.values(store.userParams).length) await fetch({}); if (Object.values(store.userParams).length) await fetch({});
} }
function updateStateParams() { function updateStateParams(data) {
if (!route?.path) return; if (!route?.path) return;
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } }; const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
if (store?.searchUrl) if (store?.searchUrl)
@ -272,22 +257,79 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
const { path } = matches.at(-1); const { path } = matches.at(-1);
const to = const to =
store?.data?.length === 1 data?.length === 1
? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`) ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
: path.replace(/:id.*/, ''); : path.replace(/:id.*/, '');
if (route.path != to) { if (route.path != to) {
const pushUrl = { path: to }; const pushUrl = { path: to };
if (to.endsWith('/list') || to.endsWith('/')) if (to.endsWith('/list') || to.endsWith('/'))
pushUrl.query = newUrl.query; pushUrl.query = newUrl.query;
else destroy(); return router.push(pushUrl) && { redirect: true };
return router.push(pushUrl);
} }
} }
router.replace(newUrl); router.replace(newUrl);
} }
function getCurrentFilter() {
if (!Object.keys(store.userParams).length)
store.userParams = store.defaultParams ?? {};
const filter = {
limit: store.limit,
...store.userFilter,
};
let where;
if (filter?.where || store.filter?.where)
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
Object.assign(filter, store.filter);
filter.where = where;
const params = { filter };
Object.assign(params, store.userParams);
if (params.filter) params.filter.skip = store.skip;
if (store?.order && typeof store?.order == 'string') store.order = [store.order];
if (store.order?.length) params.filter.order = [...store.order];
else delete params.filter.order;
return { filter, params, limit: filter.limit };
}
function setCurrentFilter() {
const { params, limit } = getCurrentFilter();
store.currentFilter = JSON.parse(JSON.stringify(params));
delete store.currentFilter.filter.include;
store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
return { params, limit };
}
function processData(data, { map = true, append = true }) {
if (!append) {
store.data = [];
store.map = new Map();
}
if (!Array.isArray(data)) store.data = data;
else if (!map && append) for (const row of data) store.data.push(row);
else
for (const row of data) {
const key = row[store.mapKey];
const val = { ...row, key };
if (key && store.map.has(key)) {
const { position } = store.map.get(key);
val.position = position;
store.map.set(key, val);
store.data[position] = val;
} else {
val.position = store.map.size;
store.map.set(key, val);
store.data.push(val);
}
}
}
const totalRows = computed(() => (store.data && store.data.length) || 0); const totalRows = computed(() => (store.data && store.data.length) || 0);
const isLoading = computed(() => store.isLoading || false); const isLoading = computed(() => store.isLoading || false);
@ -295,6 +337,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
fetch, fetch,
applyFilter, applyFilter,
addFilter, addFilter,
getCurrentFilter,
setCurrentFilter,
addFilterWhere, addFilterWhere,
addOrder, addOrder,
deleteOrder, deleteOrder,
@ -307,5 +351,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
isLoading, isLoading,
deleteOption, deleteOption,
reset, reset,
resetPagination,
}; };
} }

View File

@ -0,0 +1,69 @@
import { useArrayData } from 'src/composables/useArrayData';
import { onBeforeMount, ref, watch } from 'vue';
export function useFilterParams(key) {
if (!key) throw new Error('ArrayData: A key is required to use this composable');
const params = ref({});
const orders = ref({});
const arrayData = ref({});
onBeforeMount(() => {
arrayData.value = useArrayData(key);
});
watch(
() => arrayData.value.store?.currentFilter,
(val, oldValue) => (val || oldValue) && setUserParams(val),
{ immediate: true, deep: true }
);
function parseOrder(urlOrders) {
const orderObject = {};
if (urlOrders) {
if (typeof urlOrders == 'string') urlOrders = [urlOrders];
for (const [index, orders] of urlOrders.entries()) {
const [name, direction] = orders.split(' ');
orderObject[name] = { direction, index: index + 1 };
}
}
orders.value = orderObject;
}
function setUserParams(watchedParams = {}) {
if (Object.keys(watchedParams).length == 0) {
params.value = {};
orders.value = {};
return;
}
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
if (typeof watchedParams?.filter == 'string')
watchedParams.filter = JSON.parse(watchedParams.filter);
watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
parseOrder(watchedParams.filter?.order);
delete watchedParams.filter;
params.value = sanitizer(watchedParams);
}
function sanitizer(params) {
for (const [key, value] of Object.entries(params)) {
if (key === 'and' && Array.isArray(value)) {
value.forEach((item) => {
Object.assign(params, item);
});
delete params[key];
} else if (value && typeof value === 'object') {
const param = Object.values(value)[0];
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
}
}
return params;
}
return {
params,
orders,
};
}

View File

@ -0,0 +1,6 @@
import axios from 'axios';
export default async (id) => {
const { data } = await axios.get(`Accounts/${id}/exists`);
return data.exists;
};

View File

@ -0,0 +1,24 @@
import { onMounted, ref } from 'vue';
export function useHasContent(selector) {
const container = ref({});
const hasContent = ref();
onMounted(() => {
container.value = document.querySelector(selector);
if (!container.value) return;
const observer = new MutationObserver(() => {
if (document.querySelector(selector))
hasContent.value = !!container.value.childNodes.length;
});
observer.observe(container.value, {
subtree: true,
childList: true,
attributes: true,
});
});
return hasContent;
}

View File

@ -3,19 +3,23 @@
@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass'; @import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
body.body--light { body.body--light {
--font-color: black;
--vn-header-color: #cecece; --vn-header-color: #cecece;
--vn-page-color: #ffffff; --vn-page-color: #ffffff;
--vn-section-color: #e0e0e0; --vn-section-color: #e0e0e0;
--vn-section-hover-color: #b9b9b9; --vn-section-hover-color: #b9b9b9;
--vn-text-color: var(--font-color); --vn-text-color: black;
--vn-label-color: #5f5f5f; --vn-label-color: #5f5f5f;
--vn-accent-color: #e7e3e3; --vn-accent-color: #e7e3e3;
--vn-search-color: #d4d4d4;
--vn-search-color-hover: #cfcfcf;
--vn-empty-tag: #acacac;
--vn-black-text-color: black;
--vn-text-color-contrast: white;
background-color: var(--vn-page-color); background-color: var(--vn-page-color);
.q-header .q-toolbar { .q-header .q-toolbar {
color: var(--font-color); color: var(--vn-text-color);
} }
} }
body.body--dark { body.body--dark {
@ -26,6 +30,11 @@ body.body--dark {
--vn-text-color: white; --vn-text-color: white;
--vn-label-color: #a8a8a8; --vn-label-color: #a8a8a8;
--vn-accent-color: #424242; --vn-accent-color: #424242;
--vn-search-color: #4b4b4b;
--vn-search-color-hover: #5b5b5b;
--vn-empty-tag: #2d2d2d;
--vn-black-text-color: black;
--vn-text-color-contrast: black;
background-color: var(--vn-page-color); background-color: var(--vn-page-color);
} }
@ -84,6 +93,10 @@ select:-webkit-autofill {
background-color: var(--vn-section-hover-color); background-color: var(--vn-section-hover-color);
} }
.bg-vn-page {
background-color: var(--vn-page-color);
}
.color-vn-label { .color-vn-label {
color: var(--vn-label-color); color: var(--vn-label-color);
} }
@ -149,7 +162,8 @@ select:-webkit-autofill {
.q-card, .q-card,
.q-table, .q-table,
.q-table__bottom, .q-table__bottom,
.q-drawer { .q-drawer,
.bottomButton {
background-color: var(--vn-section-color); background-color: var(--vn-section-color);
} }
@ -186,7 +200,7 @@ select:-webkit-autofill {
.q-tooltip { .q-tooltip {
background-color: var(--vn-page-color); background-color: var(--vn-page-color);
color: var(--font-color); color: var(--vn-text-color);
font-size: medium; font-size: medium;
} }
@ -240,7 +254,7 @@ input::-webkit-inner-spin-button {
.q-table { .q-table {
th, th,
td { td {
padding: 1px 10px 1px 10px; padding: 1px 3px 1px 3px;
max-width: 130px; max-width: 130px;
div span { div span {
overflow: hidden; overflow: hidden;
@ -264,6 +278,10 @@ input::-webkit-inner-spin-button {
.shrink { .shrink {
max-width: 75px; max-width: 75px;
} }
.number {
text-align: right;
width: 96px;
}
.expand { .expand {
max-width: 400px; max-width: 400px;
} }
@ -292,3 +310,28 @@ input::-webkit-inner-spin-button {
.no-visible { .no-visible {
visibility: hidden; visibility: hidden;
} }
.q-item > .q-item__section:has(.q-checkbox) {
max-width: min-content;
}
.row > .column:has(.q-checkbox) {
max-width: min-content;
}
.q-field__inner {
.q-field__control {
min-height: auto !important;
display: flex;
align-items: flex-end;
padding-bottom: 2px;
.q-field__native.row {
min-height: auto !important;
}
}
}
.q-date__header-today {
border-radius: 12px;
border: 1px solid;
box-shadow: 0 4px 6px #00000000;
}

View File

@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
import getParamWhere from './getParamWhere'; import getParamWhere from './getParamWhere';
import parsePhone from './parsePhone'; import parsePhone from './parsePhone';
import isDialogOpened from './isDialogOpened'; import isDialogOpened from './isDialogOpened';
import toCelsius from './toCelsius';
export { export {
getUpdatedValues, getUpdatedValues,
@ -36,4 +37,5 @@ export {
dashIfEmpty, dashIfEmpty,
dateRange, dateRange,
getParamWhere, getParamWhere,
toCelsius,
}; };

3
src/filters/toCelsius.js Normal file
View File

@ -0,0 +1,3 @@
export default function toCelsius(value) {
return value ? `${value}°C` : '';
}

View File

@ -1,5 +1,6 @@
export default function toDateHourMin(date) { export default function toDateHourMin(date) {
const dateHour = new Date(date).toLocaleDateString('es-ES', { if (!date) return date;
return new Date(date).toLocaleDateString('es-ES', {
timeZone: 'Europe/Madrid', timeZone: 'Europe/Madrid',
year: 'numeric', year: 'numeric',
month: '2-digit', month: '2-digit',
@ -7,5 +8,4 @@ export default function toDateHourMin(date) {
hour: '2-digit', hour: '2-digit',
minute: '2-digit', minute: '2-digit',
}); });
return dateHour;
} }

View File

@ -1,5 +1,6 @@
export default function toDateHourMinSec(date) { export default function toDateHourMinSec(date) {
const dateHour = new Date(date).toLocaleDateString('es-ES', { if (!date) return date;
return new Date(date).toLocaleDateString('es-ES', {
timeZone: 'Europe/Madrid', timeZone: 'Europe/Madrid',
year: 'numeric', year: 'numeric',
month: '2-digit', month: '2-digit',
@ -8,5 +9,4 @@ export default function toDateHourMinSec(date) {
minute: '2-digit', minute: '2-digit',
second: '2-digit', second: '2-digit',
}); });
return dateHour;
} }

View File

@ -142,7 +142,7 @@ globals:
workCenters: Work centers workCenters: Work centers
modes: Modes modes: Modes
zones: Zones zones: Zones
zonesList: Zones zonesList: List
deliveryDays: Delivery days deliveryDays: Delivery days
upcomingDeliveries: Upcoming deliveries upcomingDeliveries: Upcoming deliveries
role: Role role: Role
@ -333,11 +333,24 @@ globals:
packing: ITP packing: ITP
myTeam: My team myTeam: My team
departmentFk: Department departmentFk: Department
from: From
to: To
supplierFk: Supplier
supplierRef: Supplier ref
serial: Serial
amount: Importe
awbCode: AWB
correctedFk: Rectified
correctingFk: Rectificative
daysOnward: Days onward
countryFk: Country countryFk: Country
companyFk: Company
changePass: Change password changePass: Change password
setPass: Set password
deleteConfirmTitle: Delete selected elements deleteConfirmTitle: Delete selected elements
changeState: Change state changeState: Change state
raid: 'Raid {daysInForward} days' raid: 'Raid {daysInForward} days'
isVies: Vies
errors: errors:
statusUnauthorized: Access denied statusUnauthorized: Access denied
statusInternalServerError: An internal server error has ocurred statusInternalServerError: An internal server error has ocurred
@ -376,74 +389,19 @@ cau:
subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent. subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
inputLabel: Explain why this error should not appear inputLabel: Explain why this error should not appear
askPrivileges: Ask for privileges askPrivileges: Ask for privileges
entry:
list:
newEntry: New entry
tableVisibleColumns:
created: Creation
supplierFk: Supplier
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
companyFk: Company
travelFk: Travel
isExcludedFromAvailable: Inventory
invoiceAmount: Import
summary:
commission: Commission
currency: Currency
invoiceNumber: Invoice number
ordered: Ordered
booked: Booked
excludedFromAvailable: Inventory
travelReference: Reference
travelAgency: Agency
travelShipped: Shipped
travelDelivered: Delivered
travelLanded: Landed
travelReceived: Received
buys: Buys
stickers: Stickers
package: Package
packing: Pack.
grouping: Group.
buyingValue: Buying value
import: Import
pvp: PVP
basicData:
travel: Travel
currency: Currency
commission: Commission
observation: Observation
booked: Booked
excludedFromAvailable: Inventory
buys:
observations: Observations
packagingFk: Box
color: Color
printedStickers: Printed stickers
notes:
observationType: Observation type
latestBuys:
tableVisibleColumns:
image: Picture
itemFk: Item ID
weightByPiece: Weight/Piece
isActive: Active
family: Family
entryFk: Entry
freightValue: Freight value
comissionValue: Commission value
packageValue: Package value
isIgnored: Is ignored
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Package out
landing: Landing
isExcludedFromAvailable: Es inventory
ticket: ticket:
params:
ticketFk: Ticket ID
weekDay: Weekday
agencyModeFk: Agency
id: Worker
state: State
created: Created
externalId: External ID
counter: Counter
freightItemName: Freight item name
packageItemName: Package item name
longName: Long name
card: card:
customerId: Customer ID customerId: Customer ID
customerCard: Customer card customerCard: Customer card
@ -494,6 +452,7 @@ invoiceOut:
card: card:
issued: Issued issued: Issued
customerCard: Customer card customerCard: Customer card
ticketList: Ticket List
summary: summary:
issued: Issued issued: Issued
dued: Due dued: Due
@ -546,27 +505,6 @@ parking:
searchBar: searchBar:
info: You can search by parking code info: You can search by parking code
label: Search parking... label: Search parking...
order:
field:
salesPersonFk: Sales Person
form:
clientFk: Client
addressFk: Address
agencyModeFk: Agency
list:
newOrder: New Order
summary:
basket: Basket
notConfirmed: Not confirmed
created: Created
createdFrom: Created From
address: Address
total: Total
items: Items
orderTicketList: Order Ticket List
amount: Amount
confirm: Confirm
confirmLines: Confirm lines
department: department:
chat: Chat chat: Chat
bossDepartment: Boss Department bossDepartment: Boss Department
@ -599,7 +537,7 @@ worker:
fi: DNI/NIE/NIF fi: DNI/NIE/NIF
birth: Birth birth: Birth
isFreelance: Freelance isFreelance: Freelance
isSsDiscounted: Bonificación SS isSsDiscounted: SS Bonification
hasMachineryAuthorized: Machinery authorized hasMachineryAuthorized: Machinery authorized
isDisable: Disable isDisable: Disable
notificationsManager: notificationsManager:
@ -685,6 +623,11 @@ wagon:
minHeightBetweenTrays: 'The minimum height between trays is ' minHeightBetweenTrays: 'The minimum height between trays is '
maxWagonHeight: 'The maximum height of the wagon is ' maxWagonHeight: 'The maximum height of the wagon is '
uncompleteTrays: There are incomplete trays uncompleteTrays: There are incomplete trays
params:
label: Label
plate: Plate
volume: Volume
name: Name
supplier: supplier:
list: list:
@ -731,7 +674,6 @@ supplier:
sageTransactionTypeFk: Sage transaction type sageTransactionTypeFk: Sage transaction type
supplierActivityFk: Supplier activity supplierActivityFk: Supplier activity
isTrucker: Trucker isTrucker: Trucker
isVies: Vies
billingData: billingData:
payMethodFk: Billing data payMethodFk: Billing data
payDemFk: Payment deadline payDemFk: Payment deadline
@ -762,6 +704,7 @@ travel:
totalEntries: Total entries totalEntries: Total entries
totalEntriesTooltip: Total entries totalEntriesTooltip: Total entries
daysOnward: Landed days onwards daysOnward: Landed days onwards
awb: AWB
summary: summary:
entryId: Entry Id entryId: Entry Id
freight: Freight freight: Freight
@ -846,13 +789,17 @@ components:
value: Value value: Value
# ItemFixedPriceFilter # ItemFixedPriceFilter
buyerFk: Buyer buyerFk: Buyer
warehouseFk: Warehouse
started: From started: From
ended: To ended: To
mine: For me mine: For me
hasMinPrice: Minimum price hasMinPrice: Minimum price
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Buyer salesPersonFk: Buyer
supplierFk: Supplier
from: From from: From
to: To
visible: Is visible
active: Is active active: Is active
floramondo: Is floramondo floramondo: Is floramondo
showBadDates: Show future items showBadDates: Show future items

View File

@ -144,7 +144,7 @@ globals:
workCenters: Centros de trabajo workCenters: Centros de trabajo
modes: Modos modes: Modos
zones: Zonas zones: Zonas
zonesList: Zonas zonesList: Listado
deliveryDays: Días de entrega deliveryDays: Días de entrega
upcomingDeliveries: Próximos repartos upcomingDeliveries: Próximos repartos
role: Role role: Role
@ -336,12 +336,23 @@ globals:
SSN: NSS SSN: NSS
fi: NIF fi: NIF
myTeam: Mi equipo myTeam: Mi equipo
from: Desde
to: Hasta
supplierFk: Proveedor
supplierRef: Ref. proveedor
serial: Serie
amount: Importe
awbCode: AWB
daysOnward: Días adelante
packing: ITP packing: ITP
countryFk: País countryFk: País
companyFk: Empresa
changePass: Cambiar contraseña changePass: Cambiar contraseña
setPass: Establecer contraseña
deleteConfirmTitle: Eliminar los elementos seleccionados deleteConfirmTitle: Eliminar los elementos seleccionados
changeState: Cambiar estado changeState: Cambiar estado
raid: 'Redada {daysInForward} días' raid: 'Redada {daysInForward} días'
isVies: Vies
errors: errors:
statusUnauthorized: Acceso denegado statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor statusInternalServerError: Ha ocurrido un error interno del servidor
@ -378,75 +389,19 @@ cau:
subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
inputLabel: Explique el motivo por el que no deberia aparecer este fallo inputLabel: Explique el motivo por el que no deberia aparecer este fallo
askPrivileges: Solicitar permisos askPrivileges: Solicitar permisos
entry:
list:
newEntry: Nueva entrada
tableVisibleColumns:
created: Creación
supplierFk: Proveedor
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
companyFk: Empresa
travelFk: Envio
isExcludedFromAvailable: Inventario
invoiceAmount: Importe
summary:
commission: Comisión
currency: Moneda
invoiceNumber: Núm. factura
ordered: Pedida
booked: Contabilizada
excludedFromAvailable: Inventario
travelReference: Referencia
travelAgency: Agencia
travelShipped: F. envio
travelWarehouseOut: Alm. salida
travelDelivered: Enviada
travelLanded: F. entrega
travelReceived: Recibida
buys: Compras
stickers: Etiquetas
package: Embalaje
packing: Pack.
grouping: Group.
buyingValue: Coste
import: Importe
pvp: PVP
basicData:
travel: Envío
currency: Moneda
observation: Observación
commission: Comisión
booked: Asentado
excludedFromAvailable: Inventario
buys:
observations: Observaciónes
packagingFk: Embalaje
color: Color
printedStickers: Etiquetas impresas
notes:
observationType: Tipo de observación
latestBuys:
tableVisibleColumns:
image: Foto
itemFk: Id Artículo
weightByPiece: Peso (gramos)/tallo
isActive: Activo
family: Familia
entryFk: Entrada
freightValue: Porte
comissionValue: Comisión
packageValue: Embalaje
isIgnored: Ignorado
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Embalaje envíos
landing: Llegada
isExcludedFromAvailable: Es inventario
ticket: ticket:
params:
ticketFk: ID de ticket
weekDay: Salida
agencyModeFk: Agencia
id: Comercial
created: Creado
state: Estado
externalId: ID externo
counter: Contador
freightItemName: Nombre
packageItemName: Embalaje
longName: Descripción
card: card:
customerId: ID cliente customerId: ID cliente
customerCard: Ficha del cliente customerCard: Ficha del cliente
@ -534,30 +489,6 @@ invoiceOut:
comercial: Comercial comercial: Comercial
errors: errors:
downloadCsvFailed: Error al descargar CSV downloadCsvFailed: Error al descargar CSV
order:
field:
salesPersonFk: Comercial
form:
clientFk: Cliente
addressFk: Dirección
agencyModeFk: Agencia
list:
newOrder: Nuevo Pedido
summary:
basket: Cesta
notConfirmed: No confirmada
created: Creado
createdFrom: Creado desde
address: Dirección
total: Total
vat: IVA
state: Estado
alias: Alias
items: Artículos
orderTicketList: Tickets del pedido
amount: Monto
confirm: Confirmar
confirmLines: Confirmar lineas
shelving: shelving:
list: list:
parking: Parking parking: Parking
@ -598,6 +529,15 @@ worker:
role: Rol role: Rol
sipExtension: Extensión sipExtension: Extensión
locker: Taquilla locker: Taquilla
fiDueDate: F. caducidad DNI
sex: Sexo
seniority: Antigüedad
fi: DNI/NIE/NIF
birth: F. nacimiento
isFreelance: Autónomo
isSsDiscounted: Bonificación SS
hasMachineryAuthorized: Autorizado para maquinaria
isDisable: Deshabilitado
notificationsManager: notificationsManager:
activeNotifications: Notificaciones activas activeNotifications: Notificaciones activas
availableNotifications: Notificaciones disponibles availableNotifications: Notificaciones disponibles
@ -681,6 +621,11 @@ wagon:
minHeightBetweenTrays: 'La distancia mínima entre bandejas es ' minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
maxWagonHeight: 'La altura máxima del vagón es ' maxWagonHeight: 'La altura máxima del vagón es '
uncompleteTrays: Hay bandejas sin completar uncompleteTrays: Hay bandejas sin completar
params:
label: Etiqueta
plate: Matrícula
volume: Volumen
name: Nombre
supplier: supplier:
list: list:
payMethod: Método de pago payMethod: Método de pago
@ -726,7 +671,6 @@ supplier:
sageTransactionTypeFk: Tipo de transacción sage sageTransactionTypeFk: Tipo de transacción sage
supplierActivityFk: Actividad proveedor supplierActivityFk: Actividad proveedor
isTrucker: Transportista isTrucker: Transportista
isVies: Vies
billingData: billingData:
payMethodFk: Forma de pago payMethodFk: Forma de pago
payDemFk: Plazo de pago payDemFk: Plazo de pago
@ -756,6 +700,7 @@ travel:
totalEntries: totalEntries:
totalEntriesTooltip: Entradas totales totalEntriesTooltip: Entradas totales
daysOnward: Días de llegada en adelante daysOnward: Días de llegada en adelante
awb: AWB
summary: summary:
entryId: Id entrada entryId: Id entrada
freight: Porte freight: Porte
@ -840,13 +785,19 @@ components:
value: Valor value: Valor
# ItemFixedPriceFilter # ItemFixedPriceFilter
buyerFk: Comprador buyerFk: Comprador
warehouseFk: Almacen
started: Desde started: Desde
ended: Hasta ended: Hasta
mine: Para mi mine: Para mi
hasMinPrice: Precio mínimo hasMinPrice: Precio mínimo
wareHouseFk: Almacén
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Comprador salesPersonFk: Comprador
supplierFk: Proveedor
visible: Visible
active: Activo active: Activo
from: Desde
to: Hasta
floramondo: Floramondo floramondo: Floramondo
showBadDates: Ver items a futuro showBadDates: Ver items a futuro
userPanel: userPanel:

View File

@ -2,6 +2,8 @@
import { Dark, Quasar } from 'quasar'; import { Dark, Quasar } from 'quasar';
import { computed } from 'vue'; import { computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { localeEquivalence } from 'src/i18n/index';
import quasarLang from 'src/utils/quasarLang';
const { t, locale } = useI18n(); const { t, locale } = useI18n();
@ -12,18 +14,9 @@ const userLocale = computed({
set(value) { set(value) {
locale.value = value; locale.value = value;
if (value === 'en') value = 'en-GB'; value = localeEquivalence[value] ?? value;
// FIXME: Dynamic imports from absolute paths are not compatible with vite: quasarLang(value);
// https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
try {
const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
Quasar.lang.set(lang.default);
});
} catch (error) {
//
}
}, },
}); });

View File

@ -1,16 +1,15 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { ref, computed } from 'vue'; import { ref, computed } from 'vue';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios'; import axios from 'axios';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnConfirm from 'components/ui/VnConfirm.vue'; import VnConfirm from 'components/ui/VnConfirm.vue';
import FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import { useValidator } from 'src/composables/useValidator'; import { useValidator } from 'src/composables/useValidator';
import VnSection from 'src/components/common/VnSection.vue';
defineProps({ defineProps({
id: { id: {
@ -21,13 +20,13 @@ defineProps({
const { notify } = useNotify(); const { notify } = useNotify();
const { t } = useI18n(); const { t } = useI18n();
const stateStore = useStateStore();
const quasar = useQuasar(); const quasar = useQuasar();
const tableRef = ref(); const tableRef = ref();
const roles = ref(); const roles = ref();
const validationsStore = useValidator(); const validationsStore = useValidator();
const { models } = validationsStore; const { models } = validationsStore;
const dataKey = 'AccountAcls';
const exprBuilder = (param, value) => { const exprBuilder = (param, value) => {
switch (param) { switch (param) {
case 'search': case 'search':
@ -134,38 +133,40 @@ const deleteAcl = async ({ id }) => {
</script> </script>
<template> <template>
<VnSearchbar
data-key="AccountAcls"
url="ACLs"
:expr-builder="exprBuilder"
:label="t('acls.search')"
:info="t('acls.searchInfo')"
/>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
</QDrawer>
<FetchData <FetchData
url="VnRoles?fields=['name']" url="VnRoles?fields=['name']"
auto-load auto-load
@on-fetch="(data) => (roles = data)" @on-fetch="(data) => (roles = data)"
/> />
<VnTable <VnSection
ref="tableRef" :data-key="dataKey"
data-key="AccountAcls"
:url="`ACLs`"
:create="{
urlCreate: 'ACLs',
title: 'Create ACL',
onDataSaved: () => tableRef.reload(),
formInitialData: {},
}"
order="id DESC"
:disable-option="{ card: true }"
:columns="columns" :columns="columns"
default-mode="table" prefix="acls"
:right-search="true" :array-data-props="{
:is-editable="true" url: 'ACLs',
:use-model="true" order: 'id DESC',
/> exprBuilder,
}"
>
<template #body>
<VnTable
ref="tableRef"
:data-key="dataKey"
:create="{
urlCreate: 'ACLs',
title: 'Create ACL',
onDataSaved: () => tableRef.reload(),
formInitialData: {},
}"
:disable-option="{ card: true }"
:columns="columns"
default-mode="table"
:right-search="false"
:is-editable="true"
:use-model="true"
/>
</template>
</VnSection>
</template> </template>
<i18n> <i18n>

View File

@ -2,21 +2,12 @@
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { ref, computed } from 'vue'; import { ref, computed } from 'vue';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue'; import VnSection from 'src/components/common/VnSection.vue';
import { useStateStore } from 'stores/useStateStore';
const tableRef = ref(); const tableRef = ref();
const { t } = useI18n(); const { t } = useI18n();
const stateStore = useStateStore(); const dataKey = 'AccountAliasList';
const exprBuilder = (param, value) => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: { alias: { like: `%${value}%` } };
}
};
const columns = computed(() => [ const columns = computed(() => [
{ {
align: 'left', align: 'left',
@ -40,40 +31,45 @@ const columns = computed(() => [
create: true, create: true,
}, },
]); ]);
const exprBuilder = (param, value) => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: { alias: { like: `%${value}%` } };
}
};
</script> </script>
<template> <template>
<template v-if="stateStore.isHeaderMounted()"> <VnSection
<Teleport to="#searchbar"> :data-key="dataKey"
<VnSearchbar
data-key="AccountAliasList"
url="MailAliases"
:expr-builder="exprBuilder"
:label="t('mailAlias.search')"
:info="t('mailAlias.searchInfo')"
/>
</Teleport>
</template>
<VnTable
ref="tableRef"
data-key="AccountAliasList"
url="MailAliases"
:create="{
urlCreate: 'MailAliases',
title: 'Create MailAlias',
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
order="id DESC"
:columns="columns" :columns="columns"
:disable-option="{ card: true }" prefix="mailAlias"
default-mode="table" :array-data-props="{ url: 'MailAliases', order: 'id DESC', exprBuilder }"
redirect="account/alias" >
:is-editable="true" <template #body>
:use-model="true" <VnTable
/> :data-key="dataKey"
ref="tableRef"
:create="{
urlCreate: 'MailAliases',
title: 'Create MailAlias',
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
:columns="columns"
:disable-option="{ card: true }"
default-mode="table"
redirect="account/alias"
:is-editable="true"
:use-model="true"
:right-search="false"
/>
</template>
</VnSection>
</template> </template>
<i18n> <i18n>
es: es:
Id: Id Id: Id

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