Add total power on start and tabular view (#797)

* Add total power * use br on start
TasmoAdmin · Feb 22, 2023 · e864737 · e864737
1 parent 5a673da
commit e864737
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/tasmoadmin/resources/js/app.js b/tasmoadmin/resources/js/app.js
@@ -699,36 +699,33 @@ function getDistance(data, joinString)
 }
 
 
-function getEnergyPower(data, joinString)
+function getEnergyPower(data, joinString = "<br/>")
 {
-	var enerygPower = [];
-	var joinString = joinString || "<br/>";
-
-	if (data.StatusSNS.ENERGY !== undefined)
-	{
-		if (data.StatusSNS.ENERGY.Power !== undefined)
-		{
-			enerygPower.push(data.StatusSNS.ENERGY.Power + "W");
+	let energyPower = [];
+	if (data.StatusSNS.ENERGY !== undefined) {
+		if (data.StatusSNS.ENERGY.Power !== undefined) {
+			energyPower.push(data.StatusSNS.ENERGY.Power + " W");
 		}
 
-		if (data.StatusSNS.ENERGY.Today !== undefined)
-		{
-			var tmpString = data.StatusSNS.ENERGY.Today;
-			if (data.StatusSNS.ENERGY.Yesterday !== undefined)
-			{
-				tmpString += "/" + data.StatusSNS.ENERGY.Yesterday;
+		if (data.StatusSNS.ENERGY.Today !== undefined) {
+			let tmpString = data.StatusSNS.ENERGY.Today;
+			if (data.StatusSNS.ENERGY.Yesterday !== undefined) {
+				tmpString += " / " + data.StatusSNS.ENERGY.Yesterday;
 			}
-			enerygPower.push(tmpString + "kWh");
+
+			if (data.StatusSNS.ENERGY.Total !== undefined) {
+				tmpString += " / " + data.StatusSNS.ENERGY.Total;
+			}
+
+			energyPower.push(tmpString + " kWh");
 		}
 
-		if (data.StatusSNS.ENERGY.Current !== undefined)
-		{
-			enerygPower.push(data.StatusSNS.ENERGY.Current + "A");
+		if (data.StatusSNS.ENERGY.Current !== undefined) {
+			energyPower.push(data.StatusSNS.ENERGY.Current + " A");
 		}
 	}
-	//console.log( press );
 
-	return enerygPower.join(joinString);
+	return energyPower.join(joinString);
 }
 
 //function getEnergyTodayYesterday( data ) {

diff --git a/tasmoadmin/resources/js/start.js b/tasmoadmin/resources/js/start.js
@@ -317,7 +317,7 @@ function updateBox(row, data, device_status) {
 		infoBoxCounter++;
 	}
 
-	let energyPower = getEnergyPower(data, ", ");
+	let energyPower = getEnergyPower(data);
 
 	if (energyPower !== "") {
 		$(row)