Compare commits
No commits in common. "develop" and "0.2.1" have entirely different histories.
22
bower.json
22
bower.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "strolch-wc-plc",
|
||||
"description": "Strolch PLC WebComponents",
|
||||
"version": "0.3.22",
|
||||
"version": "0.2.1",
|
||||
"authors": ["Robert von Burg"],
|
||||
"keywords": [
|
||||
"strolch",
|
||||
|
|
@ -11,19 +11,20 @@
|
|||
"private": true,
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git@github.com:strolch-li/strolch-wc-plc.git"
|
||||
"url": "git@github.com:4treesCH/strolch-wc-plc.git"
|
||||
},
|
||||
"license": "https://github.com/strolch-li/strolch-wc-plc/blob/master/LICENSE",
|
||||
"homepage": "https://github.com/strolch-li/strolch-wc-plc",
|
||||
"license": "https://github.com/4treesCH/strolch-wc-plc/blob/master/LICENSE",
|
||||
"homepage": "https://github.com/4treesCH/strolch-wc-plc",
|
||||
"ignore": [],
|
||||
"dependencies": {
|
||||
"strolchjs": "strolch-li/strolchjs#^0.5.3",
|
||||
"strolch-wc-styles": "strolch-li/strolch-wc-styles#^0.4.7",
|
||||
"strolch-wc-debounced-input": "strolch-li/strolch-wc-debounced-input#^0.1.6",
|
||||
"strolch-wc-ws-observer": "strolch-li/strolch-wc-ws-observer#^0.2.11",
|
||||
"strolch-wc-localize-behavior": "strolch-li/strolch-wc-localize-behavior#^1.1.17",
|
||||
"strolchjs": "4treesCH/strolchjs#^0.2.7",
|
||||
"strolch-wc-styles": "4treesCH/strolch-wc-styles#^0.3.0",
|
||||
"strolch-wc-debounced-input": "4treesCH/strolch-wc-debounced-input#^0.1.0",
|
||||
"strolch-wc-tree": "4treesCH/strolch-wc-tree#^0.1.5",
|
||||
"strolch-wc-ws-observer": "4treesCH/strolch-wc-ws-observer#^0.1.5",
|
||||
"strolch-wc-localize-behavior": "4treesCH/strolch-wc-localize-behavior#^1.1.4",
|
||||
|
||||
"polymer": "Polymer/polymer#^1.12.0",
|
||||
"polymer": "Polymer/polymer#^1.11.3",
|
||||
|
||||
"iron-ajax": "PolymerElements/iron-ajax#^1.4.4",
|
||||
"iron-pages": "PolymerElements/iron-pages#^1.0.9",
|
||||
|
|
@ -39,7 +40,6 @@
|
|||
"paper-badge": "PolymerElements/paper-badge#^1.1.4",
|
||||
"paper-dialog": "PolymerElements/paper-dialog#^1.1.0",
|
||||
"paper-button": "PolymerElements/paper-button#^1.0.15",
|
||||
"paper-toggle-button": "PolymerElements/paper-toggle-button#^1.3.0",
|
||||
"paper-toolbar": "PolymerElements/paper-toolbar#^1.1.7",
|
||||
"paper-icon-button": "PolymerElements/paper-icon-button#^1.1.6",
|
||||
"paper-tabs": "PolymerElements/paper-tabs#^1.8.0",
|
||||
|
|
|
|||
|
|
@ -85,18 +85,24 @@
|
|||
|
||||
confirmActionWarning: function (callback) {
|
||||
var bound = callback.bind(this);
|
||||
|
||||
if (this.warningConfirmed) {
|
||||
bound();
|
||||
return;
|
||||
}
|
||||
|
||||
this.fire("strolch-show-info", {
|
||||
title: this.localize('confirmActionWarning'),
|
||||
line1: this.localize('confirmActionWarningMsg'),
|
||||
callback: function () {
|
||||
var confirmedCallback = function (confirmed) {
|
||||
if (confirmed) {
|
||||
this.warningConfirmed = true;
|
||||
bound();
|
||||
}.bind(this)
|
||||
}
|
||||
}.bind(this);
|
||||
|
||||
this.fire("cx-show-confirmation", {
|
||||
title: this.localize('confirmActionWarning'),
|
||||
text: this.localize('confirmActionWarningMsg'),
|
||||
callback: confirmedCallback,
|
||||
bind: this
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,16 +27,6 @@
|
|||
<template>
|
||||
|
||||
<style is="custom-style" include="strolch-wc-plc-style">
|
||||
:host {
|
||||
display: block;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
paper-card {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.label {
|
||||
min-width: 300px;
|
||||
margin-right: 10px;
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@
|
|||
<div class="g-flex-table-cell address-field no-grow">
|
||||
<template is="dom-if" if="[[isBoolean(address.valueType)]]">
|
||||
<template is="dom-if" if="[[address.value]]">
|
||||
<iron-icon class="active-icon"
|
||||
<iron-icon style="color:#0b8043"
|
||||
icon="icons:radio-button-checked"></iron-icon>
|
||||
</template>
|
||||
<template is="dom-if" if="[[!address.value]]">
|
||||
<iron-icon class="inactive-icon"
|
||||
<iron-icon style="color:cornflowerblue"
|
||||
icon="icons:radio-button-unchecked"></iron-icon>
|
||||
</template>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -31,14 +31,8 @@
|
|||
<template>
|
||||
|
||||
<style is="custom-style" include="strolch-wc-plc-style">
|
||||
:host {
|
||||
display: block;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
h2:not(:first-of-type) {
|
||||
margin-top: 20px;
|
||||
h2 {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.actions {
|
||||
|
|
@ -73,7 +67,7 @@
|
|||
on-response="onGetDevicesResponse"
|
||||
on-error="onRequestError"></iron-ajax>
|
||||
|
||||
<strolch-wc-ws-observer id="observerHandler" ws-path="[[baseWsPath]]/plc/observer"></strolch-wc-ws-observer>
|
||||
<strolch-wc-ws-observer id="observerHandler" ws-path="[[wsObserverPath]]"></strolch-wc-ws-observer>
|
||||
|
||||
</template>
|
||||
|
||||
|
|
@ -105,6 +99,12 @@
|
|||
devicesByGroup: {
|
||||
type: Array,
|
||||
value: []
|
||||
},
|
||||
wsObserverPath: {
|
||||
type: String,
|
||||
value: function () {
|
||||
return CustomWeb.baseWsPath + "/plc/observer";
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
this.$.ajaxGetDevices.generateRequest();
|
||||
|
||||
if (!this.registeredForUpdates) {
|
||||
this.$.observerHandler.register("Resource", "PlcAddress", "strolch-wc-plc-logical-devices", {flat: true}, this.handleUpdate.bind(this));
|
||||
this.$.observerHandler.register("Resource", "PlcAddress", "strolch-wc-plc-logical-devices", true, this.handleUpdate.bind(this));
|
||||
this.registeredForUpdates = true;
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,22 +1,19 @@
|
|||
<link rel="import" href="../polymer/polymer.html">
|
||||
<link rel="import" href="../paper-styles/color.html">
|
||||
<link rel="import" href="../paper-styles/paper-styles.html">
|
||||
|
||||
<link rel="import" href="../strolch-wc-styles/strolch-wc-app-style.html">
|
||||
<link rel="import" href="../strolch-wc-styles/strolch-wc-styles.html">
|
||||
|
||||
<dom-module id="strolch-wc-plc-style">
|
||||
<template>
|
||||
<style is="strolch-wc-plc-style" include="strolch-wc-app-style">
|
||||
:root {
|
||||
--app-primary-color: #9965F4;
|
||||
--app-secondary-color: #616161;
|
||||
--primary-text-color: #212121;
|
||||
--secondary-text-color: #737373;
|
||||
<style is="strolch-wc-plc-style" include="strolch-wc-styles">
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
paper-card {
|
||||
display: block;
|
||||
margin-bottom: 10px;
|
||||
padding: 10px;
|
||||
width: calc(100% - 20px);
|
||||
}
|
||||
|
||||
paper-icon-button, iron-icon {
|
||||
|
|
@ -25,21 +22,6 @@
|
|||
|
||||
paper-toggle-button {
|
||||
height: 35px;
|
||||
margin-left: 10px;
|
||||
margin-right: 5px;
|
||||
--paper-toggle-button-checked-button-color: var(--app-primary-color);
|
||||
}
|
||||
|
||||
paper-radio-button {
|
||||
--paper-radio-button-checked-color: var(--app-primary-color);
|
||||
}
|
||||
|
||||
.active-icon {
|
||||
color: var(--app-primary-color);
|
||||
}
|
||||
|
||||
.inactive-icon {
|
||||
color: var(--secondary-text-color);
|
||||
}
|
||||
|
||||
h2, h3 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue