Commit Graph

218 Commits

Author SHA1 Message Date
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Daniel Cebrian 4d08ca57b4 #10129 fixed Circular progress bar name 2023-01-12 09:55:07 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
alejandro.campos@artica.es 5b5694c5f6 fixed conflicts 2023-01-09 10:49:11 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
daniel c32483a38a phpchartjs pandora_enterprise#9554 2022-12-23 11:34:35 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
alejandro.campos@artica.es 79e9597dd5 implemented alert warning in visual consoles 2022-12-13 12:03:13 +01:00
Daniel Barbero 5f91d2b077 new chart chartjs pandora_enterprise#9554 2022-12-13 09:11:29 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
alejandro.campos@artica.es c45d588ca6 fixed several bugs 2022-12-02 10:42:34 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
Daniel Barbero Martin 28232f7c49 enable link item icon for default CV pandora_enterprise#8569 2022-03-21 15:43:25 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Daniel Maya cc7efec98a #8412 Fixed item group 2022-01-28 13:58:57 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
fbsanchez d8d5bb3a21 php8 vc review 2022-01-13 12:16:39 +01:00
fbsanchez edd24cd388 php8 vc context fixes 2022-01-13 11:47:49 +01:00
fbsanchez a728d384d7 php8 vc moved static created method to Model instead Item (for lines) 2022-01-13 11:43:33 +01:00
fbsanchez a1546ba080 vc php8 review 2022-01-13 10:47:53 +01:00
fbsanchez a58c6862e1 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:19 +01:00
fbsanchez 8e5a0917ba php8 review + pdf images b64 fix 2022-01-12 19:43:33 +01:00
Daniel Rodriguez cd073ef4e3 Merge branch 'ent-8263-Fallo-interpretacion-grupos-en-Consola-Visual' into 'develop'
Ent 8263 fallo interpretacion grupos en consola visual

See merge request artica/pandorafms!4550
2022-01-11 15:39:43 +00:00
fbsanchez c7b3a63288 vc php8 2022-01-11 14:48:44 +01:00
Daniel Maya f5e165f253 Fixed alert fired 2022-01-10 15:26:07 +01:00
Daniel Maya be587c5294 #8207 Fixed group item 2021-12-03 10:38:27 +01:00
Daniel Maya cfd2fe390e #8263 Fixed status group 2021-11-24 11:40:24 +01:00
Daniel Rodriguez a6fc887613 Merge branch 'ent-8041-Bug-en-item-Module-graph-CV-creados-desde-wizard' into 'develop'
Ent 8041 bug en item module graph cv creados desde wizard

See merge request artica/pandorafms!4471
2021-11-15 11:21:44 +00:00
Daniel Maya 9792e64ed5 #8209 Fixed odometer 2021-10-29 14:35:57 +02:00
Daniel Maya 9976783266 #8041 Fixed module graph height 2021-10-15 11:43:43 +02:00
marcos 7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop'
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
2021-10-01 12:48:09 +00:00
Daniel Maya eb4277f4bd #7273 Fixed background and value 2021-10-01 13:13:33 +02:00
Daniel Maya 574098e4ee #8062 Fixed custom graph in metaconsole 2021-09-29 16:20:18 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya aef3e8affd #8013 Fixed percentile 2021-09-20 17:51:56 +02:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
marcos 197ae303e2 reduce longer module name on odometers VC 2021-09-03 14:59:39 +02:00
Daniel Maya f1f7291b5e Added basic chart 4 2021-08-04 11:11:28 +02:00
Daniel Maya 318edda041 Added basic chart 3 2021-08-03 15:46:01 +02:00
Daniel Maya 71fc8bd6e3 Added basic chart 2 2021-07-16 14:18:06 +02:00
Daniel Maya 3d3251bdc1 resolved conflict 2021-07-12 16:49:11 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
Daniel Maya 2b5c5f0cce Fixed height 2021-07-08 09:41:49 +02:00