Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9416714
Add convert_km function to the database
Sep 6, 2022
b321c81
Added context check to alembic migration
Sep 7, 2022
6016fd0
Alter convert_km function to user upper case values matching unit_of_…
turners-bendavidson Sep 9, 2022
4b87804
Add length of unit changes to Overview Dashboard
turners-bendavidson Sep 9, 2022
1763e3f
Add imperial / metric option to Live dashboard
turners-bendavidson Sep 14, 2022
d2ac26f
Removed duplicate jsonPath in Live dashboard
turners-bendavidson Sep 14, 2022
10e2265
Add ConvertKM function to model
turners-bendavidson Sep 23, 2022
dfc593b
Add unit of length to edit settings page
turners-bendavidson Sep 26, 2022
5873ed3
Merge branch 'tillsteinbach:main' into main
bendavidson Sep 27, 2022
bd12756
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 5, 2022
265e42c
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 11, 2022
d182b7c
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 13, 2022
93fb02e
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 19, 2022
1ff6b47
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 26, 2022
34cff18
Merge branch 'tillsteinbach:main' into main
bendavidson Nov 16, 2022
3da25e6
Merge branch 'tillsteinbach:main' into main
bendavidson Nov 25, 2022
d835510
Merge branch 'tillsteinbach:main' into main
bendavidson Dec 3, 2022
b7e2ed7
Merge branch 'tillsteinbach:main' into main
bendavidson Jan 27, 2023
d42fd21
Merge branch 'tillsteinbach:main' into main
bendavidson Feb 15, 2023
085b453
Merge branch 'tillsteinbach:main' into main
bendavidson Feb 27, 2023
993985f
Merge branch 'tillsteinbach:main' into main
bendavidson Mar 1, 2023
d3149ef
Merge branch 'tillsteinbach:main' into main
bendavidson Mar 27, 2023
ebbd36b
Merge branch 'tillsteinbach:main' into main
bendavidson Apr 25, 2023
e2c068e
Merge branch 'tillsteinbach:main' into main
bendavidson May 2, 2023
4790ced
Merge branch 'tillsteinbach:main' into main
bendavidson May 30, 2023
58c1fbe
Merge branch 'tillsteinbach:main' into main
bendavidson Jul 14, 2023
424ae13
Merge branch 'tillsteinbach:main' into main
bendavidson Jul 14, 2023
68b62f1
Merge branch 'tillsteinbach:main' into main
bendavidson Oct 10, 2023
1a5cbc4
Merge branch 'tillsteinbach:main' into main
bendavidson Nov 29, 2023
9d4b849
Merge branch 'tillsteinbach:main' into main
bendavidson Mar 4, 2024
283265a
Merge branch 'tillsteinbach:main' into main
bendavidson Aug 2, 2024
656e938
Merge branch 'tillsteinbach:main' into main
bendavidson Sep 16, 2024
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
50 changes: 44 additions & 6 deletions grafana/dashboards/vwsfriend/VWsFriend/live.json
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,20 @@
},
"unit": "lengthkm"
},
"overrides": []
"overrides": [
{
"matcher": {
"id": "byRegexp",
"options": "/.*_MI/"
},
"properties": [
{
"id": "unit",
"value": "lengthmi"
}
]
}
]
},
"gridPos": {
"h": 7,
Expand Down Expand Up @@ -829,8 +842,9 @@
},
"fields": [
{
"jsonPath": "$.vehicles.$VIN.domains.charging.batteryStatus.cruisingRangeElectric_km",
"name": "Electric Range"
"jsonPath": "$.$lookup(vehicles,$VIN[0]).domains.charging.batteryStatus.cruisingRangeElectric_km/($length_unit[0]=\"MI\"?1.609:1)",
"language": "jsonata",
"name": "Electric Range_$length_unit"
}
],
"hide": false,
Expand All @@ -855,7 +869,7 @@
"query": "",
"queryType": "randomWalk",
"rawQuery": true,
"rawSql": "SELECT\n CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_wltp_range\"::NUMERIC\n ELSE vehicle_settings.\"secondary_wltp_range\"::NUMERIC END AS \"Electric Range\"\nFROM vehicles\nLEFT JOIN vehicle_settings ON vehicles.vin = vehicle_settings.vehicle_vin\nWHERE\n vehicles.vin = '$VIN'\n",
"rawSql": "SELECT\n convert_km(CASE WHEN vehicles.\"carType\" = 'ELECTRIC' THEN vehicle_settings.\"primary_wltp_range\"::NUMERIC\n ELSE vehicle_settings.\"secondary_wltp_range\"::NUMERIC END,'${length_unit.value}') AS \"Electric Range_${length_unit.value}\"\nFROM vehicles\nLEFT JOIN vehicle_settings ON vehicles.vin = vehicle_settings.vehicle_vin\nWHERE\n vehicles.vin = '$VIN'\n",
"refId": "WLTP",
"resultFormat": "time_series",
"select": [
Expand Down Expand Up @@ -897,14 +911,22 @@
"id": "configFromData",
"options": {
"applyTo": {
"id": "byName",
"options": "A Electric Range"
"id": "byRegexp",
"options": "/Electric Range.*/"
},
"configRefId": "WLTP",
"mappings": [
{
"fieldName": "Electric Range",
"handlerKey": "max"
},
{
"fieldName": "Electric Range_MI",
"handlerKey": "max"
},
{
"fieldName": "Electric Range_KM",
"handlerKey": "max"
}
]
}
Expand Down Expand Up @@ -1028,6 +1050,22 @@
"skipUrlSync": false,
"sort": 0,
"type": "query"
},
{
"current": {
},
"definition": "SELECT u.unnest|| ':' || CASE u.unnest WHEN 'KM' THEN 'Metric' WHEN 'MI' THEN 'Imperial' END FROM (SELECT unnest(enum_range(NULL::unitoflength))) u LEFT JOIN settings ON settings.unit_of_length = u.unnest ORDER BY coalesce(settings.id,0) DESC",
"hide": 1,
"includeAll": false,
"multi": false,
"name": "length_unit",
"options": [],
"query": "SELECT u.unnest|| ':' || CASE u.unnest WHEN 'KM' THEN 'Metric' WHEN 'MI' THEN 'Imperial' END FROM (SELECT unnest(enum_range(NULL::unitoflength))) u LEFT JOIN settings ON settings.unit_of_length = u.unnest ORDER BY coalesce(settings.id,0) DESC",
"refresh": 1,
"regex": "/(?<value>[A-Z0-9]+):(?<text>.*)/",
"skipUrlSync": false,
"sort": 0,
"type": "query"
}
]
},
Expand Down
Loading