Compare commits

...

22 Commits

Author SHA1 Message Date
Robert von Burg cebb4f0a43
[Project] Updated web dependencies 2023-07-04 13:05:44 +02:00
Robert von Burg ed29a40b09
[Project] Updated strolch-wc-localize-behavior to 1.1.16 2023-04-21 10:26:49 +02:00
Robert von Burg acf7f64c0d
[Project] Updated web dependencies 2022-07-11 14:02:37 +02:00
Robert von Burg 1666bd67d7
[Fix] Fire strolch-show-info event 2022-05-24 09:55:42 +02:00
Robert von Burg c87159a7e2
[Project] Updated web dependencies 2022-05-13 13:14:34 +02:00
Robert von Burg e3b8b8b72d
[Minor] Styling updates 2022-05-05 15:12:31 +02:00
Robert von Burg d0594a792c
[Minor] Styling updates 2022-05-04 10:26:46 +02:00
Robert von Burg 97126daa59 [Project] Updated strolch-wc-* versions 2022-04-21 11:28:45 +02:00
Robert von Burg 60cd1a9b7f [Project] Updated strolch-wc-* versions 2022-02-24 17:00:33 +01:00
Robert von Burg 8750acc25f [Project] Updated strolch-wc-* versions 2022-02-10 21:46:46 +01:00
Robert von Burg aba8b92f52 [Project] remove dependency to wc-tree 2021-08-19 11:16:33 +02:00
Robert von Burg 79d575add9 [Project] Update URLs 2021-03-03 14:17:38 +01:00
Robert von Burg aa74b372a7 [Fix] Fixed confirmation callback firing 2021-03-03 13:38:20 +01:00
Robert von Burg 66bbee592a [Project] Updated strolch-wc-* versions 2020-08-06 12:54:30 +02:00
Robert von Burg d20cb27a00 [Project] Updated strolch-wc-* versions 2020-05-12 11:30:17 +02:00
Robert von Burg 4263795fde [Project] Updated strolch-wc-* versions 2020-05-11 16:14:37 +02:00
Robert von Burg 42f898156e [Fix] Added missing bower dependency paper-toggle-button 2020-04-02 12:16:58 +02:00
Robert von Burg a8f538e508 [Project] Updated strolch-wc-* versions 2020-03-16 12:05:35 +01:00
Robert von Burg ee4e317f33 [Project] Updated strolch-wc-* versions 2020-02-26 21:18:21 +01:00
Robert von Burg 5e13ff2fca [Project] Updated strolch-wc-* versions 2020-02-26 19:55:18 +01:00
Robert von Burg 76028d6529 [New] Added new version 0.3.1 2020-02-26 12:42:33 +01:00
Robert von Burg 310dc03e40 [Fix] Updated to observer 0.2.0 2020-02-12 14:48:11 +01:00
6 changed files with 62 additions and 40 deletions

View File

@ -1,7 +1,7 @@
{
"name": "strolch-wc-plc",
"description": "Strolch PLC WebComponents",
"version": "0.2.1",
"version": "0.3.22",
"authors": ["Robert von Burg"],
"keywords": [
"strolch",
@ -11,20 +11,19 @@
"private": true,
"repository": {
"type": "git",
"url": "git@github.com:4treesCH/strolch-wc-plc.git"
"url": "git@github.com:strolch-li/strolch-wc-plc.git"
},
"license": "https://github.com/4treesCH/strolch-wc-plc/blob/master/LICENSE",
"homepage": "https://github.com/4treesCH/strolch-wc-plc",
"license": "https://github.com/strolch-li/strolch-wc-plc/blob/master/LICENSE",
"homepage": "https://github.com/strolch-li/strolch-wc-plc",
"ignore": [],
"dependencies": {
"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",
"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",
"polymer": "Polymer/polymer#^1.11.3",
"polymer": "Polymer/polymer#^1.12.0",
"iron-ajax": "PolymerElements/iron-ajax#^1.4.4",
"iron-pages": "PolymerElements/iron-pages#^1.0.9",
@ -40,6 +39,7 @@
"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",

View File

@ -85,24 +85,18 @@
confirmActionWarning: function (callback) {
var bound = callback.bind(this);
if (this.warningConfirmed) {
bound();
return;
}
var confirmedCallback = function (confirmed) {
if (confirmed) {
this.fire("strolch-show-info", {
title: this.localize('confirmActionWarning'),
line1: this.localize('confirmActionWarningMsg'),
callback: function () {
this.warningConfirmed = true;
bound();
}
}.bind(this);
this.fire("cx-show-confirmation", {
title: this.localize('confirmActionWarning'),
text: this.localize('confirmActionWarningMsg'),
callback: confirmedCallback,
bind: this
}.bind(this)
});
}
}

View File

@ -27,6 +27,16 @@
<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;

View File

@ -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 style="color:#0b8043"
<iron-icon class="active-icon"
icon="icons:radio-button-checked"></iron-icon>
</template>
<template is="dom-if" if="[[!address.value]]">
<iron-icon style="color:cornflowerblue"
<iron-icon class="inactive-icon"
icon="icons:radio-button-unchecked"></iron-icon>
</template>
</template>

View File

@ -31,8 +31,14 @@
<template>
<style is="custom-style" include="strolch-wc-plc-style">
h2 {
margin-bottom: 10px;
:host {
display: block;
padding-left: 10px;
padding-right: 10px;
}
h2:not(:first-of-type) {
margin-top: 20px;
}
.actions {
@ -67,7 +73,7 @@
on-response="onGetDevicesResponse"
on-error="onRequestError"></iron-ajax>
<strolch-wc-ws-observer id="observerHandler" ws-path="[[wsObserverPath]]"></strolch-wc-ws-observer>
<strolch-wc-ws-observer id="observerHandler" ws-path="[[baseWsPath]]/plc/observer"></strolch-wc-ws-observer>
</template>
@ -99,12 +105,6 @@
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", true, this.handleUpdate.bind(this));
this.$.observerHandler.register("Resource", "PlcAddress", "strolch-wc-plc-logical-devices", {flat: true}, this.handleUpdate.bind(this));
this.registeredForUpdates = true;
}
},

View File

@ -1,19 +1,22 @@
<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-styles.html">
<link rel="import" href="../strolch-wc-styles/strolch-wc-app-style.html">
<dom-module id="strolch-wc-plc-style">
<template>
<style is="strolch-wc-plc-style" include="strolch-wc-styles">
:host {
display: block;
<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;
}
paper-card {
margin-bottom: 10px;
display: block;
padding: 10px;
width: calc(100% - 20px);
}
paper-icon-button, iron-icon {
@ -22,6 +25,21 @@
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 {