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

Visual Console Refactor: minor fixes 

Former-commit-id: 028f466f9429488f399551e2d3201439b73ce34e
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-16 18:37:43 +02:00
parent d5b83b867b
commit f663bd8389
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
View File

@ -48,7 +48,9 @@ final class DonutGraph extends Item
{ {
$return = parent::decode($data); $return = parent::decode($data);
$return['type'] = DONUT_GRAPH; $return['type'] = DONUT_GRAPH;
$return['legendBackgroundColor'] = $this->extractLegendBackgroundColor($data); $return['legendBackgroundColor'] = static::extractLegendBackgroundColor(
$data
);
return $return; return $return;
} }
@ -60,7 +62,7 @@ final class DonutGraph extends Item
* *
* @return mixed String representing the border color (not empty) or null. * @return mixed String representing the border color (not empty) or null.
*/ */
private function extractLegendBackgroundColor(array $data) private static function extractLegendBackgroundColor(array $data)
{ {
return static::notEmptyStringOr( return static::notEmptyStringOr(
static::issetInArray( static::issetInArray(

2
visual_console_client/src/items/Clock/index.ts
View File

@ -604,7 +604,7 @@ export default class Clock extends Item<ClockProps> {
width = 100; // Default value. width = 100; // Default value.
height = 50; // Default value. height = 50; // Default value.
} }
console.log(width, height);
return { return {
width, width,
height height