From 633ccc5f10b168808d6a4f0dc86fa1c4ceb133c0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 5 Apr 2019 14:51:28 +0200
Subject: [PATCH] Update visual console view

Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
---
 .../models/VisualConsole/Container.php        | 10 +----
 .../visual_console/visual_console_view.php    | 43 +++++++++++++++++--
 visual_console/src/VisualConsole.ts           |  3 ++
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php
index 14eac30429..b252e02846 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Container.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php
@@ -201,7 +201,7 @@ final class Container extends Model
      *
      * @return array
      */
-    public static function getItemsFromDB(int $id_layout): array
+    public static function getItemsFromDB(int $id_layout): string
     {
         $layout_items = db_get_all_rows_filter('tlayout_data', ['id_layout' => $id_layout]);
         if (!empty($layout_items) === true) {
@@ -220,12 +220,6 @@ final class Container extends Model
                     case SIMPLE_VALUE_MAX:
                     case SIMPLE_VALUE_MIN:
                     case SIMPLE_VALUE_AVG:
-                        $value['value'] = visual_map_get_simple_value(
-                            $value['type'],
-                            $value['id_agente_modulo'],
-                            $value['period']
-                        );
-
                         array_push(
                             $array_items,
                             (string) Items\SimpleValue::fromArray($value)
@@ -319,7 +313,7 @@ final class Container extends Model
             }
         }
 
-        return $array_items;
+        return json_encode($array_items);
     }
 
 
diff --git a/pandora_console/operation/visual_console/visual_console_view.php b/pandora_console/operation/visual_console/visual_console_view.php
index f0cc87af20..6922c972c8 100644
--- a/pandora_console/operation/visual_console/visual_console_view.php
+++ b/pandora_console/operation/visual_console/visual_console_view.php
@@ -141,8 +141,45 @@ if (!is_metaconsole()) {
 use Models\VisualConsole\Container;
 
 $container = (string) Container::fromArray($layout);
-$items = Container::getItemsFromDB($id_layout, $config['homedir']);
+$items = Container::getItemsFromDB($id_layout);
 
-hd($config['homedir']);
+echo '<div id="visual-console-container"></div>';
+
+$dir = $config['homedir'].'/include/visual-console/';
+if (is_dir($dir)) {
+    $dh = opendir($dir);
+    if ($dh) {
+        while (($file = readdir($dh)) !== false) {
+            if ($file !== '.' && $file !== '..') {
+                preg_match('/.*.js$/', $file, $match_js, PREG_OFFSET_CAPTURE);
+                if (!empty($match_js)) {
+                    echo '<script type="text/javascript"
+                    src="'.ui_get_full_url(false, false, false, false).'include/visual-console/'.$match_js[0][0].'"></script>';
+                    continue;
+                }
+
+                preg_match('/.*.css$/', $file, $match_css, PREG_OFFSET_CAPTURE);
+                if (!empty($match_css)) {
+                    echo '<link rel="stylesheet" type="text/css" media="screen"
+                    href="'.ui_get_full_url(false, false, false, false).'include/visual-console/'.$match_css[0][0].'" />';
+                }
+            }
+        }
+
+        closedir($dh);
+    }
+}
+
+echo '<script type="text/javascript">';
+    echo 'var container = document.getElementById("visual-console-container");';
+    echo 'var props = '.$container.';';
+    echo 'var items = '.$items.';';
+echo '</script>';
+
+?>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var visualConsole = new VisualConsole(container, props, items);
+    });
+</script>
 
-hd($items);
diff --git a/visual_console/src/VisualConsole.ts b/visual_console/src/VisualConsole.ts
index 806dbb1224..a75e401c28 100644
--- a/visual_console/src/VisualConsole.ts
+++ b/visual_console/src/VisualConsole.ts
@@ -76,6 +76,9 @@ export function visualConsolePropsDecoder(
 // TODO: Document.
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function itemInstanceFrom(data: UnknownObject) {
+  if (typeof data === "string") {
+    data = JSON.parse(data);
+  }
   const type = parseIntOr(data.type, null);
   if (type == null) throw new TypeError("missing item type.");