0
0
Fork 0
Commit Graph

10376 Commits

Author SHA1 Message Date
Alex Moreno 7633207bf3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-20 08:51:31 +01:00
Alex Moreno ae0158d529 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-20 08:51:22 +01:00
Pablo Natek bdd5843d14 Merge pull request 'feat: refs #6897 add time formatting and improve column alignment handling in VnTable' (!1435) from 6897-fixMinorIssueWithSelectAndStyle into test
Reviewed-on: verdnatura/salix-front#1435
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-20 07:44:18 +00:00
Javier Segarra f9c2d9e641 Merge pull request 'HOTFIX: refactor canProceed' (!1449) from hotfix_ticketSale_other into master
Reviewed-on: verdnatura/salix-front#1449
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-20 07:27:26 +00:00
Javier Segarra b8e6b27303 test: improve test 2025-02-19 23:54:31 +01:00
Javier Segarra b2184635d3 test: improve test 2025-02-19 23:42:10 +01:00
Javier Segarra 874fbb48f5 feat: refactor canProceed 2025-02-19 22:16:02 +01:00
Pablo Natek 09d48acfb2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-fixMinorIssueWithSelectAndStyle 2025-02-19 22:05:03 +01:00
Pablo Natek 380965fbea feat: refs #6897 enhance VnTable input handling and improve WorkerMedical component filters 2025-02-19 22:03:48 +01:00
Javier Segarra ab5b36a895 Merge pull request 'fix: refs #6943 reset formData to originalData on reset function' (!1448) from 6943-warmfix-resetFormData into test
Reviewed-on: verdnatura/salix-front#1448
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-19 17:39:07 +00:00
Jorge Penadés 7ade3f4f84 fix: refs #6943 reset formData to originalData on reset function 2025-02-19 18:36:54 +01:00
Javier Segarra eab18e4d14 Merge pull request 'fix: elements position' (!1441) from fix_content_copy_icon into dev
Reviewed-on: verdnatura/salix-front#1441
Reviewed-by: PAU ROVIRA ROSALENY <provira@verdnatura.es>
2025-02-19 11:21:53 +00:00
Javier Segarra 4bdc6a5361 fix: elements position 2025-02-19 12:01:25 +01:00
Javier Segarra b2dab7ba59 Merge pull request 'HOTFix: bug and simplify' (!1440) from hotfix_double_ticketSale into master
Reviewed-on: verdnatura/salix-front#1440
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-19 10:49:48 +00:00
Javier Segarra cfc377847f Merge branch 'master' into hotfix_double_ticketSale 2025-02-19 09:25:12 +00:00
Javier Segarra ee23bf60dc fix: bug and simplify 2025-02-19 10:22:27 +01:00
Jon Elias 058a2e65e4 Merge pull request '#8623: Fixed module errors' (!1426) from 8623-FixInvoiceOutModule into dev
Reviewed-on: verdnatura/salix-front#1426
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-19 08:13:23 +00:00
Jon Elias 807ee381fc Merge branch 'dev' into 8623-FixInvoiceOutModule 2025-02-19 08:07:50 +00:00
Javi Gallego 8b238d0098 Merge pull request 'test' (!1439) from test into dev
Reviewed-on: verdnatura/salix-front#1439
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-19 07:56:43 +00:00
Jon Elias 2c3d1a8c03 Merge pull request 'Warmfix[ZoneBasicData]: fixed basic data and address column in list' (!1437) from Warmfix-ZoneBasicDataForm into test
Reviewed-on: verdnatura/salix-front#1437
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-19 07:35:58 +00:00
Jon Elias c52f13e35a Warmfix[ZoneBasicData]: fixed basic data and address column in list 2025-02-19 07:33:52 +00:00
Jon Elias da9f94c76b Merge pull request '#8606: Fix Zone module' (!1402) from 8606-FixZoneModule into dev
Reviewed-on: verdnatura/salix-front#1402
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-19 06:53:39 +00:00
Jon Elias 5e7989aa0a Merge branch 'dev' into 8606-FixZoneModule 2025-02-19 06:51:28 +00:00
Javier Segarra 74c40c7808 fix: refs #6897 cards width 2025-02-18 23:24:04 +01:00
Javier Segarra 1771846b43 Merge branch 'dev' into 8623-FixInvoiceOutModule 2025-02-18 21:19:41 +00:00
Javier Segarra a4dc3ae8c8 Merge pull request 'fix: refs #6897 update onClick logic to correctly handle save and continue functionality in FormModelPopup' (!1434) from 6897-warmfix-fixOnDataSaved into test
Reviewed-on: verdnatura/salix-front#1434
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-18 21:18:42 +00:00
Pablo Natek 98239e0105 feat: refs #6897 add time formatting and improve column alignment handling in VnTable 2025-02-18 22:04:47 +01:00
Jorge Penadés 0188bc7bc3 fix: refs #6897 update onClick logic to correctly handle save and continue functionality in FormModelPopup 2025-02-18 18:26:01 +01:00
Javier Segarra e0c7e0519d Merge pull request 'Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style' (!1428) from down_warmfix_style_vntable_card into dev
Reviewed-on: verdnatura/salix-front#1428
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-02-18 17:14:52 +00:00
Javier Segarra e85acaac66 Merge pull request '#8372 warmfix-notifyErr' (!1433) from 8372-warmfix-notifyErr into test
Reviewed-on: verdnatura/salix-front#1433
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-18 17:14:31 +00:00
Jorge Penadés 52edf79716 refactor: refs #8372 streamline form submission handling and improve keyup event logic in FormModel 2025-02-18 17:55:44 +01:00
Jorge Penadés a289c548f8 fix: refs #8372 ensure save operation completes before proceeding in FormModelPopup 2025-02-18 16:25:30 +01:00
Jorge Penadés e758df4a4c fix: refs #8372 correct isSaveAndContinue reference and streamline save logic in FormModelPopup 2025-02-18 16:23:30 +01:00
Javier Segarra b8b195b570 fix: style w-80 2025-02-18 13:57:44 +00:00
Javier Segarra bb2ba2b599 Merge branch 'dev' into down_warmfix_style_vntable_card 2025-02-18 13:46:33 +00:00
Javier Segarra 289d9b211e Merge pull request 'fix: update option-filter-value to use thermographFk in TravelThermographsForm' (!1430) from hotFixThermographsSelect into master
Reviewed-on: verdnatura/salix-front#1430
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-18 13:33:23 +00:00
Pablo Natek a1db140d67 fix: update option-filter-value to use thermographFk in TravelThermographsForm 2025-02-18 14:30:12 +01:00
Alex Moreno 630a578522 build: init version 2025-02-18 13:39:05 +01:00
Alex Moreno 52503c221d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-18 13:38:23 +01:00
Alex Moreno 4ccae7981c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-18 13:38:14 +01:00
Alex Moreno 11277795d8 Merge pull request '8627-devToTest' (!1421) from 8627-devToTest into test
Reviewed-on: verdnatura/salix-front#1421
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-18 12:37:36 +00:00
Alex Moreno 53fc5c4c80 Merge branch 'test' into 8627-devToTest 2025-02-18 12:35:52 +00:00
Alex Moreno 7b41728958 test: refs #8627 fix formModel 2025-02-18 13:25:39 +01:00
Javier Segarra d3104939ae Merge branch 'dev' into down_warmfix_style_vntable_card 2025-02-18 12:17:27 +00:00
Jorge Penadés 6bef98bd10 Merge pull request 'fix: refs #8571 safely delete Authorization header from config in useCau' (!1429) from 8571-hotfix-preventNull into master
Reviewed-on: verdnatura/salix-front#1429
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-18 12:01:25 +00:00
Jon Elias 91e06d5ef9 Merge pull request '#8555: Added new filter' (!1372) from 8555-AddNewFilterField into dev
Reviewed-on: verdnatura/salix-front#1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 11:46:15 +00:00
Jorge Penadés c3f786214f fix: refs #8571 safely delete Authorization header from config in useCau 2025-02-18 12:45:11 +01:00
Alex Moreno cdccabcb32 fix: refs #8627 formModel default null 2025-02-18 12:44:56 +01:00
Jon Elias b386041f8e Merge branch 'dev' into 8555-AddNewFilterField 2025-02-18 11:43:18 +00:00
Javier Segarra e03a18a62a Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test
Reviewed-on: verdnatura/salix-front#1425
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-02-18 11:37:29 +00:00