Skip to content

grafana/charges.json: Nullfix for incomplete data from API #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akahl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

grafana/charges.json: Nullfix for incomplete data from API #759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grafana/dashboards/vwsfriend/VWsFriend/charges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "SELECT\n \"start_date\" AS \"Date\",\n \"Location\",\n \"Duration\",\n \"maximumChargePower_kW\" AS \"Max. Power\",\n \"Avg. Power\",\n \"AC/DC\",\n \"% Start\",\n \"% End\",\n \"Amount\",\n \"✓\",\n \"Cost\",\n \"Odometer\",\n (\"Amount\"\n - (\"endSOC_pct\" - lag(\"endSOC_pct\") over (order by start_date)) * (\"vehicle_capacity\" / 100::NUMERIC)) / NULLIF(((\"Odometer\" - lag(\"Odometer\") over (order by start_date)) / 100::NUMERIC), 0) AS \"Consumption\",\n \"Edit\",\n \"id\",\n (round(extract(epoch FROM start_date) - 10) * 1000) AS start_date_ts,\n COALESCE((round(extract(epoch FROM end_date) - 10) * 1000)::TEXT,'now') AS end_date_ts\nFROM\n (SELECT DISTINCT\n COALESCE (started, COALESCE (locked, connected)) AS start_date,\n COALESCE (ended, COALESCE (unlocked, disconnected)) AS end_date,\n (ended - started) AS duration,\n COALESCE(locations.\"display_name\", CONCAT_WS(', ', COALESCE(CONCAT_WS(', ', locations.name, locations.amenity), nullif(CONCAT_WS(' ', locations.road, locations.house_number), '')), locations.neighbourhood, locations.city, locations.postcode, locations.country)) AS \"Location\",\n EXTRACT('epoch' FROM (COALESCE (ended, COALESCE (unlocked, disconnected)) - COALESCE (started, COALESCE (locked, connected)))) AS \"Duration\",\n \"maximumChargePower_kW\",\n (COALESCE(\"realCharged_kWh\", COALESCE((\"meterEnd_kWh\" - \"meterStart_kWh\"), (\"endSOC_pct\" - \"startSOC_pct\") * (\n CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\n END\n / 100::NUMERIC)))) / (EXTRACT(epoch FROM (COALESCE(ended, COALESCE(unlocked, disconnected)) - COALESCE(started, COALESCE (locked, connected))))::NUMERIC / 3600::NUMERIC) AS \"Avg. Power\",\n acdc AS \"AC/DC\",\n \"startSOC_pct\" AS \"% Start\",\n \"endSOC_pct\" AS \"% End\",\n COALESCE(\"realCharged_kWh\", COALESCE((\"meterEnd_kWh\" - \"meterStart_kWh\"),\n (\"endSOC_pct\" - \"startSOC_pct\") * (\n CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\n END\n / 100::NUMERIC))) AS \"Amount\",\n CASE WHEN \"realCharged_kWh\" IS NOT NULL THEN '✓'\n WHEN (\"meterEnd_kWh\" - \"meterStart_kWh\") IS NOT NULL THEN '✓'\n ELSE NULL\n END AS \"✓\",\n \"realCost_ct\"::NUMERIC/ 100 AS \"Cost\",\n \"mileage_km\" AS \"Odometer\",\n '⚙' AS \"Edit\",\n id,\n \"endSOC_pct\",\n (CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\n END) AS \"vehicle_capacity\"\n FROM charging_sessions\n LEFT JOIN locations ON charging_sessions.location_id = locations.osm_id\n LEFT JOIN vehicles ON charging_sessions.vehicle_vin = vehicles.vin\n LEFT JOIN vehicle_settings ON charging_sessions.vehicle_vin = vehicle_settings.vehicle_vin\n LEFT JOIN charging_tag ON charging_sessions.id = charging_tag.charging_sessions_id\n WHERE\n ($__timeFilter(started) OR $__timeFilter(connected) OR $__timeFilter(locked)) AND\n charging_sessions.vehicle_vin = '$VIN' ${tag_sql:raw}\n ) AS result\nORDER BY 1 DESC",
"rawSql": "SELECT\r\n \"start_date\" AS \"Date\",\r\n \"Location\",\r\n \"Duration\",\r\n \"maximumChargePower_kW\" AS \"Max. Power\",\r\n \"Avg. Power\",\r\n \"AC\/DC\",\r\n \"% Start\",\r\n \"% End\",\r\n \"Amount\",\r\n \"\u2713\",\r\n \"Cost\",\r\n \"Odometer\",\r\n (\"Amount\"\r\n - (\"endSOC_pct\" - lag(\"endSOC_pct\") over (order by start_date)) * (\"vehicle_capacity\" \/ 100::NUMERIC)) \r\n \/ NULLIF((\"Odometer\" - lag(\"Odometer\") over (order by start_date)) \/ 100::NUMERIC, 0) AS \"Consumption\",\r\n \"Edit\",\r\n \"id\",\r\n (round(extract(epoch FROM start_date) - 10) * 1000) AS start_date_ts,\r\n COALESCE((round(extract(epoch FROM end_date) - 10) * 1000)::TEXT,'now') AS end_date_ts\r\nFROM\r\n (SELECT DISTINCT\r\n COALESCE (started, COALESCE (locked, connected)) AS start_date,\r\n COALESCE (ended, COALESCE (unlocked, disconnected)) AS end_date,\r\n (ended - started) AS duration,\r\n COALESCE(locations.\"display_name\", CONCAT_WS(', ', COALESCE(CONCAT_WS(', ', locations.name, locations.amenity), nullif(CONCAT_WS(' ', locations.road, locations.house_number), '')), locations.neighbourhood, locations.city, locations.postcode, locations.country)) AS \"Location\",\r\n EXTRACT('epoch' FROM (COALESCE (ended, COALESCE (unlocked, disconnected)) - COALESCE (started, COALESCE (locked, connected)))) AS \"Duration\",\r\n \"maximumChargePower_kW\",\r\n (COALESCE(\"realCharged_kWh\", COALESCE((\"meterEnd_kWh\" - \"meterStart_kWh\"), (\"endSOC_pct\" - \"startSOC_pct\") * (\r\n CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\r\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\r\n END\r\n \/ 100::NUMERIC)))) \r\n \/ NULLIF((EXTRACT(epoch FROM (COALESCE(ended, COALESCE(unlocked, disconnected)) - COALESCE(started, COALESCE (locked, connected))))::NUMERIC \/ 3600::NUMERIC), 0) AS \"Avg. Power\",\r\n acdc AS \"AC\/DC\",\r\n \"startSOC_pct\" AS \"% Start\",\r\n \"endSOC_pct\" AS \"% End\",\r\n COALESCE(\"realCharged_kWh\", COALESCE((\"meterEnd_kWh\" - \"meterStart_kWh\"),\r\n (\"endSOC_pct\" - \"startSOC_pct\") * (\r\n CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\r\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\r\n END\r\n \/ 100::NUMERIC))) AS \"Amount\",\r\n CASE WHEN \"realCharged_kWh\" IS NOT NULL THEN '\u2713'\r\n WHEN (\"meterEnd_kWh\" - \"meterStart_kWh\") IS NOT NULL THEN '\u2713'\r\n ELSE NULL\r\n END AS \"\u2713\",\r\n \"realCost_ct\"::NUMERIC\/ 100 AS \"Cost\",\r\n \"mileage_km\" AS \"Odometer\",\r\n '\u2699' AS \"Edit\",\r\n id,\r\n \"endSOC_pct\",\r\n (CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_capacity\"::NUMERIC\r\n ELSE vehicle_settings.\"secondary_capacity\"::NUMERIC\r\n END) AS \"vehicle_capacity\"\r\n FROM charging_sessions\r\n LEFT JOIN locations ON charging_sessions.location_id = locations.osm_id\r\n LEFT JOIN vehicles ON charging_sessions.vehicle_vin = vehicles.vin\r\n LEFT JOIN vehicle_settings ON charging_sessions.vehicle_vin = vehicle_settings.vehicle_vin\r\n LEFT JOIN charging_tag ON charging_sessions.id = charging_tag.charging_sessions_id\r\n WHERE\r\n ($__timeFilter(started) OR $__timeFilter(connected) OR $__timeFilter(locked)) AND\r\n charging_sessions.vehicle_vin = '$VIN' ${tag_sql:raw}\r\n ) AS result\r\nORDER BY 1 DESC;",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -880,4 +880,4 @@
"uid": "WHZz0AGnz",
"version": 1,
"weekStart": ""
}
}