Commit Graph

15849 Commits

Author SHA1 Message Date
Daniel Maya 61343313d3 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: de65f005e7afad749058961558702fb98e41bbd6
2019-04-05 14:51:47 +02:00
Daniel Maya 633ccc5f10 Update visual console view
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
2019-04-05 14:51:28 +02:00
Alejandro Gallardo Escobar 992209f5bb Visual Console Refactor: added the module and custom graph model
Former-commit-id: 6756f9f4b9fb9803b7a91acb8e388d19d39a0b6f
2019-04-05 14:16:50 +02:00
Alejandro Gallardo Escobar 55b9c07d63 Visual Console Refactor: error fixes
Former-commit-id: 758cd06bfd322a0c409ddf512230fdc1473d54c9
2019-04-05 14:16:18 +02:00
Alejandro Gallardo Escobar 4a3eaca1cd Visual Console Refactor: added the ability to connect to the metaconsole's node to a pair of models
Former-commit-id: b798747314a3ce92a2428114cda19ffa6063e3cf
2019-04-04 19:26:10 +02:00
Alejandro Gallardo Escobar 0f8c275ed1 Visual Console Refactor: added the status image to the group model
Former-commit-id: 80da05ae95ed87d4c7323594ada9e70c62f27501
2019-04-04 19:25:27 +02:00
Alejandro Gallardo Escobar eb1e505a79 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: cae1d1fbf8efb664d5042877d63584c4699801ab
2019-04-04 17:07:15 +02:00
Alejandro Gallardo Escobar 5fb1ae0f44 Visual Console Refactor: great improvements into the Percentile model
Former-commit-id: 0988ae35202834d0dfc91bcd4870dff478a5d73e
2019-04-04 17:04:54 +02:00
Alejandro Gallardo Escobar 418d73b003 Visual Console Refactor: error fixes
Former-commit-id: 5cfe645c4b02e84b9b2e9056747419bf144b0594
2019-04-04 17:03:56 +02:00
Alejandro Gallardo Escobar ead487b24b Visual Console Refactor: add a new util function
Former-commit-id: 8b6266651ac81fcdd18a12b71f3f316eb246277a
2019-04-04 17:02:48 +02:00
Daniel Maya a033149a2f fixed problems with test
Former-commit-id: 7897203e3ba020fdda8b06fd82a53d18bd91aaa1
2019-04-04 16:08:50 +02:00
Daniel Maya de750bb59f Merge branch 'visual-console-refactor' into 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
#   pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
#   pandora_console/tests/Functional/Models/VisualConsole/Items/ColorCloudTest.php
#   pandora_console/tests/Functional/Models/VisualConsole/Items/LabelTest.php

Former-commit-id: 4ef35ceb24d2cde4b3d18f92ea14ea617fcba2cd
2019-04-04 10:10:26 +02:00
Alejandro Gallardo Escobar 1f8d115130 Visual Console Refactor: finished the color cloud model
Former-commit-id: a8a98ba44a459044e9f262d6dc062bde64743406
2019-04-03 17:46:43 +02:00
Alejandro Gallardo Escobar adc0f3c21b Visual Console Refactor: minor changes
Former-commit-id: a36d3901f79bb8342dc22e27946a2bb1798ce41c
2019-04-03 17:46:19 +02:00
Alejandro Gallardo Escobar 77ab7cad40 Visual Console Refactor: improved the sorting of the the model's data
Former-commit-id: 3f5fb074fa0839cc207605f92b54cd2af9d16a8a
2019-04-03 17:45:56 +02:00
Alejandro Gallardo Escobar 5ff1a9059a Visual Console Refactor: added the label model
Former-commit-id: d1c26e023fd9c75f3ae9ab0f068e301b1e71d701
2019-04-03 15:18:29 +02:00
Alejandro Gallardo Escobar 3df4c08782 Visual Console Refactor: error fixes
Former-commit-id: 01d70e83426c5eb21b2184190d6c2a39111a1c75
2019-04-03 14:46:49 +02:00
Alejandro Gallardo Escobar 3afe6f8d3a Visual Console Refactor: added the status image to the static graph item
Former-commit-id: 26560bf06dd8a88e8b24beed3244b030a94268b9
2019-04-03 13:19:50 +02:00
Alejandro Gallardo Escobar bd90bbd922 Visual Console Refactor: WIP percentile item
Former-commit-id: 1d852fb5dff28411aeda60431d8032e77159ea5d
2019-04-03 12:12:05 +02:00
Alejandro Gallardo Escobar 32ba3aa1d4 Visual Console Refactor: error fix
Former-commit-id: f627143575317076eb9998f7e09029c3063870ca
2019-04-03 12:11:13 +02:00
Alejandro Gallardo Escobar 24d8964fd9 Visual Console Refactor: added a system to abstract the html validation, extraction and encoding
Former-commit-id: d53b9fba38b1a57f2c00c627b30d6a3f2d8e64ef
2019-04-03 12:07:48 +02:00
Alejandro Gallardo Escobar ca4997fd7f Visual Console Refactor: fixed the events history model
Former-commit-id: 9228339af7213996fb969ee631a93a3e972e102a
2019-04-03 11:40:40 +02:00
Alejandro Gallardo Escobar eb6757e91c Visual Console Refactor: fixes
Former-commit-id: c9ae864cba26c6085e4e7390db26e32204ec7397
2019-04-03 11:25:35 +02:00
Alejandro Gallardo Escobar eb17b01adc Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 357f606489e6328157f6090484f0141914bbc482
2019-04-03 10:30:15 +02:00
Alejandro Gallardo Escobar 0dca571e2d Visual Console Refactor: minor fix
Former-commit-id: aaa840b7145ff0a449ab31f850095ca5574761e1
2019-04-03 10:28:41 +02:00
Alejandro Gallardo Escobar b7ed6f9a7b Visual Console Refactor: refactores the SimpleValue model and added value retrieval
Former-commit-id: 97ef5c92852b8fc5fd7f71e960f947d22222abcd
2019-04-03 10:28:07 +02:00
Alejandro Gallardo Escobar 8e89f07961 Visual Console Refactor: changed some functions from instance to static
Former-commit-id: 64fdb9086b5028570fea02de1bbe5e8c22e45c08
2019-04-03 10:27:22 +02:00
Daniel Maya db30a8650e Added visual_console_view
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
Daniel Maya 5670157e06 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: a97cbb6723fb51b583c98af381bfd92f1a1413f2
2019-04-02 17:26:27 +02:00
Alejandro Gallardo Escobar 62792c078f Visual Console Refactor: refactored the events history item to return its HTML representation
Former-commit-id: 8b29503a24b1877c645a3b9856d09ee2db947f99
2019-04-02 13:00:49 +02:00
Alejandro Gallardo Escobar 6c53833484 Visual Console Refactor: changed the visibility of a pair of functions
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
2019-04-02 13:00:03 +02:00
Daniel Maya 92408f2ac1 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: fb37c8e84e264cd27158a481774c3712650df647
2019-04-01 16:11:49 +02:00
Daniel Maya 07e464d52b Merge branch 'develop' into visual-console-refactor
Former-commit-id: c986c2d40359b2d35808037b857ae931becf7e91
2019-04-01 16:04:20 +02:00
artica 2d26a74f9e Auto-updated build strings.
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
artica 69df187ae5 Auto-updated build strings.
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
Daniel Maya 4893c78f77 Added the label and colorcloud classes
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
artica 2a96b610d9 Auto-updated build strings.
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
Daniel Maya 58f6fac29e Added colorCloud and changes in clock item
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +01:00
Daniel Maya 4c08987ece Merge branch 'develop' into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
Former-commit-id: f235e3324cbf60afc015a870b9464b6bcf7bd89a
2019-03-28 09:52:14 +01:00
artica 98a9c62de9 Auto-updated build strings.
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
fbsanchez 086ee0620e minor fix
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
fbsanchez 128a97d254 fix mr 26
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
fbsanchez 144cf1177d fix tasklist map
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
fbsanchez 66b2102052 Merge remote-tracking branch 'origin/develop' into fix/mr
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
fbsanchez 6ebbe54448 minor fix
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
fbsanchez 160a72d780 Merge branch 'fix/delete' into 'develop'
errata fix

See merge request artica/pandorafms!2303

Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059
2019-03-27 16:51:19 +01:00
fbsanchez 2dd427100e errata fix
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
artica 74cb6970dc Updated version and build strings.
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
alejandro-campos 082e5f06d6 fix pandora logo image path
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
2019-03-27 16:26:47 +01:00
Daniel Rodriguez f7cf7c65ac Merge branch 'fix/menu' into 'develop'
minor fix menu

See merge request artica/pandorafms!2300

Former-commit-id: d40a7d3a84f1de2de7283ff134bc720ed14a59ca
2019-03-27 16:00:56 +01:00