Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Timeline & ManagerSetup

robindekkersb74696428cce
diff --git a/ui/component/or-smart-notify/src/index.js b/ui/component/or-smart-notify/src/index.js
index 1d5550f9b..2f20effa0 100644
--- a/ui/component/or-smart-notify/src/index.js
+++ b/ui/component/or-smart-notify/src/index.js
@@ -4,13 +4,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-import { html, LitElement, property } from 'lit-element';
+import { html, LitElement, property, customElement } from 'lit-element';
import moment from 'moment';
import { icon } from '@fortawesome/fontawesome-svg-core';
import { faClock } from '@fortawesome/free-regular-svg-icons';
import { faTimes } from '@fortawesome/free-solid-svg-icons';
import REST from "@openremote/rest";
-class OrSmartNotify extends LitElement {
+let OrSmartNotify = class OrSmartNotify extends LitElement {
constructor() {
super();
// if smart notify popup is visible
@@ -23,10 +23,11 @@ class OrSmartNotify extends LitElement {
this.smartNotify = {};
// default function on smartyNotify
this.currentTime = '-';
+ const self = this;
this.currentTime = moment().format('HH:mm');
setInterval(function () {
- this.currentTime = moment().format('HH:mm');
- }.bind(this), 500);
+ self.currentTime = moment().format('HH:mm');
+ }, 500);
}
render() {
// language=HTML
@@ -242,32 +243,34 @@ class OrSmartNotify extends LitElement {
`;
}
getSmartNotify() {
+ const self = this;
return new Promise(function (resolve, reject) {
const smartNotifyQuery = {
name: { predicateType: "string", value: "SMART_NOTIFY_ASSET" },
select: { include: "ALL_EXCEPT_PATH" /* ALL_EXCEPT_PATH */ }
};
- REST.api.AssetResource.queryAssets(smartNotifyQuery).then(response => {
+ REST.api.AssetResource.queryAssets(smartNotifyQuery).then((response) => {
console.log("Setting Smart Notify");
if (response.data) {
- this.smartNotify = response.data[0];
- this.isActive = this.smartNotify.attributes.SMART_NOTIFY_ENABLED.value ? true : false;
- this.onChange();
+ self.smartNotify = response.data[0];
+ self.isActive = self.smartNotify.attributes.SMART_NOTIFY_ENABLED.value ? true : false;
+ self.onChange();
resolve(response);
}
- }).catch(reason => {
+ }).catch((reason) => {
reject(Error("Error:" + reason));
console.log("Error:" + reason);
});
- }.bind(this));
+ });
}
checkSmartNotifyMarkers() {
+ const self = this;
if (this.isActive && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers.length > 0) {
}
else if (this.isActive && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers.length === 0) {
this.getSmartNotify().then(() => {
setTimeout(function () {
- this.checkSmartNotifyMarkers();
+ self.checkSmartNotifyMarkers();
}.bind(this), 3000);
});
}
@@ -283,7 +286,7 @@ class OrSmartNotify extends LitElement {
this.smartNotify.attributes.SMART_NOTIFY_ENABLED.value = null;
this.isActive = false;
}
- REST.api.AssetResource.update(this.smartNotify.id, this.smartNotify).then(response => {
+ REST.api.AssetResource.update(this.smartNotify.id, this.smartNotify).then((response) => {
console.log("Setting Smart Notify");
this.smartNotify.version = this.smartNotify.version + 1;
if (isChecked == true) {
@@ -295,7 +298,7 @@ class OrSmartNotify extends LitElement {
this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers = [];
this.onChange();
}
- }).catch(reason => console.log("Error:" + reason));
+ }).catch((reason) => console.log("Error:" + reason));
}
close() {
this.isVisible = false;
@@ -303,7 +306,7 @@ class OrSmartNotify extends LitElement {
toggleVisibility() {
this.isVisible = !this.isVisible;
}
-}
+};
__decorate([
property({ type: Function })
], OrSmartNotify.prototype, "onChange", void 0);
@@ -322,5 +325,7 @@ __decorate([
__decorate([
property({ type: String })
], OrSmartNotify.prototype, "currentTime", void 0);
-window.customElements.define('or-smart-notify', OrSmartNotify);
+OrSmartNotify = __decorate([
+ customElement('or-smart-notify')
+], OrSmartNotify);
//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/ui/component/or-smart-notify/src/index.js.map b/ui/component/or-smart-notify/src/index.js.map
index 48aa8f329..43f302eaa 100644
--- a/ui/component/or-smart-notify/src/index.js.map
+++ b/ui/component/or-smart-notify/src/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ui/component/or-smart-notify/src/index.ts b/ui/component/or-smart-notify/src/index.ts
index 10dee0b49..8b4a3b00c 100644
--- a/ui/component/or-smart-notify/src/index.ts
+++ b/ui/component/or-smart-notify/src/index.ts
@@ -199,7 +199,7 @@ class OrSmartNotify extends LitElement {
</a>
</div>
<div class="layout horizontal">
- <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Wachttijd berekenen</div>
+ <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Activeren</div>
<div class="flex t-center">
<label class="switch">
<input @change="${this.setSmartNotify}" ?disabled="${this.isDisabled}" ?checked="${this.isActive}" type="checkbox">
diff --git a/ui/component/or-timeline/src/index.js b/ui/component/or-timeline/src/index.js
index 216555fc5..c4d08e367 100644
--- a/ui/component/or-timeline/src/index.js
+++ b/ui/component/or-timeline/src/index.js
@@ -21,10 +21,12 @@ class OrTimeline extends LitElement {
this.step = 5;
}
render() {
- const range = this.shadowRoot.getElementById('or-timeline-slider');
- if (range) {
- range.value = Math.round(this.current);
- this.moveBubble(range);
+ if (this.shadowRoot) {
+ const range = this.shadowRoot.getElementById('or-timeline-slider');
+ if (range) {
+ range.value = Math.round(this.current);
+ this.moveBubble(range);
+ }
}
return html `
<style>
@@ -182,7 +184,9 @@ class OrTimeline extends LitElement {
el = e.target;
}
else {
- el = this.shadowRoot.getElementById('or-timeline-slider');
+ if (this.shadowRoot) {
+ el = this.shadowRoot.getElementById('or-timeline-slider');
+ }
}
if (el) {
if (value) {
@@ -211,8 +215,12 @@ class OrTimeline extends LitElement {
offset -= newPoint;
}
// Move bubble
- const range = this.shadowRoot.getElementById('range-value');
- range.style.left = newPlace + "px";
+ if (this.shadowRoot) {
+ const range = this.shadowRoot.getElementById('range-value');
+ if (range) {
+ range.style.left = newPlace + "px";
+ }
+ }
}
}
valueChange(e) {
diff --git a/ui/component/or-timeline/src/index.js.map b/ui/component/or-timeline/src/index.js.map
index 1db5746d6..1672be3a4 100644
--- a/ui/component/or-timeline/src/index.js.map
+++ b/ui/component/or-timeline/src/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ui/component/or-timeline/src/index.ts b/ui/component/or-timeline/src/index.ts
index 64907b48a..aa4e9a732 100644
--- a/ui/component/or-timeline/src/index.ts
+++ b/ui/component/or-timeline/src/index.ts
@@ -101,8 +101,8 @@ class OrTimeline extends LitElement {
flex-basis: 100%;
overflow: visible;
- color: #dcdcdc;
- border-left: 1px solid #dcdcdc;
+ color: var(--timeline-grey, darkgrey);
+ border-left: 1px solid var(--timeline-grey, darkgrey);
font-size: 12px;
-webkit-user-select: none;
-moz-user-select: none;
@@ -121,6 +121,7 @@ class OrTimeline extends LitElement {
background-color: var(--timeline-accent, blue);
height: 30px;
width: 60px;
+ margin-left: -30px;
text-align: center;
color: white;
display: inline-block;
@@ -131,10 +132,11 @@ class OrTimeline extends LitElement {
}
.time-value-container {
- width: 100%;
+ width: calc(100% - 80px);
display: block;
position: relative;
height: 30px;
+ margin: 0 50px 0 30px;
}
</style>
@@ -208,17 +210,21 @@ class OrTimeline extends LitElement {
// Figure out placement percentage between left and right of input
const newPoint = v / this.maxRange;
// Janky value to get pointer to line up better
- let offset = 0;
+ let offset = 30;
let newPlace;
// Prevent bubble from going beyond left or right (unsupported browsers)
if (newPoint < 0) {
newPlace = 0;
} else if (newPoint > 1) {
- newPlace = width;
+ newPlace = width - offset;
} else {
- newPlace = width * newPoint + offset;
- offset -= newPoint;
+ newPlace = (width - offset) * newPoint;
+
+ if(newPlace < 0 ) {
+ newPlace = 0;
+ }
+
}
// Move bubble