Commit Graph

558 Commits

Author SHA1 Message Date
Vicent Llopis 9310e92223 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:44:08 +01:00
Vicent Llopis 35b47c6da2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 08:21:59 +01:00
Vicent Llopis 05d91ed50e feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 15:12:25 +01:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +01:00
Joan Sanchez f0b44a2992 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:35:21 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Vicent Llopis 921b5cf3fb add excluded test
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:54:36 +01:00
Vicent Llopis 92a9004d98 fix: borrada propiedad transaction cuando se hace commit 2023-01-19 08:54:26 +01:00
Vicent Llopis 38e4349e17 borrado comentario
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:25:24 +01:00
Vicent Llopis 2c995208d1 fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:23:05 +01:00
Vicent Llopis 7368b572a0 fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:05:02 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Alex Moreno 9c044dc95b fix: phone
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:38:43 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Alexandre Riera 9887f87dd3 refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Alex Moreno bb944f9fee feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 15:05:49 +01:00
Alex Moreno 09edb99a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-12 13:48:06 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Vicent Llopis e3e337c02e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 14:28:47 +01:00
Vicent Llopis 4b54cf954b refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 13:56:21 +01:00
Alex Moreno f70a9cb785 feat(worker_new): use resetPassword funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:46:25 +01:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis bf782c3782 fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:09:09 +01:00
Vicent Llopis e854fd248e feat: add checkInBox 2022-11-23 10:08:58 +01:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Alex Moreno 7a7da9508f feat: workerWelcomeEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:56:30 +01:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 13:57:54 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Vicent Llopis 6858de83a3 feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 14:55:47 +01:00
Vicent Llopis 892094f85c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 12:37:07 +01:00
Vicent Llopis ab739f412f feat: add test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:22:18 +01:00
Alex Moreno 84a5f3986b feat(worker): createWorker refs #4658
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:24:35 +01:00
Vicent Llopis 3243d35bd7 feat: send email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 14:48:37 +01:00
Vicent Llopis 1f2ea2c4d8 fix: incorrect number of params
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:30:08 +01:00
Vicent Llopis 273a8cd7c7 refactor code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:00:32 +01:00
Vicent Llopis b17fe0d18c refator code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 09:55:11 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau 1d8fb25325 Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:25:54 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 11:54:14 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:45:20 +02:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Alex Moreno 798147ea99 jenkins error
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 13:25:57 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 14:17:41 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis a348762153 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:09:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis 2c54f31985 refactor: uppercase
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 10:54:30 +02:00
Vicent Llopis 443db55f58 feat(worker_basic-data): add new fields
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz 7d3f8844cc Merge branch 'dev' into 3637-departments_hasToMistake
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz b27a7ca263 Merge branch 'dev' into 3637-departments_hasToMistake
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:18:13 +00:00
Vicent Llopis 133152460a fix: translate
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:12:47 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:02:48 +01:00
Alex Moreno 0963b66560 fix(worker_calendar): absence in holiday day
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 13:06:17 +01:00