Show tank remaining volume in device list

Contributes to issue #1369
victronenergy · Feb 13, 2025 · 782c4c1 · 782c4c1
1 parent 21a3b7e
commit 782c4c1
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml
@@ -9,6 +9,17 @@ import Victron.VenusOS
 DeviceListDelegate {
 	id: root
 
+	readonly property var _allModel: [
+		{ unit: Global.systemSettings.temperatureUnit, value: temperature.value },
+		{ unit: Global.systemSettings.volumeUnit, value: remaining.value },
+		{ unit: VenusOS.Units_Percentage, value: level.value }
+	]
+
+	readonly property var _remainingAndLevelModel: [
+		{ unit: Global.systemSettings.volumeUnit, value: remaining.value },
+		{ unit: VenusOS.Units_Percentage, value: level.value }
+	]
+
 	readonly property var _temperatureAndLevelModel: [
 		{ unit: Global.systemSettings.temperatureUnit, value: temperature.value },
 		{ unit: VenusOS.Units_Percentage, value: level.value },
@@ -18,8 +29,17 @@ DeviceListDelegate {
 		{ unit: VenusOS.Units_Percentage, value: level.value },
 	]
 
+	readonly property var _remainingModel: [
+		{ unit: Global.systemSettings.volumeUnit, value: remaining.value }
+	]
+
 	secondaryText: level.isValid ? "" : (status.isValid ? Global.tanks.statusToText(status.value) : "--")
-	quantityModel: level.isValid ? (temperature.isValid ? _temperatureAndLevelModel : _levelModel) : null
+	quantityModel: level.isValid && temperature.isValid && remaining.isValid ? _allModel
+			: level.isValid && remaining.isValid ? _remainingAndLevelModel
+			: level.isValid && temperature.isValid ? _temperatureAndLevelModel
+			: level.isValid ? _levelModel
+			: remaining.isValid ? _remainingModel
+			: null
 
 	onClicked: {
 		Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankSensor.qml",
@@ -38,6 +58,13 @@ DeviceListDelegate {
 		uid: root.device.serviceUid + "/Level"
 	}
 
+	VeQuickItem {
+		id: remaining
+		uid: root.device.serviceUid + "/Remaining"
+		sourceUnit: Units.unitToVeUnit(VenusOS.Units_Volume_CubicMeter)
+		displayUnit: Units.unitToVeUnit(Global.systemSettings.volumeUnit)
+	}
+
 	VeQuickItem {
 		id: status
 		uid: root.device.serviceUid + "/Status"