Commit Graph

379 Commits

Author SHA1 Message Date
Paola 208c85d73a arreglo de fix 2021-08-01 22:14:30 -06:00
Eduardo Quiros 417c5ef33e
Merge branch 'dev' of github.com:Quantum-P3/datasurvey into feature/US-45 2021-08-01 21:59:16 -06:00
Pablo Bonilla 1a15f686f0
Merge branch 'dev' into feature/US-36 2021-08-01 21:42:20 -06:00
Pablo Bonilla 994daddd7c
Remove test 2021-08-01 21:33:26 -06:00
Pablo Bonilla a503db206a
Add preview of survey templates 2021-08-01 21:21:49 -06:00
Pablo Bonilla 55c58358ff
Merge branch 'dev' into fix/templates-register 2021-08-01 20:36:01 -06:00
Pablo Bonilla 7cf2ac0e3e
Fix survey template register validations 2021-08-01 20:17:50 -06:00
Mariela Bonilla 24cb50d483 eliminar opcion vacia de seleccionar rol 2021-08-01 19:09:47 -06:00
Mariela Bonilla af8394b222 validaciones y fix mensajes de correos 2021-08-01 19:05:42 -06:00
Mariela Bonilla 7545affd77 Merge branch 'dev' into feature/US-43 2021-08-01 18:14:09 -06:00
Mariela Bonilla 391c4fcb29 add agregar colaborador completo 2021-08-01 18:13:17 -06:00
Pablo Bonilla f8c15583ea
Merge branch 'dev' into feature/US-30 2021-08-01 16:23:18 -06:00
Pablo Bonilla f7eaccfca9
Merge branch 'dev' into feature/US-30 2021-08-01 16:20:28 -06:00
Pablo Bonilla 085d5a16a6
Add publish and delete survey template to/from the store 2021-08-01 16:18:53 -06:00
Mariela Bonilla b649ac4d4e Merge branch 'feature/US-65' into feature/US-43 2021-08-01 16:17:12 -06:00
Mariela Bonilla b72b286939 Merge branch 'feature/US-63' into feature/US-65 2021-08-01 16:05:45 -06:00
Mariela Bonilla e1d11a5bea add filtro por estado 2021-08-01 16:04:33 -06:00
Mariela Bonilla daa7f28d1a Merge branch 'dev' into feature/US-63 2021-08-01 15:32:22 -06:00
Eduardo Quiros 723bb6d2dc
Merge pull request #101 from Quantum-P3/feature/US-58
Feature/us 58
2021-08-01 21:29:44 +00:00
Mariela Bonilla 4e661cb10f Merge branch 'dev' into feature/US-63 2021-08-01 15:27:51 -06:00
Mariela Bonilla d038ebb819 add agregar colaborador 2021-08-01 15:25:27 -06:00
Paola 0a27c8d2db arreglar tamanno botones 2021-08-01 14:16:31 -06:00
Eduardo Quiros 4eefa86ffb
arreglar test de completar 2021-08-01 14:00:24 -06:00
Eduardo Quiros 4f43f4f4cc
arreglar test 2021-08-01 13:53:59 -06:00
Pablo Bonilla 0943a984ca
Merge branch 'dev' into feature/US-33 2021-08-01 13:14:40 -06:00
Paola c5507dc2a7 arreglo merge conflict 2021-08-01 12:23:37 -06:00
Mariela Bonilla b068359da6 add modal add colaborador 2021-08-01 12:18:00 -06:00
Paola 9d310922e2 agregar boton y dialog de finalizar encuesta 2021-08-01 12:15:26 -06:00
Eduardo Quiros bcfd54d72a
corregir nombramiento de componente de completar encuestas 2021-08-01 12:14:21 -06:00
Eduardo Quiros e2e83e4cb5
agregar dialogo para confirmación de contraseña 2021-08-01 03:16:18 -06:00
Mariela Bonilla 884a06f6dd change test 2021-08-01 01:29:53 -06:00
Eduardo Quiros 778aa72837
generar dialogo para contraseña de encuesta 2021-08-01 01:12:04 -06:00
Pablo Bonilla f8ab8ac0dd
Merge branch 'dev' into feature/US-33 2021-08-01 01:04:39 -06:00
Pablo Bonilla 089174935d
Remove tests 2021-08-01 01:04:15 -06:00
Pablo Bonilla 47f940dcaa
Add survey template question and options registration 2021-08-01 00:54:44 -06:00
Paola cbdaa03224 modificacion de botones compartir 2021-08-01 00:43:30 -06:00
Mariela Bonilla 9d59fc2346 add validaciones de permisos en las encuestas por rol de colaborador 2021-08-01 00:36:35 -06:00
Paola 45dffde982 arreglo share button 2021-08-01 00:16:06 -06:00
Paola b19757ff71 agreacion de botones compartir encuesta 2021-08-01 00:06:59 -06:00
Pablo Bonilla eb74718af3
Update survey template list 2021-07-31 22:52:17 -06:00
Mariela Bonilla a9f2e0b2a3 cambiar nombre id en html de eliminar colaborador dialog 2021-07-31 21:57:36 -06:00
Pablo Bonilla bc8ef1941b
Add register survey template 2021-07-31 21:53:35 -06:00
Mariela Bonilla a4df983b4f cerrar el modal del editar justo despues de eliminar al colaboradora 2021-07-31 21:36:57 -06:00
Mariela Bonilla 2b51cacb7a Merge branch 'dev' into feature/US-63 2021-07-31 21:14:50 -06:00
Eduardo Quiros b708f7e0c8
agregar pagina inicial para completar encuesta 2021-07-31 19:08:34 -06:00
Mariela Bonilla e5da2970f2 add eliminar colaborador de encuesta completo 2021-07-31 19:00:08 -06:00
Eduardo Quiros 988a1ca3ff
agregar componente de completar 2021-07-31 18:27:00 -06:00
Mariela Bonilla 7cba3ac321 Merge branch 'dev' into feature/US-62 2021-07-31 01:26:37 -06:00
Mariela Bonilla 0d04c8d80c fix texto de boton de cancelar 2021-07-31 01:26:17 -06:00
Mariela Bonilla c3b03ee372 fix update rol de colaboradores 2021-07-31 01:25:31 -06:00
Paola cf847e55f0 agregar carpeta compartir 2021-07-30 23:02:54 -06:00
Pablo Bonilla fb1a399694
Add edit question name 2021-07-30 01:34:25 -06:00
Mariela Bonilla 089f508fa7 Merge branch 'dev' into feature/US-62 2021-07-30 00:29:58 -06:00
Mariela Bonilla 8efb844612 add modificar rol de colaborador 2021-07-30 00:21:31 -06:00
Eduardo Quiros 2a77c017fa
Merge pull request #95 from Quantum-P3/feature/US-31
Feature/us-31: listar plantillas para administrador
2021-07-30 06:08:09 +00:00
Eduardo Quiros 0a774fc110
remover columnas innecesarias 2021-07-29 22:50:38 -06:00
Eduardo Quiros 14ec57ab12
corregir uso de inglés en html 2021-07-29 22:50:21 -06:00
Eduardo Quiros e1cf432fc3
agregar estilos de botones 2021-07-29 22:49:50 -06:00
Eduardo Quiros d93378c56f
declarar no uso de index en trackid 2021-07-29 22:33:00 -06:00
Pablo Bonilla e615cb9d7c
Merge branch 'dev' into feature/US-60 2021-07-29 22:31:22 -06:00
Pablo Bonilla 6f0ea69a27
Add edit survey from survey list 2021-07-29 22:15:36 -06:00
Mariela Bonilla 119290ecfa Merge branch 'dev' into feature/US-61 2021-07-29 21:21:27 -06:00
Mariela Bonilla 34c1076813 fix de del forbidden de la lista de encuesta y la fecha de vista previa 2021-07-29 20:17:16 -06:00
Pablo Bonilla 300f20affd
Add update survey 2021-07-29 02:10:39 -06:00
Mariela Bonilla 67a536989e add icono para agregar colaborador 2021-07-29 01:01:43 -06:00
Mariela Bonilla 4a1393f804 Merge branch 'dev' into feature/US-61 2021-07-28 21:00:29 -06:00
Mariela Bonilla d4cda420de add mostrar colaboradores de una encuesta 2021-07-28 01:08:11 -06:00
Pablo Bonilla 26af353c3b
Remove view button from user list 2021-07-27 23:39:28 -06:00
Pablo Bonilla b0c994bc42
Fix delete user survey 2021-07-27 23:01:53 -06:00
Paola 07920751ff arreglo de estilos en landing y encuestas 2021-07-27 01:08:10 -06:00
Mariela Bonilla eb31ed41dd add filtrar colaboracion por estado 2021-07-27 00:59:15 -06:00
Mariela Bonilla 3ce87a9c4c add listar colaboraciones de un usuario 2021-07-27 00:09:01 -06:00
Pablo Bonilla 7f534ee129
Merge branch 'dev' into fix/edit-duplicate-survey 2021-07-26 15:01:36 -06:00
Pablo Bonilla 6e7264b813
Add duplicate survey 2021-07-26 14:40:21 -06:00
Pablo Bonilla 3695c037b2
Add title and subtitle for categories and users 2021-07-26 13:21:18 -06:00
Pablo Bonilla 72c07e2bbf
Add duplicate button and fix delete button in survey list 2021-07-26 02:37:14 -06:00
Pablo Bonilla 306a2a0aaf
Update preview survey button position 2021-07-26 02:24:42 -06:00
Paola dbf3551101 merge 2021-07-26 01:07:03 -06:00
Paola 39b355425d arreglo presentacion tabla 2021-07-26 01:01:02 -06:00
Pablo Bonilla 2b1c62a013
Add edit survey functionality in context menu 2021-07-26 00:55:41 -06:00
Eduardo Quiros 6262989496
Merge pull request #75 from Quantum-P3/fix/sprint-3/US-23
arreglar servicio de encuestas
2021-07-26 06:30:28 +00:00
Eduardo Quiros d02a2fd267
Merge pull request #74 from Quantum-P3/fix/design-dialog-table 2021-07-26 06:21:28 +00:00
Eduardo Quiros 3439dcd202
arreglar servicio 2021-07-26 00:19:50 -06:00
Paola e5b23ac988 arreglo de alerta en publish 2021-07-26 00:12:50 -06:00
Mariela Bonilla ad96c0ee3b fix event dataset 2021-07-26 00:12:07 -06:00
Mariela Bonilla d6e1d32287 fix conflicts 2021-07-26 00:00:03 -06:00
Mariela Bonilla 54f4e2877c fix update encuesta 2021-07-25 23:42:12 -06:00
Mariela Bonilla b42ea0ad5a Merge branch 'dev' into feature/US-29 2021-07-25 22:59:04 -06:00
Paola e06e8a61dc arreglo validacion fechas min y max 2021-07-25 22:51:53 -06:00
Pablo Bonilla 0e3f49d1d2
Merge branch 'dev' into fix/design-dialog-table 2021-07-25 22:50:43 -06:00
Pablo Bonilla 188fd4bbc9
Fix dialog and tables design, email image size, and filter positions 2021-07-25 22:48:33 -06:00
Eduardo Quiros b248dac2e0
Merge pull request #73 from Quantum-P3/fix/sprint-3/US-23
notificar al usuario cuando un admin elimina su encuesta
2021-07-26 04:46:31 +00:00
Eduardo Quiros fd2391f68d
notificar al usuario cuando un admin elimina su encuesta 2021-07-25 22:19:27 -06:00
Eduardo Quiros a4badf7b7e
corregir tildado de 'fecha creación' 2021-07-25 21:09:03 -06:00
Eduardo Quiros 63c4a69ffe
traer configuracion de la plataforma
para parametrizar los dias minimos de diferencia
2021-07-25 20:20:37 -06:00
Eduardo Quiros 79dc958873
agregar comparacion inicial de fecha final
para evitar que se publique una encuesta con una fecha de finalización
que sea anterior a la fecha actual
2021-07-25 19:20:07 -06:00
Pablo Bonilla d65bd8b8ba
Add information modal for survey parameters 2021-07-25 17:58:59 -06:00
Mariela Bonilla adcb33193a fix estilo radio button 2021-07-25 17:07:09 -06:00
Mariela Bonilla 0eed427dc7 modify estilo radio button 2021-07-25 16:58:46 -06:00
Mariela Bonilla 8bb22a2602 modificaciones de visualizacion en vista previa 2021-07-25 16:48:21 -06:00
Pablo Bonilla 0201e121df
Fix context menu and delete survey bug (email) 2021-07-25 16:41:40 -06:00
Pablo Bonilla 577ae0e7ee
Remove edit survey publish survey button 2021-07-25 14:58:57 -06:00
Pablo Bonilla 0509b735ce
Fix list validation bug 2021-07-25 14:37:51 -06:00
Pablo Bonilla 07cd3484f5
Add survey list validations for empty and stateful surveys 2021-07-25 14:25:45 -06:00
Mariela Bonilla 5e441a343f add vista previa 2021-07-25 04:56:18 -06:00
Mariela Bonilla b85442e796 Merge branch 'dev' into feature/US-29 2021-07-25 02:42:16 -06:00
Eduardo Quiros d920ab39dc
Merge pull request #68 from Quantum-P3/fix/survey-contextmenu 2021-07-25 08:34:49 +00:00
Paola fcd87cb635 Arreglo mensajes alerta 2021-07-25 00:34:52 -06:00
Paola 4eec11079f Arreglo encuestas filter 2021-07-24 23:17:30 -06:00
Paola b5de3a3ee6 arreglo alerta categorias 2021-07-24 23:11:16 -06:00
Paola ea7db8269e merge conflict fix 2021-07-24 23:08:44 -06:00
Paola 6663fb729d agreacion contrasenna encuesta y arreglo cache 2021-07-24 22:53:38 -06:00
Pablo Bonilla 9fc9c133b1
Remove survey list error notification 2021-07-24 22:31:12 -06:00
Pablo Bonilla 68e4a27094
Add datasurvey custom filter styles 2021-07-24 22:25:03 -06:00
Pablo Bonilla e90c590f93
Fix survey list context menu 2021-07-24 22:12:50 -06:00
Eduardo Quiros 8c56917d03
Merge branch 'dev' into feature/US-57 2021-07-25 03:30:49 +00:00
Eduardo Quiros bea3cf9115
Merge branch 'dev' into feature/US-27 2021-07-25 03:23:22 +00:00
Pablo Bonilla 6f36c86cee
Merge branch 'dev' into feature/US-57 2021-07-24 21:20:27 -06:00
Pablo Bonilla 6ca152cc85
Change create survey questions tests 2021-07-24 21:18:32 -06:00
Mariela Bonilla 1d7499266a fix conflictos 2021-07-24 21:03:23 -06:00
Mariela Bonilla fdb36ce2d7 Merge branch 'dev' into feature/US-27 2021-07-24 20:42:45 -06:00
Pablo Bonilla 2473ffbc5a
Add create either closed or open question modal form 2021-07-24 20:38:37 -06:00
Mariela Bonilla feb91b1871 fix correo de usuarios 2021-07-24 20:34:40 -06:00
Mariela Bonilla 569b4703d8 Merge branch 'dev' into feature/US-64 2021-07-24 18:52:18 -06:00
Pablo Bonilla 28b291d031
Add delete option confirmation dialog 2021-07-24 18:44:26 -06:00
Mariela Bonilla c94ccc4332 add estilo de card a listar encuesta a usuario 2021-07-24 18:40:48 -06:00
Mariela Bonilla faee58fcec Merge branch 'feature/US-57' into feature/US-29 2021-07-24 18:27:48 -06:00
Pablo Bonilla 0932e0c7b6
Add delete question confirmation dialog 2021-07-24 18:22:37 -06:00
Mariela Bonilla 93de9c8540 Merge branch 'dev' into feature/US-24 2021-07-24 17:30:42 -06:00
Mariela Bonilla 6a79ff975e fix de filtrar encuestas 2021-07-24 17:29:33 -06:00
Mariela Bonilla 7d61742e40 cambios de html despues de merge 2021-07-24 16:52:36 -06:00
Mariela Bonilla 3ae0019c99 Merge branch 'dev' into feature/US-24 2021-07-24 16:30:54 -06:00
Mariela Bonilla dd13d33f8c Merge branch 'dev' into feature/US-64 2021-07-24 16:02:13 -06:00
Mariela Bonilla 1acd33b5b5 Merge branch 'dev' into feature/US-27 2021-07-24 16:01:43 -06:00
Mariela Bonilla 017fdd9c0b Merge branch 'dev' into feature/US-29 2021-07-24 15:57:10 -06:00
Mariela Bonilla 9b5eefe38a Merge branch 'dev' into feature/landing-page 2021-07-24 15:11:50 -06:00
Mariela Bonilla a5b49c3959 Revert "Merge branch 'feature/landing-page' into dev"
This reverts commit 4a79244727.
2021-07-24 15:06:39 -06:00
Mariela Bonilla c4bc0d2d9a add estilos para cards 2021-07-24 15:05:28 -06:00
Pablo Bonilla 4ccf240bd1
Merge branch 'dev' into feature/US-57 2021-07-24 12:52:20 -06:00
Mariela Bonilla 808847f541 add lista de encuestas a landing page, modificaciones para prototipo 2021-07-24 02:49:55 -06:00
Pablo Bonilla 78e58ab69a
Add create question to survey list of questions 2021-07-24 02:10:24 -06:00
Pablo Bonilla 0af94cd9f2
Fix bug in list of survey questions and options 2021-07-23 23:58:25 -06:00
Eduardo Quiros af582345de
filtrar encuestas por nombre con pipe 2021-07-23 23:57:19 -06:00
Paola 3e459cd133 Merge branch 'dev' into feature/US-12 2021-07-23 23:33:40 -06:00
Paola a126a4ae81 fix test 2021-07-23 23:33:32 -06:00
Paola 4d7dd16756 Merge branch 'dev' into feature/US-12 2021-07-23 23:07:40 -06:00
Paola 5e4210bf8e fix test 2.0 2021-07-23 23:03:39 -06:00
Paola 9f2809f61b Merge branch 'dev' into feature/US-41 2021-07-23 23:00:47 -06:00
Paola e5f1770031 fix test 2021-07-23 22:59:31 -06:00
Paola dcd6dfd5ef validaciones publicar encuesta 2021-07-23 22:50:40 -06:00