github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-29 05:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added last month in realtime data. Also increased precision on realtime data

Browse Source
This commit is contained in:
Gunnar Skjold
2023-05-04 14:33:14 +02:00
parent 7e011a184b
commit 07ff4e2b0c
9 changed files with 130 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SvelteUi/app/src/lib/AccountingData.svelte
View File

@@ -1,7 +1,7 @@
<script>
import { fmtnum } from "./Helpers";
export let sysinfo;
export let data;
export let currency;
export let hasExport;
@@ -9,7 +9,7 @@
let hasCost = false;
let cols = 3
$: {
hasCost = data && data.h && (data.h.c || data.d.c || data.m.c || data.h.i || data.d.i || data.m.i);
hasCost = data && data.h && (data.h.c > 0.01 || data.d.c > 0.01 || data.m.c > 0.01 || data.h.i > 0.01 || data.d.i > 0.01 || data.m.i > 0.01);
cols = hasCost ? 3 : 2;
}
</script>
@@ -31,6 +31,9 @@
<div>Month</div>
<div class="text-right">{fmtnum(data.m.u)} kWh</div>
{#if hasCost}<div class="text-right">{fmtnum(data.m.c)} {currency}</div>{/if}
<div>Last month</div>
<div class="text-right">{fmtnum(sysinfo.last_month.u)} kWh</div>
{#if hasCost}<div class="text-right">{fmtnum(sysinfo.last_month.c)} {currency}</div>{/if}
</div>
<strong>Export</strong>
<div class="grid grid-cols-{cols}">
@@ -43,6 +46,9 @@
<div>Month</div>
<div class="text-right">{fmtnum(data.m.p)} kWh</div>
{#if hasCost}<div class="text-right">{fmtnum(data.m.i)} {currency}</div>{/if}
<div>Last month</div>
<div class="text-right">{fmtnum(sysinfo.last_month.p)} kWh</div>
{#if hasCost}<div class="text-right">{fmtnum(sysinfo.last_month.i)} {currency}</div>{/if}
</div>
{:else}
<strong>Consumption</strong>
@@ -53,6 +59,8 @@
<div class="text-right">{fmtnum(data.d.u,1)} kWh</div>
<div>Month</div>
<div class="text-right">{fmtnum(data.m.u)} kWh</div>
<div>Last month</div>
<div class="text-right">{fmtnum(sysinfo.last_month.u)} kWh</div>
</div>
{#if hasCost}
<strong>Cost</strong>
@@ -63,6 +71,8 @@
<div class="text-right">{fmtnum(data.d.c,1)} {currency}</div>
<div>Month</div>
<div class="text-right">{fmtnum(data.m.c)} {currency}</div>
<div>Last month</div>
<div class="text-right">{fmtnum(sysinfo.last_month.c)} {currency}</div>
</div>
{/if}
{/if}

2
lib/SvelteUi/app/src/lib/Dashboard.svelte
View File

@@ -72,7 +72,7 @@
{/if}
{#if uiVisibility(sysinfo.ui.c, data.ea)}
<div class="cnt">
<AccountingData data={data.ea} currency={data.pc} hasExport={data.om > 0 || data.e > 0}/>
<AccountingData sysinfo={sysinfo} data={data.ea} currency={data.pc} hasExport={data.om > 0 || data.e > 0}/>
</div>
{/if}
{#if uiVisibility(sysinfo.ui.t, data.pr && (data.pr.startsWith("10YNO") || data.pr == '10Y1001A1001A48H'))}