gru/solar-pv-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ux

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2026-03-24 15:49:06 +01:00
parent 55a3c1ab7b
commit 84fe898a74
9 changed files with 203 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/app/services/analytics.py
View File

@@ -37,7 +37,7 @@ class AnalyticsService:
window = resolve_window(range_key=range_key, start=start, end=end)
current_days = self.energy.daily_records_for_window(window.start, window.end, persist_missing=True)
current = self.energy.bucketize_daily(current_days, bucket)
total = round(sum(item.value for item in current), 2)
total = round(sum((item.value or 0.0) for item in current), 2)
comparison = []
comparison_total = None
@@ -52,7 +52,7 @@ class AnalyticsService:
compare_window = resolve_window(start=compare_start, end=compare_end)
comparison_days = self.energy.daily_records_for_window(compare_window.start, compare_window.end, persist_missing=True)
comparison_series = self.energy.bucketize_daily(comparison_days, bucket)
comparison_total_value = round(sum(point.value for point in comparison_series), 2)
comparison_total_value = round(sum((point.value or 0.0) for point in comparison_series), 2)
comparisons.append({
"key": item.get("key") or f"custom_{index + 1}",
"label": item.get("label") or f"Custom {index + 1}",
@@ -70,7 +70,7 @@ class AnalyticsService:
compare_window = shift_window(window, compare_mode)
comparison_days = self.energy.daily_records_for_window(compare_window.start, compare_window.end, persist_missing=True)
comparison = self.energy.bucketize_daily(comparison_days, bucket)
comparison_total = round(sum(item.value for item in comparison), 2)
comparison_total = round(sum((item.value or 0.0) for item in comparison), 2)
comparison_delta_pct = compare_delta_pct(total, comparison_total)
comparisons.append({
"key": compare_mode,
@@ -82,8 +82,9 @@ class AnalyticsService:
"points": comparison,
})
average_bucket = round(total / len(current), 2) if current else 0.0
best_bucket = max(current, key=lambda item: item.value, default=None)
populated_current = [item for item in current if item.value is not None]
average_bucket = round(total / len(populated_current), 2) if populated_current else 0.0
best_bucket = max(populated_current, key=lambda item: item.value or 0.0, default=None)
return {
"unit": "kWh",
@@ -121,7 +122,7 @@ class AnalyticsService:
) -> dict:
payload = self.production(range_key=range_key, bucket=bucket, compare_mode="none", start=start, end=end)
current = payload["current"]
total = round(sum(item.value for item in current), 2)
total = round(sum((item.value or 0.0) for item in current), 2)
denominator = total or 1.0
return {
"unit": payload["unit"],
@@ -134,7 +135,7 @@ class AnalyticsService:
"share": round((item.value / denominator) * 100.0, 2),
}
for item in current
if item.value > 0
if item.value is not None and item.value > 0
],
"meta": payload["meta"],
}