Commit Graph

316 Commits

Author SHA1 Message Date
Joan Sanchez 07026a68bb #2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:29:56 +02:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Carlos Jimenez Ruiz d4eedc69e1 indentation on route filter 2021-05-11 12:53:08 +02:00
Joan Sanchez 6ae8b72268 Merge branch 'dev' into 2902-error-getSuggestedTickets
gitea/salix/pipeline/head This commit looks good Details
2021-05-11 09:52:42 +00:00
Carlos Jimenez Ruiz ac917b6115 mino changes on translations
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz 58447c8168 transaltion changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz 657896bce0 increased section width
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:32:00 +02:00
Javi Gallego 19b35f5f6c landed en lugar de shipped
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 07:52:03 +02:00
Javi Gallego f1c30ca6d1 cambio landed por created
gitea/salix/pipeline/head This commit looks good Details
2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz 245243aa14 routes without vehicle or vehicles without drop off now throw
gitea/salix/pipeline/head This commit looks good Details
2021-05-05 13:36:54 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 409f56ec7f e2e path resurrected for route tickets
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 17:19:05 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
Carlos Jimenez Ruiz 84378fd607 tickets already in route are no longer shown + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:13:12 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +01:00
Jorge Padawan aaf77677d1 Aligned title with column
gitea/salix/pipeline/head Build queued... Details
2021-02-16 15:50:48 +01:00
Jorge Padawan ac4a19841d Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-16 15:40:20 +01:00
Carlos Jimenez Ruiz dd9e9bac9b removed unused character
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz a77c5c5b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz a0d6e53dbb polutd test removed 2021-02-02 14:00:35 +01:00
Jorge Padawan 186e59c7ae .
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:18:17 +01:00
Jorge Padawan b57578f933 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:12:54 +01:00
Jorge Padawan b576c0ad69 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:11:17 +01:00
Jorge Padawan 1a87eb3085 Remove bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:52:24 +01:00
Jorge Padawan 218a19d7da Removed bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:37:00 +01:00
Jorge Padawan c7424997d5 Removed bad code 2021-02-02 12:22:18 +01:00
Jorge Padawan a1a3607d3c Remove bad code 2021-02-02 11:57:42 +01:00
Jorge Padawan 7b7571ae77 Fixed problems with default search 2021-02-02 10:26:10 +01:00
Jorge Padawan 9d96a4a6a1 Fixed problems test e2e 2021-02-02 10:17:13 +01:00
Jorge Padawan 3f963f2d99 changed message
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:19:26 +01:00
Jorge Padawan 4f644cb708 Changed name of value on scope days test
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:13:18 +01:00
Jorge Padawan 69e8dfc334 Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 16:10:23 +01:00
Jorge Padawan 797f96f4c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 14:14:22 +01:00
Jorge Padawan bef8fca529 Rework the test on main section 2021-01-28 14:14:14 +01:00
Bernat Exposito df073094f8 fix test updateVolume
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 09:07:00 +01:00
Carlos Jimenez Ruiz 5ea222dc00 fixed translations
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:02:03 +01:00
Carlos Jimenez Ruiz c3ac7b671f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 11:32:35 +01:00
Jorge Padawan e205ebba72 Added main spec and fixed line on search-panel spec
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz fcf60ac297 excluded failing test for future fixing 2021-01-20 14:40:32 +01:00
Jorge Padawan 91979f5d69 Add scopeDays to search bar on route 2021-01-20 13:19:28 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:11:37 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00
Carlos Jimenez Ruiz e6106b1aa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz 8ede30398b clone feature for routes index 2020-12-24 11:31:20 +01:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Joan Sanchez 35dc2a533b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:52:08 +01:00
Joan Sanchez 1419acb8a7 2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz 482cbd7195 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz 369a79b79f route.tickets refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:37:36 +01:00
Jorge Padawan 2fe22efe36 filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 15:12:52 +01:00
Carlos Jimenez Ruiz 2e9267a25e route module refactors 2020-12-16 10:21:35 +01:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Carlos Jimenez Ruiz fbb2fc3bdd Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #464
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-24 09:33:44 +00:00
Bernat Exposito 6a7568eb29 Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 07:36:52 +00:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Bernat Exposito 37ac312bd5 pr changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:05:24 +01:00
Bernat Exposito f64a566447 route.ticket drag and drop validation 2020-11-20 12:12:06 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Bernat Exposito Domenech 8a58017597 fix route/ticket
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:50:47 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Bernat Exposito Domenech e5557be3dc route ticket fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 10:52:28 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz 87e4765a1c fixed ticket-weekly backend unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 16:53:47 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00
Joan Sanchez 17497c3f2d Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:22:57 +02:00
Joan Sanchez cd74e9684a Download route PDF on route index
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:00:21 +02:00
Joan Sanchez 957c1c01b9 Html changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-24 07:54:30 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 74b78fee84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:13:10 +01:00
Joan Sanchez a9c622377e Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 12:55:22 +01:00
Joan Sanchez 3cb98eaf5f Route refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:24:55 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Bernat Exposito Domenech 285d930b8e showReport fix
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 12:32:26 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 13:06:01 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 15:02:47 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech bfb8c5e138 route.basicData validations
gitea/salix/2124-route_basic_data This commit looks good Details
2020-02-18 12:51:29 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech 2f81727594 reload_card_volume
gitea/salix/2080-reload_card_volume This commit looks good Details
2020-02-07 07:43:22 +01:00
Carlos Jimenez Ruiz 610c21f23d corrected a typo
gitea/salix/1944-ticket-summary This commit looks good Details
2020-02-06 07:39:00 +01:00
Carlos Jimenez Ruiz 06c3580bc4 #1944 ticket.summary 2020-02-05 13:37:36 +01:00
Carlos Jimenez Ruiz 76fc5a3311 #1944 ticket.summary 2020-02-05 12:44:14 +01:00
Bernat Exposito Domenech 27a469c786 route.basic finder
gitea/salix/1947-route_basic_data This commit looks good Details
2020-01-07 08:40:23 +01:00
Bernat Exposito Domenech d8e27a4a5c routebasic
gitea/salix/1947-route_basic_data This commit looks good Details
2020-01-03 14:42:50 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech e573a2cff0 fix error
gitea/salix/1707route.ticket There was a failure building this commit Details
2019-12-12 09:13:24 +01:00
Bernat Exposito Domenech d0a2f4627b 1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good Details
2019-12-10 12:42:14 +01:00
Juan Ferrer f50f99b962 Minor bug & style fixes
gitea/salix/dev This commit looks good Details
2019-11-22 13:23:43 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Bernat 4eca2e9453 merge
gitea/salix/1776travel.basic-data This commit looks good Details
2019-10-25 13:31:01 +02:00
Bernat d02c79d2e8 #1774 travel.index test and refactor 2019-10-25 13:29:05 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Carlos Jimenez Ruiz 6cbfa895da fixed a typo
gitea/salix/dev This commit looks good Details
2019-10-23 15:04:05 +02:00
Carlos Jimenez Ruiz c84625b0d5 #1713 route.tickets boton mas bajo derecha
gitea/salix/dev This commit looks good Details
2019-10-23 09:25:28 +02:00
Bernat 6477a1458d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-21 07:24:56 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 43fd8fe75e Merge 2019-10-18 21:37:28 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Carlos Jimenez Ruiz bdbadaf61a #1819 fixtures
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-17 14:30:52 +02:00
Bernat 061e978a26 #1758 Añadir los alias como prefijos en los filtros 2019-10-16 08:08:10 +02:00
Joan Sanchez 6ed5695063 Added zoneFk to routes. solved #1713
gitea/salix/dev This commit looks good Details
2019-10-16 07:18:05 +02:00
Bernat e267bf93a4 merge
gitea/salix/dev This commit looks good Details
2019-10-14 07:01:29 +02:00
Bernat d637ed2599 1717, route basic data 2019-10-14 06:58:02 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00