7167-testToMaster_2414 #266

Merged

alexm merged 230 commits from 7167-testToMaster_2414 into master 2024-04-04 05:35:08 +00:00

Conversation 0 Commits 230 Files Changed 174 +5506 -1113

alexm commented 2024-04-03 14:51:24 +00:00

Member

Copy Link

No description provided.

alexm added 230 commits 2024-04-03 14:51:24 +00:00

248e02f530 WIP

df620566ef Invoice out globals corrections

8adee21f2b WIP

2f08b64215 merge with dev

ac555a0146 Transfer invoice form

af12512de9 WIP

41e5110a8a Invoice out list and summary changes

ba9839bc4e Implement routes report

c013c9054f Implement routes tickets dialog

103e2f65dc Center ticket field

6629a2d59a Fix route summary dialog

67f862ebe3 Create route tickets

b3f8d369ee Create route tickets actions

76dd84fd87 Create route logs

97f373626c Fix route list last index

988362ab69 Fix route ticket sms event

e846582606 Create route autonomous

046ac0406b Create invoice in autonomous page

6ace34cbb1 descriptor menu show invoice actions

8ffa3b7626 Create roadmap list page

45d7b021a6 Create roadmap create page

343269fc02 Create roadmap summary page

0a03ef69ea Create roadmap basic data page

616d8519fa Fix translations

587baa645e generic FormPopup creation and SendInvoiceForm creation

75733fd530 Fix autonomous route

1af5b270a0 fear: refs #5186 WIP parking section

ddb6bdeb47 fix: refs #5186 parking routes

c407566d67 descriptor menu actions

e0337340e7 Fix route create page

aa535fb6c7 Fix route list actions

963c4ade83 Fix route tickets

b76a021059 Fix route autonomous

4da74f8710 Fix route roadmaps

53f69738a5 Fix routes form update

d816a57272 Fix buscaman implementation

819e25de38 Add eye icon summary

185de3c931 Add roadmap stops

6ad2e9aafe Update roadmap summary dialog implementation

929a094132 Fix route table navigation

4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia

d866754468 refs #6930: handle tokenMultimedia

022ef24289 Refactor roadmaps stops with crud model

698a88e6f0 Fix infinite scroll in VnPaginate

0cfdd78328 Fix route autonomous table links

c766c14a2c Fix route roadmap table links

50d3bac20c Add roadmap add stop dialog

3c68f4779f Fix roadmap add stop dialog label

4be9c02711 Fix routes add ticket dialog

bddfe8f9d7 refs #6930 feat: call shareToken endpoint

0d80fd37a4 refs #6930 feat: call loutMultimedia endpoint

fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia

39381f29d7 refs #6980 test: fix failed tests

6e9a491e50 Merge branch '6930_scopedToken_Multimedia' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia

e93864e967 Update routes list input

64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module ...

# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js

a35eb1e2f2 Update routes list no result label

b2be4c1380 Fix routes list spaces

c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

85b8d5d8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

46bcba99bc fix: refs #5186 margin top

ebbe38a14e fix: refs #5186 parking routes

67d97eef8f fix: refs #5186 add searchbar

37985d853b fix: refs #5186 add locale

b5edc98732 fix: refs #5186 add all fields basic data & summary

07034499b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

1073512aae Implement Route autonomous dms

31911be3ba Remove unused route

4b860e0583 Change issued title

12a470b7d9 Add links to invoice out summary tickets table

87ab080b38 Change negative bases download button icon and tooltip

5ddae1fe65 Fix route basic data

992ada0984 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections

de294fae9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

859c87940d Several changes

7974725da0 Fix with feedback

d3a93da849 Merge branch 'salix-dev' into feature/route-module ...

# Conflicts:
#	src/components/ui/VnPaginate.vue

e8e2bc8403 Fix route list worker field

b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections

d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

1ab9bfefed Centralize roadmap add stop form

300e384f75 feat: refs #5186 add e2e

0e79676f58 Create manual invoice WIP

ed99aea4a3 Finish create manual invoice popup form

049e3c722a Fix translation

33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

37f155aa85 fix: refs #5186 css, required files & routes

3c3988b4f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

b44dcdb28a fix: refs #5186 tests

0c3dc30b8c fix(styles): refs #7001 create VnTitle and correct background-page color

374bc4a703 refs #6905 add rows

2d880be0f8 refs #6905 fix vnrow

64d8f86ea9 refactor(routeList): refs #6971 moved button to subtoolbar + same functionality as other subtoolbar items

fff5e1849e Delete unused form

06fa4aebc5 add invoice out list download icon

e4553659cf Update translation from population to city

77e29a2b87 Fix tickets feedback

31ac61b01f refactor: #6988 changed ticket summary view and fixed notes functionality

e793b3dd93 feat: refs #5186 use global locales

37a2c33f9f refactor: #6993 set default QTable pagination

0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

8587d46943 Merge branch 'salix-dev' into feature/route-module ...

# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue

a968540635 refactor: #6993 set default QTable pagination, created quasar.defaults for standards

667359ed92 Merge branch 'dev' into 6993-HideAllPagination

278ebbe070 Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev ...

Reviewed-on: #195
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

22c49d9cf7 resolve conflicts

f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

00a47cd5b2 refactor(style): refs #7001 add style font vnTitle vnChip

077fa7e2a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles

dd91449818 feat: refs #5186 use global locales

a76d6dc781 Merge branch 'dev' into 6988-SummaryRefactor

efb3ae6e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia

26e54923de Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!202) from 6930_scopedToken_Multimedia into dev ...

Reviewed-on: #202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

0fe0a6385b hotFix(Readme): change bun to pnpm

d8419a146a refs #6905 fix userConfig

17df7e8b09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-us

445d95057a refs #6930 feat: trycatchfinally logout

0d3d002baf refs #6930 perf: replace label

ff5e09d315 refs #6993 fixed QTable behaviour

07cd07427e refs #6993 remove depen

2321ca6605 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination

4c63e2f5c1 merge

6ff8b7be34 refs #6993 fix conflicts

a5441fb4a9 refs #6993 fix test front

63d195cbbf refs #6930 perf: refactor destroy method

55ef37584a refs #6993 fix test front

cb4ec856fd refs #6905 fix css

79b242f3a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

de5260b563 Merge branch 'dev' into 6930_fix_bug

8ebf4be807 refs: #6993 deleted useless files

dce974eba4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections

5803b8392b feat: refs #6951 clone ticket

f0e414e160 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

fe7d370a0a refactor: refs #6837 move travel search like other sections

d365a36c7e fixed useless variable

fd0d0283a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

e99b727b77 Merge branch 'dev' into 6993-HideAllPagination

62253e2282 refs #6546 test(VnPaginate) skip

4b03405474 Merge branch 'dev' into 6930_fix_bug

e4cbaf303e Merge pull request '#6930 - FIX bug logout' (!242) from 6930_fix_bug into dev ...

Reviewed-on: #242
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

2386090c15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles

9094ae8c88 test(VnPaginate) fix

cf25476a5d Create worker log

22eef14bb3 feat(light theme): refs #7001 add light theme

2ea6fd2ea6 Change vnconfirm export name

25aea39bfc fix(spec): refs #7001 fix som e2e spec

02574ec42d Merge pull request 'test(VnPaginate) fix' (!246) from fix_VnPaginate_paginate into dev ...

Reviewed-on: #246
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

89fc147ad8 refs #6905 fix traduction

0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig

01c3218ae4 Merge branch 'dev' into 6905-userPanelConfig

798ffa7de3 refs #6905 fix

096287b3be Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig

2fa5b1303d remove(vnChip): refs #7001 remove component

5580d15606 remove: refs #7001 custom chip

17cb91e79a Merge branch 'dev' into 7001-fixStyles

1da314e425 fix(claimLines): refs #7001 add style to clear qchip

12efc8dc11 Merge branch '7001-fixStyles' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles

cb51edff04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections

166e40833d Merge pull request 'feature/InvoicesOutCorrections' (!232) from hyervoni/salix-front-mindshore:feature/InvoicesOutCorrections into dev ...

Reviewed-on: #232
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

eb799c6321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles

f6e3b3607a Merge branch 'salix-dev' into feature/worker-log

61e7a77882 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar

b3a889e8f6 Merge pull request 'fix(styles): refs #7001 create VnTitle and correct background-page color' (!238) from 7001-fixStyles into dev ...

Reviewed-on: #238
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

d7d83fd886 refs #7124 feat: autofocus without property

561a7a5286 refs #7124 perf: whitespace

4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

f86c331afa feat: refs #5186 use arrayData in descriptor

c4f7b5e7c0 refs #7124 perf: use find instead findIndex

b11462e244 refs #7124 perf: avoid focus in VnFilterPanel

0c8f5f4888 refactor: refs #6971 moved correct button + unmade previous changes

8a82b7ab38 refs #7124 perf: avoid focus in disabled fields

95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig

a284f5ce5f refs #6905 fix

0a2e8a7995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor

17145b7fe8 fix: refs #6988 fix style

4678085575 Merge branch 'dev' into 6837-moveSearchById

d2efbb204f feat: refs #5186 use arrayData in summary

c911dc5cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6951-cloneTicket

2bb95fa568 rafactor: refs #6951 actions descriptor & update changelog

413beb9b84 Merge pull request '#7124 - First Input Autofocus without property' (!251) from 7124_autofocus_first_input into dev ...

Reviewed-on: #251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

962c4edd92 Merge branch 'dev' into 6951-cloneTicket

f0c3d90856 Merge pull request '#6951 add ticket clone' (!241) from 6951-cloneTicket into dev ...

Reviewed-on: #241
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f49c091461 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

a530e44179 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar

bd51306fd9 Merge branch 'dev' into 6837-moveSearchById

3ed3093fd9 Merge branch 'dev' into 6905-userPanelConfig

bf0e2d3bf6 refactor: refs #6971 fixed request changes

2003394fba Merge pull request 'refs #6905 add rows' (!235) from 6905-userPanelConfig into dev ...

Reviewed-on: #235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

b7b6d55d1c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor

842fc3f98a Merge branch 'dev' into 6837-moveSearchById

f1d37ed756 Merge pull request 'refactor: refs #6837 move travel search like other sections' (!243) from 6837-moveSearchById into dev ...

Reviewed-on: #243
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

84a25acf22 refactor: refs #6988 used global translations

fc5dbdfbb3 Merge branch 'dev' into 6971-MoveBtnToSubtoolbar

c5e9572889 Merge pull request 'refactor(routeList): refs #6971 moved button to subtoolbar + same functionality as other subtoolbar items' (!236) from 6971-MoveBtnToSubtoolbar into dev ...

Reviewed-on: #236
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

3e0f151570 refactor: refs #6988 fixed error

c335accffb refs #6905 fix translation and warnings

5e089e616e Merge branch 'dev' into feature/worker-log

4605484845 Merge pull request 'Create worker log' (!247) from hyervoni/salix-front-mindshore:feature/worker-log into dev ...

Reviewed-on: #247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

de0166b327 feat: refs #6485 not open new tab on launch

a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor

c450290d3c Merge pull request '#6485 not open new tab on launch' (!256) from 6485-notOpenTabOnRun into dev ...

Reviewed-on: #256
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

b46760116f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

1ec54d7664 feat: #6514 create supplierDms lilium

4a7cb8fe8d refactor: refs #6993 fixed conflict

50b116627b Merge branch '6993-HideAllPagination' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination

a0dcd6aee1 feat: refs #6893 replace id & redirect to Card or list

2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination

9f24f1f97c refactor: refs #6993 merged conflicts

7072dc783b refactor: refs #6993 fix test error

7cfffbd2de Merge pull request 'refactor: #6993 set default QTable pagination' (!239) from 6993-HideAllPagination into dev ...

Reviewed-on: #239
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

375461abd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord

27f8d5f09c Merge branch '5186-CreateParkingSection' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection

a9f7cfb8d4 Merge pull request '#5186 create parking section' (!197) from 5186-CreateParkingSection into dev ...

Reviewed-on: #197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor

20102a89ab feat: refs #6893 improve VnSearchbar & create tests

0d74c7f6c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord

5126b6aed8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord

72e3fcb4b7 Merge pull request 'refactor: #6988 changed ticket summary view and fixed notes functionality' (!237) from 6988-SummaryRefactor into dev ...

Reviewed-on: #237
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

2bec5f0e9c Merge pull request '#6893 redirect on fetch just one record' (!257) from 6893-redirectOnFetchOneRecord into dev ...

Reviewed-on: #257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

da93b9cca8 updates

54b6528962 Merge pull request 'More updates to use scopedMultimedia' (!261) from 6930_scopedMultimedia into dev ...

Reviewed-on: #261
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier

b2691a35e1 refactor: refs #6514 fixed tranlation

2b1fe6fd77 Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier

2d3ddd886a Merge pull request 'feat: #6514 create supplierDms lilium' (!258) from 6514-gestDocSupplier into dev ...

Reviewed-on: #258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

9ed8fa1bcb Merge pull request '7152-devToTest_2414' (!262) from 7152-devToTest_2414 into test ...

Reviewed-on: #262
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

7020fab851 fix: refs #6951 drop hook & change selector

bed0b9e8e9 Merge pull request '#6951 warmfix ticketDescriptor' (!263) from 6951-warmfix_ticketDescriptor into test ...

Reviewed-on: #263
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

dec71dbf62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

alexm requested review from guillermo 2024-04-04 05:31:40 +00:00

guillermo approved these changes 2024-04-04 05:32:05 +00:00

alexm merged commit 06af04a043 into master 2024-04-04 05:35:08 +00:00

alexm deleted branch 7167-testToMaster_2414 2024-04-04 05:35:08 +00:00

alexm referenced this issue from a commit 2024-04-04 05:35:10 +00:00

Merge pull request '7167-testToMaster_2414' (!266) from 7167-testToMaster_2414 into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#266

No description provided.