Commit Graph

416 Commits

Author SHA1 Message Date
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
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 13:01:06 +02:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 10:09:24 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez bc7c288742 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:03:55 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Joan Sanchez 59e90c2c10 Removed commented block
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:58:39 +02:00
Joan Sanchez de30a2d978 Total holidays fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 08:09:53 +02:00
Joan Sanchez a72010554c Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:00 +02:00
Joan Sanchez 3f3e5c2735 Unit tests
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Joan Sanchez 8fa64122f8 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
jorgebl 1fd18cae5a QA
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 12:50:07 +01:00
jorgebl 094552e0f2 Added ellipsize and align label
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez 84cef1949b Image size fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:28:58 +01:00
Joan Sanchez dea858c314 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:12:37 +01:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:07:13 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +01:00
Joan Sanchez dd29b351d2 Disabled loggable
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 14:25:01 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 13:52:37 +01:00
Joan Sanchez 6717853efb Updated front tests
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01: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 4d91b26537 checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 13:46:36 +01:00
Carlos Jimenez Ruiz a797a2db8b fixed the absences unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-23 13:34:57 +02:00
Joan Sanchez 3c37f0e993 Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 08:32:31 +00:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Joan Sanchez 71e29e747a Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 14:45:39 +02:00
Joan Sanchez d0ece57219 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:09:36 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Joan Sanchez 58965a9687 Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 07:38:43 +02:00
Joan Sanchez d2dbf417f4 Updated to standard color
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors
gitea/salix/pipeline/head This commit looks good Details
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
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 03a0a22526 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:53:47 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 07:59:27 +02: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 a3d3ed4aba Fixed unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 14:14:34 +02:00
Joan Sanchez 540d5e9e71 Fixed errors
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:50:08 +02:00
Joan Sanchez b50b30c792 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:44:57 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +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 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
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 a07d960a2e Fixed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 11:59:16 +02:00
Joan Sanchez 87fa66fe8c Updated methods description
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:45:44 +02:00
Joan Sanchez bbf3b72001 Added front & back tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 10:04:16 +02:00