From c056421ed22dcd64a95c8d54525c2829235b4c6a Mon Sep 17 00:00:00 2001 From: Cerem Cem ASLAN Date: Fri, 1 Sep 2017 14:43:29 +0300 Subject: [PATCH] placed a note for users to test realtime message propogation --- scada.js | 2 +- webapps/showcase/example/hacknbreak.pug | 8 +++----- webapps/showcase/index.pug | 2 +- webapps/showcase/scada-components/index.pug | 2 +- .../previews/progress/progress.pug | 14 ++++++++++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/scada.js b/scada.js index b7745c2..78aede0 160000 --- a/scada.js +++ b/scada.js @@ -1 +1 @@ -Subproject commit b7745c268016d2e4bb56f16a6b759bfc0c7338f7 +Subproject commit 78aede06ff57e778674aff1e45fe73974ae65043 diff --git a/webapps/showcase/example/hacknbreak.pug b/webapps/showcase/example/hacknbreak.pug index 7659cdb..5f7ce38 100644 --- a/webapps/showcase/example/hacknbreak.pug +++ b/webapps/showcase/example/hacknbreak.pug @@ -1,12 +1,10 @@ -p fanı açıp kapatan düğme birazdan buraya gelecek +h3 Toggle PLC output ack-button( on-buttonclick="toggleFan" value="{{fanState}}" class!="{{#if fanState}}red{{else}}green{{/if}}") +iff('fanState') - | Fanı aç + | Run +else - | Fanı kapat + | Stop +endif - -p fanın durumunu: {{#if fanState}}çalışır duruma{{else}}durur duruma{{/if}} getir diff --git a/webapps/showcase/index.pug b/webapps/showcase/index.pug index 9bb632f..c611297 100644 --- a/webapps/showcase/index.pug +++ b/webapps/showcase/index.pug @@ -6,4 +6,4 @@ block title block loading b ScadaJS by #[a(href="https://aktos.io" newtab) aktos.io] p - code v2.3 + code v1.1 diff --git a/webapps/showcase/scada-components/index.pug b/webapps/showcase/scada-components/index.pug index c229242..6365adb 100644 --- a/webapps/showcase/scada-components/index.pug +++ b/webapps/showcase/scada-components/index.pug @@ -1,7 +1,7 @@ h1.ui.horizontal.divider.header i.dashboard.icon | SCADA Components - + include ./previews/progress/progress.pug include ./previews/slider.pug include ./previews/drawing-area.pug diff --git a/webapps/showcase/scada-components/previews/progress/progress.pug b/webapps/showcase/scada-components/previews/progress/progress.pug index 33438fd..a54e6f1 100644 --- a/webapps/showcase/scada-components/previews/progress/progress.pug +++ b/webapps/showcase/scada-components/previews/progress/progress.pug @@ -5,10 +5,20 @@ anchor progress .ui.attached.segment ui-progress.top.attached.orange(value="{{progress.one.curr}}" max="{{progress.one.max}}") btn.basic.teal.label.icon(href=srcAddr newtab) #[i.code.icon] View on Github #[i.github.icon] - - assign(input="{{true}}" output="{{hidemeprogrgess}}") checkbox(checked="{{hidemeprogrgess}}") hide/show + + .ui.message.orange + h3 Test Realtime Message Propogation + ol + li Open this page on multiple devices. + li Change slider input. + li See the changes are propogated in realtime. + + .ui.message + h3 See Also + ul + li #[a(href="#/authorization-test") Authorization Test] page for authorization options. +if('hidemeprogrgess') r-table(class="ui very basic collapsing celled table")