From 1eba0419677afc18a77eba34539dc76c153cbf1b Mon Sep 17 00:00:00 2001 From: ayushzenith Date: Thu, 9 Aug 2018 10:13:10 -0400 Subject: [PATCH 1/4] logic fix --- GaugeProjectApache/py/Main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/GaugeProjectApache/py/Main.py b/GaugeProjectApache/py/Main.py index c88c0db..93f2f47 100644 --- a/GaugeProjectApache/py/Main.py +++ b/GaugeProjectApache/py/Main.py @@ -2,6 +2,7 @@ import argparse import pandas as pd import time +import datetime from bacnet_gateway_requests import get_value_and_units def myFunction(facility): From 2039980b74418969edb565ac23d559c5b5f48273 Mon Sep 17 00:00:00 2001 From: ayushzenith Date: Thu, 9 Aug 2018 10:25:12 -0400 Subject: [PATCH 2/4] fix --- GaugeProjectApache/py/dollars.svg | 6 +++--- GaugeProjectApache/py/kWhHourly.svg | 4 ++++ GaugeProjectApache/py/kw.svg | 6 +++--- GaugeProjectApache/py/kwh.svg | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 GaugeProjectApache/py/kWhHourly.svg diff --git a/GaugeProjectApache/py/dollars.svg b/GaugeProjectApache/py/dollars.svg index caa8dd9..c9e244f 100644 --- a/GaugeProjectApache/py/dollars.svg +++ b/GaugeProjectApache/py/dollars.svg @@ -1,4 +1,4 @@ -Pygal06$219$152.99999999999997102.902$52$459.0102.902$02$39$459.0382.9219$52$0$39$AHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal06$463$152.99999999999997102.902$116$459.0102.902$02$79$459.0382.9463$116$0$79$AHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file diff --git a/GaugeProjectApache/py/kWhHourly.svg b/GaugeProjectApache/py/kWhHourly.svg new file mode 100644 index 0000000..83141fa --- /dev/null +++ b/GaugeProjectApache/py/kWhHourly.svg @@ -0,0 +1,4 @@ + +Electricity used hourly in kWh all of ahs00100010002000200030003000400040005000500060006000700070000450.35096153846155433.7515260652249251486.8375507063996412.8520107320746577525.8823718107184378.18699732874177909553.78339471292336.137499703797631328569.3558346266753277.36483283007567Electricity used hourly in kWh all of ahs6 am7 am8 am9 am10 am \ No newline at end of file diff --git a/GaugeProjectApache/py/kw.svg b/GaugeProjectApache/py/kw.svg index 69233ad..6a5b071 100644 --- a/GaugeProjectApache/py/kw.svg +++ b/GaugeProjectApache/py/kw.svg @@ -1,4 +1,4 @@ -Pygal0750kW105kW48.47931479636014186.636858846430360200kW25kW353.95789646881406189.105826512072670250kW15kW46.37531359101014479.92099964358710150kW37kW359.83926036684954449.5332517317422105kW25kW15kW37kWAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal0750kW404kW82.0053974860915129.811619208939420200kW104kW385.6850049550374131.927460003166860250kW106kW68.78850891816813423.82723543802520150kW42kW362.0930226808893444.39903787338073404kW104kW106kW42kWAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file diff --git a/GaugeProjectApache/py/kwh.svg b/GaugeProjectApache/py/kwh.svg index f18f0f8..003b4f6 100644 --- a/GaugeProjectApache/py/kwh.svg +++ b/GaugeProjectApache/py/kwh.svg @@ -1,4 +1,4 @@ -Pygal050kWh1832kWh152.99999999999997102.9020kWh435kWh459.0102.9020kWh020kWh330kWh459.0382.91832kWh435kWh0kWh330kWhAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal050kWh3861kWh152.99999999999997102.9020kWh971kWh459.0102.9020kWh020kWh660kWh459.0382.93861kWh971kWh0kWh660kWhAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file From b11d11fba60bda5d98c57d650d46fd6089ae163e Mon Sep 17 00:00:00 2001 From: ayushzenith Date: Thu, 9 Aug 2018 10:39:24 -0400 Subject: [PATCH 3/4] fix --- GaugeProjectApache/py/dollars.svg | 6 +++--- GaugeProjectApache/py/kw.svg | 6 +++--- GaugeProjectApache/py/kwh.svg | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GaugeProjectApache/py/dollars.svg b/GaugeProjectApache/py/dollars.svg index c9e244f..79183c1 100644 --- a/GaugeProjectApache/py/dollars.svg +++ b/GaugeProjectApache/py/dollars.svg @@ -1,4 +1,4 @@ -Pygal06$463$152.99999999999997102.902$116$459.0102.902$02$79$459.0382.9463$116$0$79$AHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal06$474$152.99999999999997102.902$119$459.0102.902$02$80$459.0382.9474$119$0$80$AHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file diff --git a/GaugeProjectApache/py/kw.svg b/GaugeProjectApache/py/kw.svg index 6a5b071..99add56 100644 --- a/GaugeProjectApache/py/kw.svg +++ b/GaugeProjectApache/py/kw.svg @@ -1,4 +1,4 @@ -Pygal0750kW404kW82.0053974860915129.811619208939420200kW104kW385.6850049550374131.927460003166860250kW106kW68.78850891816813423.82723543802520150kW42kW362.0930226808893444.39903787338073404kW104kW106kW42kWAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal0750kW410kW83.01865331265968128.92582953969690200kW101kW383.8659842999413133.676414623110560250kW117kW73.55945613968105418.169574752917240150kW34kW358.6170989254184452.6679337318336410kW101kW117kW34kWAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file diff --git a/GaugeProjectApache/py/kwh.svg b/GaugeProjectApache/py/kwh.svg index 003b4f6..5f5c55e 100644 --- a/GaugeProjectApache/py/kwh.svg +++ b/GaugeProjectApache/py/kwh.svg @@ -1,4 +1,4 @@ -Pygal050kWh3861kWh152.99999999999997102.9020kWh971kWh459.0102.9020kWh020kWh660kWh459.0382.93861kWh971kWh0kWh660kWhAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file +Pygal050kWh3957kWh152.99999999999997102.9020kWh995kWh459.0102.9020kWh020kWh668kWh459.0382.93957kWh995kWh0kWh668kWhAHS MAIN aka a…AHS MAIN aka all of AHSAHS GYMAHS COLLINS CE…AHS COLLINS CENTERAHS KITCHEN \ No newline at end of file From 6b29af1a739103169e5d2bde27b07563003ecbe3 Mon Sep 17 00:00:00 2001 From: Ayush Zenith Date: Thu, 9 Aug 2018 12:24:24 -0400 Subject: [PATCH 4/4] Daniel redid HTML --- GaugeProjectApache/py/dollars.html | 115 ++++++++++++++++-------- GaugeProjectApache/py/index.html | 116 ++++++++++++++++-------- GaugeProjectApache/py/kW.html | 126 ++++++++++++++++++--------- GaugeProjectApache/py/kWh.html | 113 ++++++++++++++++-------- GaugeProjectApache/py/kWhHourly.html | 114 ++++++++++++++++-------- 5 files changed, 404 insertions(+), 180 deletions(-) mode change 100644 => 100755 GaugeProjectApache/py/dollars.html mode change 100644 => 100755 GaugeProjectApache/py/index.html mode change 100644 => 100755 GaugeProjectApache/py/kW.html mode change 100644 => 100755 GaugeProjectApache/py/kWh.html mode change 100644 => 100755 GaugeProjectApache/py/kWhHourly.html diff --git a/GaugeProjectApache/py/dollars.html b/GaugeProjectApache/py/dollars.html old mode 100644 new mode 100755 index c78a2c5..72b9507 --- a/GaugeProjectApache/py/dollars.html +++ b/GaugeProjectApache/py/dollars.html @@ -1,52 +1,97 @@ - + Electricity Statistics Dashboard +

Electricity Statistics Dashboard

-
-
-
-
-
-
-
- + +
+ + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + + async function load_svg() { + $("#mySVG").load("dollars.html #svg"); + await sleep(1000) + let child = document.getElementById('mySVG').firstChild; + child.setAttribute('data', 'dollars.svg') + + await sleep(1200); + console.log("sleep") + } + + load_svg(); + \ No newline at end of file diff --git a/GaugeProjectApache/py/index.html b/GaugeProjectApache/py/index.html old mode 100644 new mode 100755 index 77ed9de..8fc83c5 --- a/GaugeProjectApache/py/index.html +++ b/GaugeProjectApache/py/index.html @@ -1,53 +1,97 @@ - + Electricity Statistics Dashboard +

Electricity Statistics Dashboard

- -
- + +
+ - + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + + async function load_svg() { + $("#mySVG").load("kW.html #svg"); + await sleep(1000) + let child = document.getElementById('mySVG').firstChild; + child.setAttribute('data', 'kw.svg') + await sleep(1200); + console.log("sleep") + } + + load_svg(); + + \ No newline at end of file diff --git a/GaugeProjectApache/py/kW.html b/GaugeProjectApache/py/kW.html old mode 100644 new mode 100755 index c4081b0..8fc83c5 --- a/GaugeProjectApache/py/kW.html +++ b/GaugeProjectApache/py/kW.html @@ -1,51 +1,97 @@ - + + Electricity Statistics Dashboard - + + + -

Electricity Statistics Dashboard

- -
- -
- - +

Electricity Statistics Dashboard

+ +
+
+ + \ No newline at end of file diff --git a/GaugeProjectApache/py/kWh.html b/GaugeProjectApache/py/kWh.html old mode 100644 new mode 100755 index 66d7bd3..146469b --- a/GaugeProjectApache/py/kWh.html +++ b/GaugeProjectApache/py/kWh.html @@ -1,52 +1,97 @@ - + Electricity Statistics Dashboard +

Electricity Statistics Dashboard

- -
- + +
+ \ No newline at end of file diff --git a/GaugeProjectApache/py/kWhHourly.html b/GaugeProjectApache/py/kWhHourly.html old mode 100644 new mode 100755 index 299f12e..f8b4361 --- a/GaugeProjectApache/py/kWhHourly.html +++ b/GaugeProjectApache/py/kWhHourly.html @@ -3,51 +3,95 @@ + Electricity Statistics Dashboard -

Electricity Statistics Dashboard

- -
- + +
+ + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + + async function load_svg() { + $("#mySVG").load("kWhHourly.html #svg"); + await sleep(1000) + let child = document.getElementById('mySVG').firstChild; + child.setAttribute('data', 'kWhHourly.svg') + + await sleep(1200); + console.log("sleep") + } + + load_svg(); + \ No newline at end of file