Commit Graph

1262 Commits

Author SHA1 Message Date
Alex Moreno 0f2c0fc490 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-11 12:48:32 +01:00
Vicent Llopis 4d81991d86 delete focus test 2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest 2022-11-08 08:46:47 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Vicent Llopis 7fc18c89df feat: error handlers 2022-11-07 13:57:54 +01:00
Vicent Llopis ffa0ff650e feat: add time control 2022-11-07 12:21:14 +01:00
Vicent Llopis 6858de83a3 feat: backTest 2022-11-04 14:55:47 +01:00
Vicent Llopis 892094f85c feat: add backTest 2022-11-04 13:41:45 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Vicent Llopis 626355d251 fix: sustituido insert por insert ignore 2022-11-04 12:37:07 +01:00
Vicent Llopis ab739f412f feat: add test 2022-11-03 15:00:55 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Vicent Llopis 57564325e1 feat: añadidas opciones para confirmar o no confirmar el registro de horas 2022-11-02 14:22:18 +01:00
Alex Moreno 84a5f3986b feat(worker): createWorker refs #4658 2022-11-02 13:24:35 +01:00
Vicent Llopis 3243d35bd7 feat: send email 2022-10-31 14:48:37 +01:00
Vicent Llopis 1f2ea2c4d8 fix: incorrect number of params 2022-10-31 13:30:08 +01:00
Vicent Llopis 273a8cd7c7 refactor code 2022-10-31 13:00:32 +01:00
Vicent Llopis b17fe0d18c refator code 2022-10-31 09:55:11 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores 2022-10-31 07:34:34 +01:00
Pau f481cc3c97 Capitalizar 2022-10-18 10:38:40 +02:00
Pau 1d8fb25325 Refactored according to the suggested changes 2022-10-18 10:25:54 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating 2022-10-06 11:54:14 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field 2022-10-06 10:18:08 +02:00
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config 2022-09-23 13:53:33 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure 2022-09-19 09:45:28 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET 2022-09-13 13:53:44 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis 020990dadc fix: backTest 2022-08-04 09:53:22 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person 2022-07-29 15:17:00 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2022-05-24 08:45:37 +02:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted 2022-05-23 12:45:20 +02:00
Vicent Llopis a043c5d346 refactor: request changes 2022-05-20 13:10:48 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models 2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention 2022-05-16 10:19:43 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Alex Moreno 798147ea99 jenkins error 2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log 2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth 2022-05-05 13:25:57 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models 2022-04-27 14:17:41 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup 2022-04-13 08:12:28 +00:00
Vicent Llopis a348762153 refactor: pull request changes 2022-04-11 09:09:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup 2022-04-11 08:02:05 +02:00
Vicent Llopis 2c54f31985 refactor: uppercase 2022-03-31 10:54:30 +02:00
Vicent Llopis 443db55f58 feat(worker_basic-data): add new fields 2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz 7d3f8844cc Merge branch 'dev' into 3637-departments_hasToMistake 2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz b27a7ca263 Merge branch 'dev' into 3637-departments_hasToMistake 2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar 2022-03-29 08:18:13 +00:00
Vicent Llopis 133152460a fix: translate 2022-03-28 14:14:41 +02:00
Vicent Llopis 4bdc29e283 refactor: calculate holidays through db procedures 2022-03-24 10:59:23 +01:00
Alex Moreno ad4c89af5f feat(department): add hasToMistake in model 2022-03-23 14:12:47 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures 2022-03-23 14:02:48 +01:00
Alex Moreno 0963b66560 fix(worker_calendar): absence in holiday day 2022-03-23 13:06:17 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Vicent Llopis 6a91fe6c11 solved backTest 2022-03-10 14:43:07 +01:00
Alex Moreno c8a512db4e unnecessary 2022-03-08 15:16:36 +01:00
Vicent Llopis 87daac03ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 13:06:38 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:31:27 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Alex Moreno c33b8fbb83 refactor(worker): absences return one or all abscences 2022-02-23 14:50:59 +01:00
Vicent Llopis 30763e5c08 fix: backTest 2022-02-23 09:05:53 +01:00
Vicent Llopis 13ce7991ec refactor: uppercase in model type 2022-01-17 09:49:45 +01:00
Vicent Llopis e850fdaf4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays 2022-01-12 12:15:32 +01:00
Carlos Jimenez Ruiz 7b5e6e8a23 added shorcuts for order, monitor and worker modules 2022-01-10 16:08:45 +01:00
Vicent Llopis 914fca0814 fix: delete unnecessary ng-if 2022-01-04 10:28:06 +01:00
Vicent Llopis ac833ac625 feat: add field payedHolidays 2021-12-24 11:30:28 +01:00
Vicent Llopis e1c4f144a7 feat: add code 2021-12-23 14:57:22 +01:00
Vicent Llopis 671a35f8c9 upload branch 2021-12-23 13:11:17 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures 2021-11-30 13:57:17 +01:00
Carlos Jimenez Ruiz d760eba446 Merge branch 'dev' into 3275-worker_calendar 2021-11-30 11:40:54 +00:00
Vicent Llopis 21bd625b3b add exceprion to half day absence 2021-11-30 12:31:02 +01:00
Vicent Llopis 4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded 2021-11-30 09:11:23 +01:00
Alex Moreno 594f258232 modify js date format 2021-11-30 07:16:43 +01:00
Alex Moreno 85e3b47408 test(worker_time-control): tested url parameter timestamp 2021-11-29 15:22:16 +01:00
Alex Moreno 65053f5f28 feat(worker_time-control): add timestamp url param 2021-11-26 13:26:48 +01:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 2021-11-22 13:18:53 +00:00
Vicent Llopis abf3c1c84b Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar 2021-11-22 13:34:44 +01:00
Vicent Llopis cdf7c20b16 feat(worker_createAbsense): update backTest 2021-11-22 13:34:42 +01:00
Joan Sanchez 9c5939b661 Updated styles 2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar 2021-11-18 14:01:25 +00:00
Joan Sanchez c98730e6b9 Updated styles 2021-11-18 14:00:45 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Vicent Llopis 00a33fabb3 update backTest 2021-11-17 14:38:12 +01:00
Vicent Llopis 651a925708 feat(worker_calendar): only can choose one halfHoliday by year 2021-11-17 14:20:26 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest 2021-11-16 10:09:42 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día" 2021-11-15 14:49:14 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec 2021-11-09 10:09:44 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates 2021-11-08 14:08:44 +01:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
Refs: 3254
2021-10-25 11:58:23 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
Refs: 3166
2021-10-04 09:30:55 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
Refs: 2389
2021-09-16 12:13:20 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-08-18 12:38:41 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime 2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Joan Sanchez 63b502b368 Updated model ACL 2021-07-19 13:01:06 +02:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours 2021-07-14 10:09:24 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault 2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests 2021-06-23 13:24:23 +02:00
Joan Sanchez 0ff114ff36 Ammends 2021-06-18 12:32:37 +02:00
Joan Sanchez bc7c288742 Updated unit tests 2021-06-18 08:03:55 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction 2021-06-17 15:09:04 +02:00
Joan Sanchez 59e90c2c10 Removed commented block 2021-06-14 11:58:39 +02:00
Joan Sanchez de30a2d978 Total holidays fix 2021-06-14 08:09:53 +02:00
Joan Sanchez a72010554c Fixes and E2E updated 2021-06-11 10:58:00 +02:00
Joan Sanchez 3f3e5c2735 Unit tests 2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor 2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects 2021-06-08 16:36:16 +02:00
Joan Sanchez 8fa64122f8 Ammends 2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor 2021-06-07 14:26:34 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text 2021-05-18 12:53:33 +00:00
Joan Sanchez a9e33abacc FIX: Show employee list 2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor 2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id 2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole 2021-04-13 14:08:10 +02:00
jorgebl 1fd18cae5a QA 2021-03-05 11:40:01 +01:00
jorgebl cdd903dedf removed line break because the app interpretate it's a space 2021-03-03 15:09:01 +01:00
jorgebl 56154181aa QA done 2021-03-03 13:39:25 +01:00
jorgebl 60ca3e87a5 Test git 2021-03-02 16:53:54 +01:00
jorgebl 3c82a4997b Test gitea 2021-03-02 16:52:14 +01:00
jorgebl 022d31c952 remove line break 2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note 2021-03-02 12:50:07 +01:00
jorgebl 094552e0f2 Added ellipsize and align label 2021-02-26 12:32:05 +01:00
jorgebl 1f1db53d41 Summary boss shown on descriptor 2021-02-24 16:12:44 +01:00
jorgebl 9855bd14fe Translate Boss 2021-02-23 11:08:57 +01:00
jorgebl 8deb11d333 Added boss on basic data and summary 2021-02-19 17:45:45 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number 2021-02-05 12:09:48 +01:00
Joan Sanchez 84cef1949b Image size fix 2021-02-04 18:28:58 +01:00
Joan Sanchez dea858c314 Removed focus 2021-02-02 10:12:37 +01:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss 2021-02-02 10:07:13 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues 2021-02-01 09:29:47 +01:00
Joan Sanchez dd29b351d2 Disabled loggable 2021-01-12 14:25:01 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code 2021-01-12 10:17:12 +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 6416b0ad79 2666 - Closure invalid email notification 2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected 2020-12-21 13:52:37 +01:00
Joan Sanchez 6717853efb Updated front tests 2020-12-18 18:02:41 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2 2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz e9f73c3299 worker module refactors 2020-12-16 10:32:32 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL 2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures 2020-12-10 13:21:11 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component 2020-11-27 13:10:39 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address 2020-11-24 14:56:10 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon 2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity 2020-11-23 13:41:51 +01:00
Bernat Exposito 4d91b26537 checkinbox moved to worker 2020-11-20 13:35:01 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations 2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index 2020-10-29 13:46:36 +01:00
Carlos Jimenez Ruiz a797a2db8b fixed the absences unit test 2020-10-23 13:34:57 +02:00
Joan Sanchez 3c37f0e993 Merge branch 'dev' into 2428-anchor_directive 2020-10-21 08:32:31 +00:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index 2020-10-19 09:05:38 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar 2020-10-06 08:17:12 +02:00
Joan Sanchez 71e29e747a Requested changes 2020-10-05 14:45:39 +02:00
Joan Sanchez d0ece57219 Updated unit test 2020-10-05 10:09:36 +02:00
Joan Sanchez 420dfdbdff Send notification by email 2020-10-02 12:23:48 +02:00
Joan Sanchez 58965a9687 Enabled loggable on calendar model 2020-09-30 07:38:43 +02:00
Joan Sanchez d2dbf417f4 Updated to standard color 2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests 2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors 2020-09-24 10:14:53 +02:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech 06f03c6b84 mail models and fix checkInbox 2020-09-22 13:59:00 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
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 2020-09-09 09:06:11 +00:00
Joan Sanchez 03a0a22526 Updated unit test 2020-09-07 08:53:47 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name 2020-09-07 07:59:27 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname 2020-09-03 15:11:16 +02:00
Joan Sanchez a3d3ed4aba Fixed unit test 2020-08-18 14:14:34 +02:00
Joan Sanchez 540d5e9e71 Fixed errors 2020-08-18 13:50:08 +02:00
Joan Sanchez b50b30c792 Updated unit test 2020-08-11 12:16:19 +02:00
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +02:00
Joan Sanchez 7833b87475 Added filter 2020-08-10 14:44:57 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model 2020-08-10 14:29:25 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept 2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working 2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused 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 a07d960a2e Fixed test 2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test 2020-07-16 11:59:16 +02:00
Joan Sanchez 87fa66fe8c Updated methods description 2020-07-16 11:45:44 +02:00
Joan Sanchez bbf3b72001 Added front & back tests 2020-07-16 10:04:16 +02:00
Joan Sanchez 2f9d80be7a Added ACL + unit tests 2020-07-15 11:35:34 +02:00
Joan Sanchez 91e739547b Changes 2020-07-11 18:30:27 +02:00
Joan Sánchez 01b32d2b89 Calendar changes 2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection 2020-07-07 14:29:57 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e 2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor 2020-06-29 14:26:27 +02:00
Joan Sanchez 8729d1c765 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-06-19 10:35:57 +02:00
Joan Sanchez 41eeaeef0b Entitlement rate 2020-06-19 09:58:09 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services 2020-06-12 14:28:29 +02:00
Bernat Exposito Domenech e24c5b00e9 fix descriptors 2020-06-08 11:05:17 +02:00
Bernat Exposito Domenech 90541a4c13 fix client descriptor in log section 2020-06-05 12:13:05 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in 2020-05-26 14:37:34 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
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 2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates 2020-05-19 10:27:22 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed 2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks 2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed 2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed 2020-04-25 11:50:04 +02:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia 2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Javi Gallego ea1cc68d29 test passed 2020-04-03 17:52:47 +02:00
Javi Gallego b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita 2020-03-26 17:52:41 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-25 15:59:41 +01:00
Bernat Exposito Domenech dcdae825d2 fixex pull request 2020-03-25 08:43:49 +01:00
Javi Gallego 0561f19313 version 1 2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia 2020-03-24 17:32:30 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log 2020-03-24 12:20:53 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-20 12:00:53 +01:00
Joan Sanchez 3d23583e0b Fixes 2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor 2020-03-18 12:55:22 +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
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Bernat Exposito Domenech f9abaa409a fix calendar-holiday model 2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech 6798f9709c update view holiday 2020-03-12 10:59:41 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev 2020-03-06 10:34:38 +00:00
Joan Sanchez fddc8e7ed1 Updated unit test 2020-03-05 14:49:41 +01:00
Carlos Jimenez Ruiz 0f7ed5bbfa get worked hours unit test 2020-03-03 15:14:28 +01:00
Joan Sanchez 03e952c83e Updated unit test 2020-03-02 07:57:33 +01:00
Joan Sanchez 28553a1c0d Worker dms changes 2020-03-02 07:50:07 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section 2020-02-28 14:18:55 +01:00
Joan Sanchez 25a1c0d2de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-02-28 08:34:42 +01:00
Joan Sanchez a8eea3d8f6 Changed primary key 2020-02-28 08:19:37 +01:00
Joan Sanchez 220f36d795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-02-28 07:34:26 +01:00
Joan Sanchez 442541d0f8 Renamed rgb column 2020-02-28 07:24:36 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis 2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor 2020-02-18 10:33:17 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values 2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech 7bb5b19398 refactor table holidayType and holidayDetail 2020-02-06 09:33:36 +01:00
Bernat Exposito Domenech 89dc8e27e0 update models 2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index 2020-02-03 14:03:09 +01:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours 2020-01-30 11:20:41 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles 2020-01-24 14:22:11 +01:00
Javi Gallego 08fda3ed1b #workedHours 2020-01-24 12:38:08 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests 2020-01-20 11:59:15 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays 2020-01-03 08:43:03 +01:00
Joan Sanchez 7fb3f75808 changed comparator 2020-01-02 11:21:11 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug 2019-12-31 14:01:05 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql 2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech 9a6c8db140 focus on the dialog 2019-12-20 08:32:02 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master 2019-12-17 12:53:06 +00:00
Joan Sanchez 8ddcd5a654 ACL fixes 2019-12-17 12:18:17 +01:00
Juan Ferrer d1341c2758 Hotfixes 2019-12-17 09:23:11 +01:00
Joan Sanchez ef95244d07 stowaway refactor 2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech 2e68ad0d01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone 2019-12-13 10:54:52 +01:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev 2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech a87ce44f08 test front worker.phone 2019-12-12 12:23:31 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures 2019-12-12 09:46:29 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Joan Sanchez f9dba9489f updated tests 2019-11-25 09:17:24 +01:00
Joan Sanchez a077dd5165 test unitario 2019-11-22 14:34:20 +01:00
Joan Sanchez 3c144ea0cd transaction changes 2019-11-22 13:46:38 +01:00
Joan Sanchez 5aae48c7dc added gestdoc 2019-11-22 10:42:05 +01:00
Carlos Jimenez Ruiz 6a0783d22f #1891 tests for worker time control function 2019-11-21 11:16:10 +01:00
Carlos Jimenez Ruiz c04640bd62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz 52a8d5e0c2 #1891 tests for worker time control function 2019-11-21 09:19:03 +01:00
Bernat d1dfa126c0 #1711 Eliminar referencias al esquema vn2008 2019-11-21 09:08:43 +01:00
Carlos Jimenez Ruiz 6929e3d497 #1889 absences() unit test fixed + refactor 2019-11-20 14:22:44 +01:00
Bernat 9743b61f63 delete endpoint getWorkerInfo 2019-11-19 11:51:47 +01:00
Bernat 12825f0503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 11:43:00 +01:00
Carlos Jimenez Ruiz f998a04808 #1852 worker.time-control 2019-11-18 16:37:33 +01:00
Carlos Jimenez Ruiz 3c2ad2df48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 12:35:30 +01:00
Carlos Jimenez Ruiz 7c199b5d74 #1852 worker.time-control 2019-11-18 11:00:09 +01:00
Joan Sanchez c83a97d7ec holidays fix #1853 2019-11-15 10:44:11 +01:00
Carlos Jimenez Ruiz d1b114de59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-15 10:37:42 +01:00
Joan Sanchez ddb19cb198 added event 2019-11-15 10:03:46 +01:00
Carlos Jimenez Ruiz 8629b72d55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz 34bd35ce4e #1852 worker.time-control 2019-11-14 14:20:05 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Joan Sanchez 5561ff169e deprecated worker.sendMessage() 2019-11-14 11:21:08 +01:00
Bernat dfd29ced70 1711 delete references 2019-11-13 11:04:52 +01:00
Juan Ferrer 976782738e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-10 13:27:31 +01:00
Juan Ferrer 515234187a First working version 2019-11-10 11:08:44 +01:00
Carlos Jimenez Ruiz 76f3dc48e5 #1852 worker.time-control 2019-11-05 11:57:05 +01:00
Carlos Jimenez Ruiz b9be0188d8 manual merge 2019-11-05 09:05:00 +01:00
Carlos Jimenez Ruiz 03ab88bcd9 #1852 worker.time-control 2019-11-05 08:59:48 +01:00
Joan Sanchez 5d83849e2b unknown provider 2019-11-05 07:19:16 +01:00
Joan Sanchez fc2abdc0ab change log columns size 2019-11-04 08:05:00 +01:00
Juan Ferrer f759c1e11a vnDialog bug fixes & front tests, workerTimeControl date fixes 2019-10-31 15:24:28 +01:00
Juan Ferrer 5a15e65fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-30 16:57:26 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
quique 49b06e3472 send rocket chat message 2019-10-29 12:39:25 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Bernat 4eca2e9453 merge 2019-10-25 13:31:01 +02:00
Bernat 9fd0ab0bd3 #1775 travel.log crear sección historial 2019-10-25 13:28:12 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer ee196df2ff vnCompent with most common services as properties 2019-10-24 12:44:36 +02:00
Juan Ferrer 53003246c3 Merge with upstream 2019-10-23 17:42:41 +02:00
Juan Ferrer 2436bf9488 Agency events - First stable version 2019-10-23 17:38:35 +02:00
Joan Sanchez d1e8f5fb1c removed endpoints 2019-10-23 07:18:09 +02:00
Joan Sanchez b6d666d223 removed IOS worker-time-controls endpoints 2019-10-23 07:14:12 +02:00
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor 2019-10-21 14:21:52 +02:00
Bernat 6adeb689eb Tarea #1814 refactor fixtures userPhone 2019-10-21 08:52:42 +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 2019-10-19 01:18:25 +02:00
Juan Ferrer 17a150370c Style fixes 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 85bcb356d4 1778 Refactor worker.phone 2019-10-18 13:52:15 +02:00
Bernat b78447bdd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-18 13:51:24 +02:00
Joan Sanchez 18b0ae034c #1815 - show summary correct photos on claim index 2019-10-18 09:53:30 +02:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Joan Sanchez f2a05ff915 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department 2019-10-17 14:08:29 +02:00
Joan Sanchez e1cea99cc0 insert timeControl from procedure 2019-10-17 14:01:23 +02:00
Joan Sanchez b2b76b05d8 css fixes + back unit tests 2019-10-17 13:27:50 +02:00
Joan Sanchez 6d159c50a0 css fixes 2019-10-16 09:52:46 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview 2019-10-16 08:56:13 +02:00
Bernat 25bd28990a Refactor #1812 refactor phone 2019-10-15 14:44:00 +02:00
Joan Sanchez 3853fc7404 descuadre de horas #1766 rollback 2019-10-15 08:50:11 +02:00
Bernat 793dd06e8d merge 2019-10-15 07:30:23 +02:00
Juan Ferrer 7dfd1fe6f2 Merge 2019-10-11 17:43:29 +02:00
Joan Sanchez 8af7f13ac6 #1763 insert from procedure 2019-10-10 14:11:23 +02:00
Javi Gallego 3e71338d94 borra tabla temporal 2019-10-10 12:14:21 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer fc09d76422 Merge 2019-10-08 23:57:54 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Joan Sanchez 90ca883962 solved conflicts 2019-10-08 13:06:50 +02:00
Joan Sanchez 9358602471 #15 Updated changes width dev 2019-10-08 13:03:19 +02:00
Joan Sanchez 4025c624b3 #15 WIP fixed requested changes 2019-10-08 12:48:12 +02:00
Joan Sanchez eb655215f4 merge pull changes 2019-10-08 09:23:29 +02:00
Joan Sanchez b32cf4a386 last refactor 2019-10-08 07:22:38 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Juan Ferrer 9b385f4b90 #1749 Fixed 2019-10-04 13:12:53 +02:00
Joan Sanchez 9919f9a46e add & remove childs 2019-10-04 07:41:24 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes 2019-10-02 21:02:49 +02:00
Juan Ferrer 87add6cd33 vnDataViewer 2019-10-02 19:24:42 +02:00
Joan Sanchez 6a184496d6 treeview refactor 2 2019-10-02 14:12:17 +02:00
Joan Sanchez 9473636b5b treeview refactor 2019-10-02 09:54:52 +02:00
Juan Ferrer 76604744d1 Global & client style fixes 2019-10-01 16:17:57 +02:00
Joan Sanchez 183d770483 first changes 2019-10-01 15:09:55 +02:00
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Carlos Jimenez Ruiz cef28307d0 #1660 ticket.log si el usuario es un cliente falla 2019-10-01 10:47:06 +02:00
Juan Ferrer 679c6af0df #1297 Angular material removed from project 2019-09-30 20:46:22 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez 176750046a Scroll component #643 2019-09-05 13:06:40 +02:00
Bernat 15097313a2 #1651 worker.json 2019-08-27 11:12:17 +02:00
Bernat 7e1eba53f1 Refactor #1627 worker.timeControl 2019-08-06 12:25:53 +02:00
Joan Sanchez 31b5f689df timeControl calendar fixed #1623 2019-08-01 09:58:59 +02:00
Bernat 098dd7b235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-07-31 10:45:03 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles 2019-07-31 09:50:47 +02:00
Bernat 116a34d04a fix test 2019-07-31 09:17:26 +02:00
Carlos Jimenez Ruiz a2a9dfd7e5 #1567 refactor logs - worker descriptor 2019-07-03 11:08:44 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test 2019-07-01 11:56:16 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent 2019-06-27 09:03:03 +02:00
Joan Sanchez 8ff61a5d3a added zone prices, radio-group and calendar refactor #1320 2019-06-26 13:35:38 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test 2019-06-25 14:00:55 +02:00
Joan Sanchez 340e7b8495 round worker calendar holidays #1547 2019-06-21 09:56:39 +02:00
Carlos Jimenez Ruiz 73ccf9a107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-19 14:42:59 +02:00
Juan Ferrer edfa112874 Merge with master 2019-06-17 11:33:34 +02:00
Juan Ferrer da01d52756 Secret removed from worker/pbx 2019-06-17 11:14:45 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Joan Sanchez a9aaa3329a fixed worker calendar 2019-06-14 08:17:12 +02:00
Joan Sanchez 9a18d0bd8c fixed worker calendar 2019-06-14 08:15:14 +02:00
Bernat 5ce33fbefd Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:25:02 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure 2019-06-07 13:07:23 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Joan Sanchez 073c457abb Merge branch 'test' 2019-06-05 08:56:56 +02:00
Javi Gallego 0f5ebf42ec Tarea #1506 worker.pbx quitar campo password 2019-06-04 12:54:41 +02:00
quique a6a6ea5b06 WorkerTimerControl App 2019-06-03 09:41:54 +02:00
quique b034333cdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-03 09:20:35 +02:00
quique 8005b0a892 WorkerTimeControl App 2019-06-03 09:20:20 +02:00
Bernat 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest 2019-06-03 08:01:24 +02:00
Joan Sanchez a138465071 moveNext() movePrevious() moves now to day 1 to prevent a month jump 2019-05-31 13:54:15 +02:00
Joan Sanchez 5abb82faab moveNext() movePrevious() moves now to day 1 to prevent a month jump 2019-05-31 13:33:37 +02:00
Joan Sanchez 68f67f12d7 moveNext() movePrevious() moves now to day 1 to prevent a month jump 2019-05-31 13:28:28 +02:00
Bernat 97459bd7e6 1497 2019-05-31 11:33:28 +02:00
Joan Sanchez cc72432a37 accessType refactor #1460 2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460 2019-05-22 12:35:24 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449 2019-05-21 12:56:29 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360 2019-05-17 13:27:51 +02:00
Bernat b86cf1d98a 1354 refactor item-descriptor-popover 2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz da04d409a3 #1415 implementar color legend en worker.calendar 2019-05-10 13:16:37 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover 2019-05-07 11:32:35 +02:00
Joan Sanchez c8bf9d0d7b fixed worker calendar error for local holidays 2019-04-30 11:43:26 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374 2019-04-29 11:49:43 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Carlos Jimenez Ruiz e11d33eb27 worker descriptor refactor 2019-04-25 08:28:23 +02:00
Carlos Jimenez Ruiz 8d5cc93ddb #1359 refactor absences 2019-04-23 13:29:52 +02:00
Joan Sanchez 76269a8a16 added drag & drop directives on worker department #1319 2019-04-23 08:29:23 +02:00
Bernat 9a86929e3a #1344 create test for worker filter 2019-04-16 13:10:06 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Bernat 0d680bdaed #1343 update worker filter 2019-04-16 07:59:29 +02:00
Bernat 6a68003d84 #1212 refactor claim filter 2019-04-15 11:06:42 +02:00
Bernat dbe56b2496 #1330 add info in the search panel 2019-04-12 14:33:08 +02:00
Joan Sanchez 9ce1e93da7 changed worker holidays length 2019-04-09 13:38:02 +02:00
Joan Sanchez afafbdda95 fixed back unit test 2019-04-03 14:04:25 +02:00
Joan Sanchez e433828f7c Merge branch 'master' into dev 2019-04-03 11:55:18 +02:00
Joan Sanchez 892e267a16 fixed worker calendar total holidays #1299 2019-04-03 11:36:10 +02:00
Joan Sanchez f337799e39 tests & refactor calendar component #811 2019-04-03 11:34:58 +02:00
Carlos Jimenez Ruiz 570e2b5732 #1243 ticket.log columna worker 2019-04-02 11:04:53 +02:00
Joan Sanchez 6d51ef4187 fixed absence test 2019-04-01 08:56:18 +02:00
Carlos Jimenez Ruiz 14bd970fbc #1265 worker.pbx da error si no tiene extensión 2019-03-29 10:51:02 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268 2019-03-26 12:05:53 +01:00
Bernat 4e1e3bdeeb cau 10270 refactor fixtures and fix test 2019-03-26 10:25:11 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Joan Sanchez c5e953f922 worker calendar front & back unit tests #1248 2019-03-22 12:51:44 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147 2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz d7d8bff92b #1196 worker.descriptor correo 2019-03-15 12:58:26 +01:00
Gerard 5fcb9f61ab Merge branch 'master' into test 2019-03-13 16:09:14 +01:00
Gerard 0a95f1b299 #1229 general search of worker searckpanel now searchs users 2019-03-13 16:08:04 +01:00
Joan Sanchez 92170c34d5 worker department #1133 2019-03-12 15:04:09 +01:00
Gerard 3afedbd89b merge 2019-03-11 08:02:06 +01:00
Gerard f6eb8315a3 #999 worker.index buscador 2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz 78103137bb Test #1221 e2e worker.pbx 2019-03-08 14:46:01 +01:00
Carlos Jimenez Ruiz aceecd9c7a Tarea #1197 worker.centralita 2019-03-08 09:41:53 +01:00
Carlos Jimenez Ruiz 1e89b6977a #1070 Renombrar columnas de la vista vn.worker 2019-02-27 13:10:26 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge 2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +01:00
Joan Sanchez 20843a9068 updated module worker acl, removed fi from summary 2019-02-20 09:59:39 +01:00
Joan Sanchez 40d765adc1 removed fi from worker module 2019-02-20 09:16:19 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker 2019-02-19 15:09:50 +01:00
Carlos Jimenez Ruiz 2d2ce304b5 merge 2019-02-19 08:16:36 +01:00
Gerard 3adc035cab #1121 worker.descriptor 2019-02-18 12:54:33 +01:00
Carlos Jimenez Ruiz b034a8fab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 15:33:11 +01:00
Javi Gallego 7f7f47d861 bug no results duplicado 2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Juan Ferrer 1dbb75a1b8 vnSideMenu, vnBackground, style fixes 2019-02-05 09:13:15 +01:00
Juan Ferrer 3f08ab1b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-01 11:06:39 +01:00
Juan Ferrer e63e4319cd Worker module fixes 2019-02-01 09:31:01 +01:00
Carlos Jimenez Ruiz d109e480a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-31 14:14:52 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Bernat 19cfa1ab75 upadte structure db and models 2019-01-31 09:12:29 +01:00
Juan Ferrer f643261a85 Styles fixed, change language moved to user config popover 2019-01-31 00:33:43 +01:00
Juan Ferrer 1dc8cafc73 Style & translation fixes 2019-01-30 23:47:06 +01:00
Juan Ferrer 259079b051 Translations fixed 2019-01-30 14:13:47 +01:00
Juan Ferrer 84737a0bb9 #997 worker.summary, bugs fixed 2019-01-30 13:32:25 +01:00
Juan Ferrer 7893c784aa #997 worker summary 2019-01-29 21:45:43 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Juan Ferrer 3e40c651af #998 worker.index 2019-01-28 16:24:45 +01:00