Commit Graph

1185 Commits

Author SHA1 Message Date
danielmaya 392d4e7aad Fixed lost id_agent in visual console 2018-10-15 15:05:47 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
Fermin 1278f03fd9 [Tags performance] agents_get_modules misc checks 2018-10-04 19:08:01 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
vgilc 46830a4cbe Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop'
fixed issue with string data in visual map

See merge request artica/pandorafms!1811
2018-10-03 09:31:02 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc a7421fc385 Merge branch '1805_Campo_vacio_Informes_personalizados' into 'develop'
Added title in custom reports

See merge request artica/pandorafms!1632
2018-10-01 15:15:38 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
alejandro-campos 3f046441f0 Changed custom graph item insertion and deletion to fix bug when sorting elements in list 2018-09-19 10:06:57 +02:00
Alejandro Gallardo Escobar e5ff2b956c Bugfixes 2018-09-18 15:33:14 +02:00
tatiana.llorente@artica.es d652a9c942 Created function that adds class checkselected and added inputs to select all in several tables - #2429 2018-09-13 16:07:40 +02:00
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
Alejandro Gallardo Escobar c20942f425 Now the status calculation can be configured for every visual console item 2018-09-05 15:25:19 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
danielmaya fd27b6d445 Fixed issue with timezone in visual console editor 2018-09-03 14:43:21 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
daniel c78ac2f4d5 fixed minor error 2018-08-02 13:07:40 +02:00
daniel c3413bbf62 fixed minor error 2018-08-02 13:06:43 +02:00
daniel 9d5004efbf fixed minor error 2018-08-02 11:07:22 +02:00
daniel ef2ff49504 mv enterprise visual console template 2018-08-02 11:03:13 +02:00
daniel d5f0429390 mv enterprise templates visual console 2018-08-02 10:57:00 +02:00
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +02:00
daniel 2a7e710b9e fixed errors in template wizar visual console 2018-08-01 13:51:45 +02:00
daniel 62d2b509ad fixed minor error 2018-08-01 13:21:04 +02:00
daniel dc56e0712c delete template visual console 2018-08-01 13:20:20 +02:00
daniel 49aeb349eb create form templates visual console 2018-08-01 13:10:10 +02:00
daniel 92911e8fb8 fixed js wizard template visual console 2018-08-01 12:24:27 +02:00
daniel 333e5c874c create template visual console 2018-08-01 11:52:20 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00
samucarc 2b11d8cd7c Added title in custom reports 2018-07-25 13:48:02 +02:00
vgilc 49ed21b93d Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms3' into 'develop'
Reverse changes for non-administrators users

See merge request artica/pandorafms!1603
2018-07-09 08:54:03 +02:00
manuel.montes 0d7acdc574 Reverse changes for non-administrators users 2018-07-06 12:02:34 +02:00
manuel.montes 9f9728fd03 Reverse changes for non-administrators users 2018-07-06 10:22:57 +02:00
manuel.montes 54a74c43d0 Remove the 'All Groups' option in non-administrators users 2018-07-03 13:11:00 +02:00
slerena c0cd577fb4 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop'
Fixed bug in pandorafms

See merge request artica/pandorafms!1523
2018-06-25 19:05:26 +02:00
slerena 053f037d0d Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop'
Changed permission AW for VR in visual console

See merge request artica/pandorafms!1537
2018-06-25 19:01:21 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya 9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
manuel.montes bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop'
New graph thermometer - #2214

See merge request artica/pandorafms!1465
2018-06-04 10:19:21 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop'
Fixed sources in log report

See merge request artica/pandorafms!1508
2018-06-04 10:17:17 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
fermin831 597e702e13 [Visual console] Removed show all advanced options in all elements and add its options to donut graphs 2018-05-08 18:50:14 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
fermin831 3a47c3a8fb [Visual console] Update position when change advanced options 2018-04-17 19:08:30 +02:00
fermin831 a190bd992b [SLA] Modified availability SLA to include priority modes 2018-04-16 12:25:02 +02:00
fermin831 9a55ee7d2a [SLA] Added priority mode to report style (only interface) 2018-04-12 15:42:53 +02:00
enriquecd 5418bbd099 Fix reports made by wizard - #2098 2018-03-28 18:54:15 +02:00
fermin831 0c3b6fbf83 [Visual console] Fixed icon preview 2018-03-14 10:25:27 +01:00
enriquecd 80fb004c96 Fix visual console list groups filter - #2011 2018-03-06 17:07:02 +01:00
fermin831 af6f251995 [ACL] Now only RM can delete custom graphs 2018-03-02 13:14:48 +01:00
vgilc 2b2c99cc42 Merge branch 'ent-1941-sql-charts' into 'develop'
Ent 1941 sql charts

See merge request artica/pandorafms!1331
2018-03-02 10:15:03 +01:00
fermin831 d7cbcd012f [SQL Graph reports] Added dynamic height configuration option 2018-03-02 09:27:29 +01:00
fermin831 6e62f4c023 [SQL Graphs] Added Max items form to top_n_value db column 2018-03-01 15:55:58 +01:00
enriquecd 095a703c6c Fix pagination in visual console list - #1994 2018-03-01 15:50:34 +01:00
enriquecd 38c6099664 Fix advanced options section in donut grpahs of visual consoles - #1899 2018-03-01 10:39:54 +01:00
vgilc 3f7e6f7ed3 Merge branch 'ent-1964-5331-error-de-ACLs-en-custom-graphs' into 'develop'
Ent 1964 5331 error de ac ls en custom graphs

See merge request artica/pandorafms!1315
2018-02-26 10:31:22 +01:00
fermin831 3b19d34bdc pandora_console/godmode/reporting/create_container.php 2018-02-26 10:12:29 +01:00
danielmaya a386fc9441 Fixed SQL report 2018-02-22 17:38:13 +01:00
danielmaya a801ba4ac8 Fixed issue with copy and delete visual console 2018-02-13 11:40:43 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
	pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop'
Added type graph selection in container graph

See merge request artica/pandorafms!1113
2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
vgilc 160daa836c Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
2018-02-05 15:55:56 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola
Conflicts:
	pandora_console/include/functions_users.php
2018-01-30 17:56:30 +01:00
vgilc 2a7bcb4bc2 Merge branch '1673-elemento-group-en-modo-show-statistics-no-muestra-cartel-dev' into 'develop'
Fixed group status icon

See merge request artica/pandorafms!1178
2018-01-29 13:30:10 +01:00
vgilc dc5840b844 Merge branch '1736-Consola-visual-Previsualización-background-no-carga-imagen-en-meta-dev' into 'develop'
Fixed background preimage in visual console

See merge request artica/pandorafms!1243
2018-01-29 13:23:46 +01:00
vgilc 9d4521e5e5 Merge branch '1374-Nombre-predeterminado-para-custom-graphs-4597-com1' into 'develop'
Show graph name in custom graph items for report list - #1374

See merge request artica/pandorafms!1203
2018-01-29 12:59:22 +01:00
daniel 65615dcf80 Fixed error sql 2018-01-25 10:06:05 +01:00
danielmaya 06a33faec2 Fixed element size of type icon, group and static graph 2018-01-11 15:32:52 +01:00
daniel 638d7ced30 performance improvements in visual console list is called indiscriminately to the function get_acl 2018-01-11 15:25:55 +01:00
danielmaya 88cfb73a78 Fixed background preimage in visual console 2018-01-10 15:33:54 +01:00
daniel 4c908dd8ad fixed minor error in visual console favourite 2018-01-08 17:43:31 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd 8572bc61b3 Show graph name in custom graph items for report list - #1374 2017-12-21 13:33:01 +01:00
vgilc e5c4dc4778 Merge branch '1319-Unsuccessfull-action-open' into 'develop'
Check empty SLA fields on SLA wizar create form - #1319

See merge request artica/pandorafms!1096
2017-12-21 10:52:35 +01:00
vgilc 097bc3df32 Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop'
Added resize functionality to flot graphs and fix overview in container graphs

See merge request artica/pandorafms!1068
2017-12-21 10:46:42 +01:00
vgilc 7938f6e65e Merge branch '1617-Consola-visual-Previsualización-background-no-carga-imagen' into 'develop'
Fix preload background image in visual console builder - #1617

See merge request artica/pandorafms!1090
2017-12-21 10:44:03 +01:00
vgilc 4f0a451ba1 Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop'
1576 permisos sobre gráficas no permite ver graph containers 4863 media open

See merge request artica/pandorafms!1072
2017-12-21 08:59:36 +01:00
vgilc c98e94e59e Merge branch '1626-Fallo-al-clonar-item-de-la-consola-visual-dev' into 'develop'
Fixed copy item in visual console

See merge request artica/pandorafms!1106
2017-12-21 08:56:17 +01:00
danielmaya 14d5bb04c1 Fixed group status icon 2017-12-13 17:10:05 +01:00
enriquecd d0d0f8b229 Fix custom graph builder order bar - #1382 2017-12-13 13:08:41 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
nramon cf01084873 Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop'
Add order items setting bar to graph editor - #1382

See merge request artica/pandorafms!961
2017-11-30 13:12:25 +01:00
Alejandro Gallardo Escobar f49cef9ca4 Merge branch 'develop' into visual-console-agent-link-bug
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-29 14:00:44 +01:00
vgilc 684658d81f Merge branch '1409-Imágenes-en-consolas-visuales---enlace-publico-dev' into 'develop'
Changed convert_urls in tinymce

See merge request artica/pandorafms!931
2017-11-29 13:47:50 +01:00
danielmaya 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +01:00
danielmaya 02d67835bd Fixed copy item in visual console 2017-11-21 17:27:39 +01:00
enriquecd cc737e5120 Check empty SLA fields on SLA wizar create form - #1319 2017-11-20 11:49:13 +01:00
enriquecd 69f44aae13 Fix preload background image in visual console builder - #1617 2017-11-17 12:28:52 +01:00
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
Enrique Camargo 02670bef03 Update visual_console_builder.editor.js 2017-11-15 16:05:34 +01:00
enriquecd 27e7a51006 Fix graph container permissions and graph acl - #1576 2017-11-15 11:31:17 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
fermin831 78ef64ead2 Added resize functionality to flot graphs and fix overview in container graphs 2017-11-14 18:44:29 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop'
Fixed problems with unit

See merge request artica/pandorafms!1027
2017-11-07 11:23:02 +01:00
vgilc 47171418cd Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop'
Modified simple value

See merge request artica/pandorafms!1026
2017-11-07 11:22:28 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
enriquecd f0fe30fc3a Now can create static graphs a group items without images, fix bugs - #1407 2017-11-02 15:54:18 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop'
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
2017-10-31 12:13:55 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop'
655 module data increment new type of report

See merge request artica/pandorafms!519
2017-10-31 08:18:26 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
This reverts merge request !871
2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
enriquecd f4fc23cb64 Merge branch 'develop' into 1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2
Conflicts:
	pandora_console/godmode/reporting/visual_console_builder.editor.js
2017-10-30 15:21:46 +01:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
Arturo Gonzalez 139db28eca Added lost code 2017-10-26 16:13:27 +02:00
vgilc b96b50129c Merge branch '1103-Opciones-copiar-cortar-pegar-editor-de-etiquetas-de-la-consola-visual' into 'develop'
Now the label editor color is changed by the mouse scroll - #1103

See merge request artica/pandorafms!802
2017-10-26 15:48:33 +02:00
Arturo Gonzalez eb99b0a885 Added lost code 2017-10-26 15:37:43 +02:00
Arturo Gonzalez 802cb3ef5e Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 14:41:07 +02:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00