github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-13 15:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed term for production and consumption when local production is defined

Browse Source
This commit is contained in:
Gunnar Skjold 2020-02-24 07:47:39 +01:00
parent 478d63505d
commit 78e531a7e9
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/web/AmsWebServer.cpp
View File

@ -104,7 +104,8 @@ void AmsWebServer::indexHtml() {
html.replace("${data.P}", String(data.getActiveImportPower()));
html.replace("${data.PO}", String(data.getActiveExportPower()));
html.replace("${display.production}", config->getProductionCapacity() > 0 ? "" : "none");
html.replace("${display.export}", config->getProductionCapacity() > 0 ? "" : "none");
html.replace("${text.import}", config->getProductionCapacity() > 0 ? "Import" : "Consumption");
html.replace("${data.U1}", u1 > 0 ? String(u1, 1) : "");
html.replace("${data.I1}", u1 > 0 ? String(i1, 1) : "");

34
web/index.html
View File

@ -92,7 +92,7 @@
<div id="P" class="SimpleMeter" style="display: inline;">
${data.P} W
</div>
<div id="consumptionMeter" class="GaugeMeter rounded"
<div id="importMeter" class="GaugeMeter rounded"
style="display: none;"
data-size="200px"
data-text_size="0.11"
@ -100,7 +100,7 @@
data-style="Arch"
data-theme="Green-Gold-Red"
data-animationstep="0"
data-label="Consumption"
data-label="${text.import}"
></div>
</div>
</div>
@ -139,11 +139,11 @@
</div>
</div>
<div class="col-md-3">
<div class="text-center" style="display: ${display.production};">
<div class="text-center" style="display: ${display.export};">
<div id="P" class="SimpleMeter" style="display: inline;">
${data.PO} W
</div>
<div id="productionMeter" class="GaugeMeter rounded"
<div id="exportMeter" class="GaugeMeter rounded"
style="display: none;"
data-size="200px"
data-text_size="0.11"
@ -151,7 +151,7 @@
data-style="Arch"
data-theme="DarkGreen-LightGreen"
data-animationstep="0"
data-label="Production"
data-label="Export"
></div>
</div>
</div>
@ -194,15 +194,15 @@
</div>
</main>
<script>
var cm = $("#consumptionMeter")
cm.gaugeMeter({
var im = $("#importMeter")
im.gaugeMeter({
percent: 0,
text: "-",
append: "W"
});
var pm = $("#productionMeter")
pm.gaugeMeter({
var em = $("#exportMeter")
em.gaugeMeter({
percent: 0,
text: "-",
append: "W"
@ -225,8 +225,8 @@ var fetch = function() {
dataType: 'json',
}).done(function(json) {
$(".SimpleMeter").hide();
cm.show();
pm.show();
im.show();
em.show();
for(var id in json) {
var str = json[id];
@ -282,7 +282,7 @@ var fetch = function() {
p_append = "kW";
}
}
cm.gaugeMeter({
im.gaugeMeter({
percent: p_pct,
text: p,
append: p_append
@ -298,7 +298,7 @@ var fetch = function() {
po_append = "kW";
}
}
pm.gaugeMeter({
em.gaugeMeter({
percent: po_pct,
text: po,
append: po_append
@ -315,13 +315,13 @@ var fetch = function() {
}
}
} else {
cm.gaugeMeter({
im.gaugeMeter({
percent: 0,
text: "-",
append: "W"
});
pm.gaugeMeter({
em.gaugeMeter({
percent: 0,
text: "-",
append: "W"
@ -331,13 +331,13 @@ var fetch = function() {
}).fail(function() {
setTimeout(fetch, interval*4);
cm.gaugeMeter({
im.gaugeMeter({
percent: 0,
text: "-",
append: "W"
});
pm.gaugeMeter({
em.gaugeMeter({
percent: 0,
text: "-",
append: "W"