tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

reduce title of longer module name odometer VC

Browse Source
This commit is contained in:
marcos 2021-09-06 12:28:57 +02:00
parent 197ae303e2
commit 9552b9716e
7 changed files with 752 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/rest-api/models/VisualConsole/Items/Odometer.php
View File

@ -53,16 +53,13 @@ final class Odometer extends Item
$return['thresholds'] = $this->extractThresholds($data);
$return['titleColor'] = $this->extractTitleColor($data);
$return['title'] = $this->extractTitle($data);
$module_text = $return['moduleName'];
$string_length = strlen($return['moduleName']);
if ($string_length >= 25) {
$module_text = substr($return['moduleName'], 0, 9);
$module_text .= ' ... ';
$module_text .= substr($return['moduleName'], -9);
$return['titleModule'] = $return['moduleName'];
if (strlen($return['moduleName']) >= 25) {
$return['moduleName'] = substr($return['moduleName'], 0, 9).' ... '.substr($return['moduleName'], -9);
}
$return['moduleName'] = $module_text;
$return['minMaxValue'] = $this->extractMinMaxValue($data);
return $return;

6
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

741
visual_console_client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
visual_console_client/package.json
View File

@ -39,6 +39,7 @@
"file-loader": "^3.0.1",
"jest": "^24.9.0",
"mini-css-extract-plugin": "^0.5.0",
"npm-watch": "^0.11.0",
"postcss-loader": "^3.0.0",
"prettier": "^1.19.1",
"ts-jest": "^24.3.0",

7
visual_console_client/src/items/Odometer.ts
View File

@ -8,6 +8,7 @@ export type OdometerProps = {
value: number;
status: string;
title: string | null;
titleModule: string;
titleColor: string;
odometerType: string;
thresholds: string | any;
@ -32,6 +33,7 @@ export function odometerPropsDecoder(data: AnyObject): OdometerProps | never {
status: stringIsEmpty(data.status) ? "#B2B2B2" : data.status,
titleColor: stringIsEmpty(data.titleColor) ? "#3f3f3f" : data.titleColor,
title: stringIsEmpty(data.title) ? "" : data.title,
titleModule: stringIsEmpty(data.titleModule) ? "" : data.titleModule,
thresholds: stringIsEmpty(data.thresholds) ? "" : data.thresholds,
minMaxValue: stringIsEmpty(data.minMaxValue) ? "" : data.minMaxValue,
odometerType: stringIsEmpty(data.odometerType)
@ -208,10 +210,13 @@ export default class Odometer extends Item<OdometerProps> {
const h2 = document.createElement("h2");
if (this.props.title == "") {
h2.textContent = this.props.moduleName;
h2.textContent = this.truncateTitle(this.props.moduleName);
} else {
h2.textContent = this.truncateTitle(this.props.title);
}
h2.title = this.props.titleModule;
h2.setAttribute("title", this.props.titleModule);
h2.style.fontSize = `${anchoB * 0.06}px`;
h2.style.color = `${this.props.titleColor}`;
h2.style.lineHeight = "0";