100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
merge with what is in master
Vincenta9d1a7231fa1
diff --git a/ui/app/main/src/components/pages/page-insights.ts b/ui/app/main/src/components/pages/page-insights.tsindex 254bc64a0..8953312a0 100644--- a/ui/app/main/src/components/pages/page-insights.ts+++ b/ui/app/main/src/components/pages/page-insights.ts@@ -3,82 +3,63 @@ import {store} from "../../store";import {connect} from "pwa-helpers/connect-mixin";import "@openremote/or-data-viewer";import {DataViewerConfig} from "@openremote/or-data-viewer";-import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5} from "@openremote/core";--import "@openremote/or-attribute-card";+import {DefaultBoxShadow} from "@openremote/core";// language=CSSconst style = css`-- :host {- --internal-or-asset-viewer-background-color: var(--or-asset-viewer-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));- --internal-or-asset-viewer-panel-margin: var(--or-asset-viewer-panel-margin, 20px);- --internal-or-asset-viewer-panel-padding: var(--or-asset-viewer-panel-padding, 24px);- --internal-or-asset-viewer-text-color: var(--or-asset-viewer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));- --internal-or-asset-viewer-title-text-color: var(--or-asset-viewer-title-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));- --internal-or-asset-viewer-panel-color: var(--or-asset-viewer-panel-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));- --internal-or-asset-viewer-line-color: var(--or-asset-viewer-line-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));-- height: 100%;- width: 100%;- background-color: var(--internal-or-asset-viewer-background-color);++ or-asset-tree {+ align-items: stretch;+ z-index: 1;}-- *[hidden] {++ .hideMobile {display: none;}-- #wrapper {- height: 100%;- width: 100%;- display: flex;- flex-direction: column;- overflow: auto;++ or-asset-viewer {+ align-items: stretch;+ z-index: 0;}- @media only screen and (max-width: 767px) {- #wrapper {- position: absolute;- left: 0;- right: 0;+ @media only screen and (min-width: 768px){+ or-asset-tree {+ width: 300px;+ min-width: 300px;+ box-shadow: ${unsafeCSS(DefaultBoxShadow)}}- }-- #container {- box-sizing: border-box;- display: grid;- padding: 20px 20px;- grid-gap: 10px;- grid-template-columns: 1fr 1fr 1fr 1fr;- width: 100%;- max-width: 1400px;- margin-left: auto;- margin-right: auto;-- -webkit-animation: fadein 0.3s; /* Safari, Chrome and Opera > 12.1 */- -moz-animation: fadein 0.3s; /* Firefox < 16 */- -ms-animation: fadein 0.3s; /* Internet Explorer */- -o-animation: fadein 0.3s; /* Opera < 12.1 */- animation: fadein 0.3s;- }- @media only screen and (max-width: 1023px) {- #container {- grid-template-columns: 1fr 1fr;+ .hideMobile {+ display: flex;}- }- @media only screen and (max-width: 779px) {- #container {- grid-template-columns: 1fr;++ or-asset-viewer,+ or-asset-viewer.hideMobile {+ display: initial;}- }-- .row {- grid-column-start: 1;- grid-column-end: -1;+++}`;+const viewerConfig: DataViewerConfig = {+ panels: {+ "chart": {+ type: "chart",+ hideOnMobile: true,+ panelStyles: {+ gridColumn: "1 / -1",+ gridRowStart: "1"+ },+ defaults: [{+ assetId:"5442Ite2XVp3Ky9X2y647a",+ attributes: ["UVIndex"]+ }]+ }+ }+};+@customElement("page-insights")class PageInsights extends connect(store)(LitElement) {@@ -86,20 +67,12 @@ class PageInsights extends connect(store)(LitElement) {return style;}- protected render(): TemplateResult | void {-- const assetId: string = "4m4dWZUAV4IepHKc8Wwv85";- const attributeName: string = "light1PowerConsumption";+ @property()+ protected _assetId;+ protected render(): TemplateResult | void {return html`- <div id="wrapper">- <div id="container">- <or-attribute-card .assetId="${assetId}" .attributeName="${attributeName}"></or-attribute-card>- <!--<div class="row">-->- <!-- <p>temp text</p>-->- <!--</div>-->- </div>- </div>+ <or-data-viewer .config="${viewerConfig}"></or-data-viewer>`;}