From 10894209f5f762b88ffa93188ae39fcaabb6d20d Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Fri, 28 Jul 2017 18:28:59 -0500 Subject: [PATCH] Adds auto/manual and flow set points --- POCloud/Control.html | 106 ++++++++++++++++++++++++- POCloud/NodeDetailHeader.html | 1 + POCloud/Systems.html | 138 +++++++++++++++++++++++++++----- POCloud/Totals.html | 143 ++++++++++++++++++++++++++++++++++ 4 files changed, 366 insertions(+), 22 deletions(-) create mode 100644 POCloud/Totals.html diff --git a/POCloud/Control.html b/POCloud/Control.html index b7639f0..50e1501 100644 --- a/POCloud/Control.html +++ b/POCloud/Control.html @@ -18,7 +18,7 @@ data-nodechannelcurrentId="<%= channels["transferstation.writeplctag"].nodechannelcurrentId %>" id="<%= channels["transferstation.writeplctag"].channelId %>" class="btn btn-large btn-theme animated confirmstatic pad15"> - Start + Auto Start
" id="<%= channels["transferstation.writeplctag"].channelId %>" class="btn btn-large btn-theme animated confirmstatic pad15"> - Stop + Auto Stop
+ +
+ + +
+ + + + diff --git a/POCloud/NodeDetailHeader.html b/POCloud/NodeDetailHeader.html index 1de2c06..b4642ca 100644 --- a/POCloud/NodeDetailHeader.html +++ b/POCloud/NodeDetailHeader.html @@ -3,6 +3,7 @@

<%= node.vanityname %>

+

<%= channels["transferstation.auto_manual"].value %> Mode

<%= channels["transferstation.cmd_run"].value %>

diff --git a/POCloud/Systems.html b/POCloud/Systems.html index fc81f5e..8440348 100644 --- a/POCloud/Systems.html +++ b/POCloud/Systems.html @@ -7,8 +7,8 @@
-

Pond Level

-

LT<%= i %>1

+

Pond Level

+

LT<%= i %>1



@@ -19,8 +19,8 @@

-

Charge Pump

-

MC<%= i %>1

+

Charge Pump

+

MC<%= i %>1



@@ -34,8 +34,8 @@

-

BP Intake

-

PT<%= i %>1

+

BP Intake

+

PT<%= i %>1



@@ -46,8 +46,8 @@

-

Charge Pump

-

MC<%= i %>1

+

Charge Pump

+

MC<%= i %>1



@@ -61,8 +61,8 @@

-

BP Discharge

-

PT<%= i %>2

+

BP Discharge

+

PT<%= i %>2



@@ -73,8 +73,8 @@

-

Flow

-

FT<%= i %>1

+

Flow

+

FT<%= i %>1



@@ -87,7 +87,7 @@

-

Priority

+

Priority



@@ -115,9 +115,69 @@
+ + + +
- - <% } %> <% } %> @@ -206,7 +300,7 @@ $('.val_box').each(function(topLevel){ diff --git a/POCloud/Totals.html b/POCloud/Totals.html new file mode 100644 index 0000000..6a4e922 --- /dev/null +++ b/POCloud/Totals.html @@ -0,0 +1,143 @@ +
+
+

Flow Totals

+
+
+

Flow Today

+
+
+
+ + + <%= channels["transferstation.flow_total_today"].timestamp %> + +
+
+ +
+

Flow Yesterday

+
+
+
+ + + <%= channels["transferstation.flow_total_yesterday"].timestamp %> + +
+
+ +
+
+
+ +
+ +
+ +
+
+

Energy Totals

+
+
+

Energy Today

+
+
+
+ + + <%= channels["transferstation.energy_total_today"].timestamp %> + +
+
+ +
+

Energy Yesterday

+
+
+
+ + + <%= channels["transferstation.energy_total_yesterday"].timestamp %> + +
+
+ +
+
+
+ +