tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added basic chart

This commit is contained in:
Daniel Maya 2021-07-16 14:16:45 +02:00
parent de2c3433f9
commit 71767a3f11
13 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/constants.php
View File

@ -234,6 +234,7 @@ define('CLOCK', 19);
define('COLOR_CLOUD', 20);
define('NETWORK_LINK', 21);
define('ODOMETER', 22);
define('BASIC_CHART', 23);
// Some styles.
define('MIN_WIDTH', 300);
define('MIN_HEIGHT', 120);

6
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -520,6 +520,9 @@ function createVisualConsole(
case "ODOMETER":
type = 22;
break;
case "BASIC_CHART":
type = 23;
break;
default:
type = 0;
}
@ -1240,6 +1243,9 @@ function createOrUpdateVisualConsoleItem(
case 22:
nameType = "Odometer";
break;
case 23:
nameType = "Basic chart";
break;
default:
nameType = "Static graph";

3
pandora_console/include/rest-api/models/VisualConsole/Container.php
View File

@ -389,6 +389,9 @@ final class Container extends Model
case ODOMETER:
return Items\Odometer::class;
case BASIC_CHART:
return Items\BasicChart::class;
default:
return Item::class;
}

4
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -2105,6 +2105,10 @@ class Item extends CachedModel
$text = __('Odometer');
break;
case BASIC_CHART:
$text = __('Basic chart');
break;
default:
// Lines could not be parents.
continue 2;

12
pandora_console/include/rest-api/models/VisualConsole/View.php
View File

@ -523,6 +523,18 @@ class View extends \HTML
}
break;
case BASIC_CHART:
$data['agentId'] = \get_parameter('agentId');
$data['metaconsoleId'] = \get_parameter('metaconsoleId');
$data['agentAlias'] = \get_parameter('agentAlias');
$data['moduleId'] = \get_parameter('moduleId');
$data['period'] = \get_parameter('period');
if ($itemId === 0) {
$data['height'] = 150;
$data['width'] = 300;
}
break;
default:
// Not posible.
break;

13
pandora_console/include/styles/visual_maps.css
View File

@ -426,6 +426,19 @@ input.odometer_min_white[disabled] {
background: url(../../images/odometer.png) no-repeat center;
}
input.basic_chart_min {
background: url(../../images/odometer.png) no-repeat center;
}
input.basic_chart_min[disabled] {
background: url(../../images/odometer.disabled.png) no-repeat center;
}
input.basic_chart_min_white {
background: url(../../images/odometer.disabled.png) no-repeat center;
}
input.basic_chart_min_white[disabled] {
background: url(../../images/odometer.png) no-repeat center;
}
div#cont {
position: fixed;
max-height: 320px;

4
pandora_console/include/visual-console-client/vc.main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/visual-console-client/vc.main.min.js.map
View File

File diff suppressed because one or more lines are too long

7
pandora_console/operation/visual_console/view.php
View File

@ -266,6 +266,7 @@ if ($pure === false) {
$class_cloud = 'color_cloud_min link-create-item';
$class_nlink = 'network_link_min link-create-item';
$class_odometer = 'odometer_min link-create-item';
$class_basic_chart = 'basic_chart_min link-create-item';
$class_delete = 'delete_item delete_min';
$class_copy = 'copy_item';
if ($config['style'] === 'pandora_black') {
@ -285,6 +286,7 @@ if ($pure === false) {
$class_cloud = 'color_cloud_min_white link-create-item';
$class_nlink = 'network_link_min_white link-create-item';
$class_odometer = 'odometer_min_white link-create-item';
$class_basic_chart = 'basic_chart_min_white link-create-item';
$class_delete = 'delete_item_white delete_min_white';
$class_copy = 'copy_item_white';
}
@ -304,6 +306,11 @@ if ($pure === false) {
__('Module Graph'),
$class_module_graph
);
visual_map_print_button_editor_refactor(
'BASIC_CHART',
__('Basic chart'),
$class_basic_chart
);
visual_map_print_button_editor_refactor(
'DONUT_GRAPH',
__('Serialized pie graph'),

1
pandora_console/vendor/composer/autoload_classmap.php vendored
View File

@ -119,6 +119,7 @@ return array(
'Models\\VisualConsole\\Items\\SimpleValue' => $baseDir . '/include/rest-api/models/VisualConsole/Items/SimpleValue.php',
'Models\\VisualConsole\\Items\\StaticGraph' => $baseDir . '/include/rest-api/models/VisualConsole/Items/StaticGraph.php',
'Models\\VisualConsole\\Items\\Odometer' => $baseDir . '/include/rest-api/models/VisualConsole/Items/Odometer.php',
'Models\\VisualConsole\\Items\\BasicChart' => $baseDir . '/include/rest-api/models/VisualConsole/Items/BasicChart.php',
'Models\\VisualConsole\\View' => $baseDir . '/include/rest-api/models/VisualConsole/View.php',
'Mpdf\\Barcode' => $vendorDir . '/mpdf/mpdf/src/Barcode.php',
'Mpdf\\Barcode\\AbstractBarcode' => $vendorDir . '/mpdf/mpdf/src/Barcode/AbstractBarcode.php',

1
pandora_console/vendor/composer/autoload_static.php vendored
View File

@ -193,6 +193,7 @@ class ComposerStaticInitfdecadadce22e6dde51e9535fe4ad7aa
'Models\\VisualConsole\\Items\\SimpleValue' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/SimpleValue.php',
'Models\\VisualConsole\\Items\\StaticGraph' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/StaticGraph.php',
'Models\\VisualConsole\\Items\\Odometer' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/Odometer.php',
'Models\\VisualConsole\\Items\\BasicChart' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/BasicChart.php',
'Models\\VisualConsole\\View' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/View.php',
'Mpdf\\Barcode' => __DIR__ . '/..' . '/mpdf/mpdf/src/Barcode.php',
'Mpdf\\Barcode\\AbstractBarcode' => __DIR__ . '/..' . '/mpdf/mpdf/src/Barcode/AbstractBarcode.php',

6
visual_console_client/src/Item.ts
View File

@ -48,7 +48,8 @@ export const enum ItemType {
CLOCK = 19,
COLOR_CLOUD = 20,
NETWORK_LINK = 21,
ODOMETER = 22
ODOMETER = 22,
BASIC_CHART = 23
}
// Base item properties. This interface should be extended by the item implementations.
@ -218,6 +219,9 @@ export function titleItem(id: number): string {
case ItemType.ODOMETER:
title = t("Odometer");
break;
case ItemType.BASIC_CHART:
title = t("Basic chart");
break;
default:
title = t("Item");
break;

11
visual_console_client/src/VisualConsole.ts
View File

@ -38,6 +38,7 @@ import BarsGraph, { barsGraphPropsDecoder } from "./items/BarsGraph";
import ModuleGraph, { moduleGraphPropsDecoder } from "./items/ModuleGraph";
import Service, { servicePropsDecoder } from "./items/Service";
import Odometer, { odometerPropsDecoder } from "./items/Odometer";
import BasicChart, { basicChartPropsDecoder } from "./items/BasicChart";
// TODO: Document.
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@ -88,6 +89,8 @@ function itemInstanceFrom(data: AnyObject) {
return new NetworkLink(networkLinkPropsDecoder(data), meta);
case ItemType.ODOMETER:
return new Odometer(odometerPropsDecoder(data), meta);
case ItemType.BASIC_CHART:
return new BasicChart(basicChartPropsDecoder(data), meta);
default:
throw new TypeError("item not found");
}
@ -140,6 +143,8 @@ function decodeProps(data: AnyObject) {
return networkLinkPropsDecoder(data);
case ItemType.ODOMETER:
return odometerPropsDecoder(data);
case ItemType.BASIC_CHART:
return basicChartPropsDecoder(data);
default:
throw new TypeError("decoder not found");
}
@ -1283,7 +1288,8 @@ export default class VisualConsole {
[ItemType.CLOCK]: Clock,
[ItemType.COLOR_CLOUD]: ColorCloud,
[ItemType.NETWORK_LINK]: NetworkLink,
[ItemType.ODOMETER]: Odometer
[ItemType.ODOMETER]: Odometer,
[ItemType.BASIC_CHART]: BasicChart
};
/**
@ -1339,6 +1345,9 @@ export default class VisualConsole {
case ItemType.ODOMETER:
text = t("Odometer");
break;
case ItemType.BASIC_CHART:
text = t("BasicChart");
break;
default:
text = t("Item");
break;