calculate costs in backend

mekrapp · Jul 20, 2022 · 7ae887c · 7ae887c
1 parent 068db51
commit 7ae887c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/ladelog.sh b/ladelog.sh
@@ -233,8 +233,10 @@ processChargepoint(){
 					else
 						lademoduslogvalue=$lademodus
 					fi
-					openwbDebugLog "CHARGESTAT" 1 "start=$start; end=$jetzt; timeCharged=${ladedauer}m ($ladedauertext); energyCharged=${bishergeladen}kWh; rangeCharged=${gelr}km; averagePower=${ladegeschw}kW"
-					sed -i "1i$start,$jetzt,$gelr,$bishergeladen,$ladegeschw,$ladedauertext,$chargePointNumber,$lademoduslogvalue,$rfid" "$monthlyfile"
+					# calculate costs
+					kosten=$(echo "scale=2;$bishergeladen * $preisjekwh" |bc)
+					openwbDebugLog "CHARGESTAT" 1 "start=$start; end=$jetzt; timeCharged=${ladedauer}m ($ladedauertext); energyCharged=${bishergeladen}kWh; rangeCharged=${gelr}km; averagePower=${ladegeschw}kW; costs=${kosten}"
+					sed -i "1i$start,$jetzt,$gelr,$bishergeladen,$ladegeschw,$ladedauertext,$chargePointNumber,$lademoduslogvalue,$rfid,$kosten" "$monthlyfile"
 					# send push message if configured
 					if (( pushbenachrichtigung == 1 )) ; then
 						if (( pushbstopl == 1 )) ; then

diff --git a/web/logging/chargelog/ladelog.js b/web/logging/chargelog/ladelog.js
@@ -252,7 +252,6 @@ function putladelogtogether() {
 			var totalprice=0;
 
 			testout.forEach(function(row) {
-				var price = "0"
 				rowcount+=1;
 				content += "<tr>";
 				var cellcount=0;
@@ -270,10 +269,9 @@ function putladelogtogether() {
 							content += "<td class=\"text-right\">" + km.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 0}) + "</td>";
 							break;
 						case 4: // geladene kWh
-							totalkwh = parseFloat(totalkwh) + parseFloat(cell);
-							price = parseFloat(cell) * PriceForKWh;
-							totalprice = parseFloat(totalprice) + parseFloat(price);
-							content += "<td class=\"text-right\">" + parseFloat(cell).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) + "</td>";
+							var kWh = parseFloat(cell);
+							totalkwh += kWh;
+							content += "<td class=\"text-right\">" + kWh.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) + "</td>";
 							break;
 						case 5: // Ladeleistung kW
 							var kW = parseFloat(cell);
@@ -319,11 +317,16 @@ function putladelogtogether() {
 							}
 							content += "</td>";
 							break;
+						// 9: RFID-Tag
+						case 10:
+							var price = parseFloat(cell);
+							totalprice += price;
+							content += "<td class=\"text-right\">" + price.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) + "€</td>" ;
+							break;
 						default:
 							content += "<td>" + cell + "</td>";
 					}
 				});
-				content += "<td class=\"text-right\">" + price.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) + "€</td>" ;
 				content += "</tr>";
 			});
 

diff --git a/web/logging/chargelog/ladelog.php b/web/logging/chargelog/ladelog.php
@@ -39,7 +39,7 @@
 		<script src="js/bootstrap4-toggle/bootstrap4-toggle.min.js"></script>
 		<script src="js/mqttws31.js"></script>
 		<script src="logging/chargelog/helperFunctions.js?ver=20210202"></script>
-		<script src="logging/chargelog/ladelog.js?ver=20210202"></script>
+		<script src="logging/chargelog/ladelog.js?ver=20220720"></script>
 		<script>
 			function getCookie(cname) {
 				var name = cname + '=';