Эх сурвалжийг харах

2022-10-12 / ct_chen

Actions:
1. Webservice add MaxChargingVoltage for customer code "PS"

Files:
1. EVSE/rootfs/var/www/set_charging.php
   EVSE/rootfs/var/www/set_charging_action.php
ct_chen 2 жил өмнө
parent
commit
92869cc709

+ 23 - 15
EVSE/rootfs/var/www/set_charging.php

@@ -2109,8 +2109,10 @@ CORE STYLES ABOVE - NO TOUCHY
 		if(document.getElementById("MaxChargingCurrent").value=="0" || document.getElementById("MaxChargingCurrent").value==""){
 			document.getElementById("MaxChargingCurrentText").style.display="block";
 		}
-		if(document.getElementById("MaxChargingVoltage").value=="0" || document.getElementById("MaxChargingVoltage").value==""){
-			document.getElementById("MaxChargingVoltageText").style.display="block";
+		if(document.getElementById("ModelName").value.substr(-2)=="PS"){
+			if(document.getElementById("MaxChargingVoltage").value=="0" || document.getElementById("MaxChargingVoltage").value==""){
+				document.getElementById("MaxChargingVoltageText").style.display="block";
+			}
 		}
 		if(document.getElementById("MaxChargingDuration").value=="0" || document.getElementById("MaxChargingDuration").value==""){
 			document.getElementById("MaxChargingDurationText").style.display="block";
@@ -2126,7 +2128,9 @@ CORE STYLES ABOVE - NO TOUCHY
 			document.getElementById("MaxChargingEnergyLbl").innerHTML="DC MaxCharging Energy";
 			document.getElementById("MaxChargingPowerLbl").innerHTML="DC MaxCharging Power";
 			document.getElementById("MaxChargingCurrentLbl").innerHTML="DC MaxCharging Current";
-			document.getElementById("MaxChargingVoltageLbl").innerHTML="DC MaxCharging Voltage";
+			if(document.getElementById("ModelName").value.substr(-2)=="PS"){
+				document.getElementById("MaxChargingVoltageLbl").innerHTML="DC MaxCharging Voltage";
+			}
 			document.getElementById("MaxChargingDurationLbl").innerHTML="DC MaxCharging Duration";
 			document.getElementById("MaxChargingSocLbl").innerHTML="DC MaxCharging Soc";
 		}
@@ -2158,14 +2162,16 @@ CORE STYLES ABOVE - NO TOUCHY
 				document.getElementById(this.id+"Text").style.display="none";
 			}
 		});
-		document.getElementById("MaxChargingVoltage").addEventListener("change", function() {
-			if(document.getElementById(this.id).value == "0" || document.getElementById(this.id).value == ""){
-				document.getElementById(this.id+"Text").style.display="block";
-			}
-			else{
-				document.getElementById(this.id+"Text").style.display="none";
-			}
-		});
+		if(document.getElementById("ModelName").value.substr(-2)=="PS"){
+			document.getElementById("MaxChargingVoltage").addEventListener("change", function() {
+				if(document.getElementById(this.id).value == "0" || document.getElementById(this.id).value == ""){
+					document.getElementById(this.id+"Text").style.display="block";
+				}
+				else{
+					document.getElementById(this.id+"Text").style.display="none";
+				}
+			});
+		}
 		document.getElementById("MaxChargingDuration").addEventListener("change", function() {
 			if(document.getElementById(this.id).value == "0" || document.getElementById(this.id).value == ""){
 				document.getElementById(this.id+"Text").style.display="block";
@@ -2228,9 +2234,9 @@ CORE STYLES ABOVE - NO TOUCHY
 			// POST 參數須使用 send() 發送
 			var data =  "MaxChargingEnergy=" + document.getElementById("MaxChargingEnergy").value +
 						"&MaxChargingPower=" + document.getElementById("MaxChargingPower").value +
-						"&MaxChargingCurrent=" + document.getElementById("MaxChargingCurrent").value+<?php if(substr($ModelName,-2)=="PS"){?>
-						"&MaxChargingVoltage=" + document.getElementById("MaxChargingVoltage").value+<?php } ?>
-						"&AcMaxChargingCurrent=" + document.getElementById("AcMaxChargingCurrent").value+
+						"&MaxChargingCurrent=" + document.getElementById("MaxChargingCurrent").value+
+						<?php if(substr($ModelName,-2)=="PS"){?>"&MaxChargingVoltage=" + document.getElementById("MaxChargingVoltage").value+
+						<?php } ?>"&AcMaxChargingCurrent=" + document.getElementById("AcMaxChargingCurrent").value+
 						"&MaxChargingDuration=" + document.getElementById("MaxChargingDuration").value+
 						"&MaxChargingSoc=" + document.getElementById("MaxChargingSoc").value+
 						"&StopChargingByButton=" + document.getElementById("StopChargingByButton").value+
@@ -2310,7 +2316,9 @@ CORE STYLES ABOVE - NO TOUCHY
 		var MaxChargingEnergy = document.getElementById("MaxChargingEnergy").value;
 		var MaxChargingPower = document.getElementById("MaxChargingPower").value;
 		var MaxChargingCurrent = document.getElementById("MaxChargingCurrent").value;
-		var MaxChargingVoltage = document.getElementById("MaxChargingVoltage").value;
+		if(document.getElementById("ModelName").value.substr(-2)=="PS"){
+			var MaxChargingVoltage = document.getElementById("MaxChargingVoltage").value;
+		}
 		var AcMaxChargingCurrent = document.getElementById("AcMaxChargingCurrent").value;
 		var MaxChargingDuration = document.getElementById("MaxChargingDuration").value;
 		var MaxChargingSoc = document.getElementById("MaxChargingSoc").value;

+ 3 - 1
EVSE/rootfs/var/www/set_charging_action.php

@@ -25,7 +25,9 @@
 		checkMaxValue("MaxChargingEnergy");
 		checkMaxValue("MaxChargingPower");
 		checkMaxValue("MaxChargingCurrent");
-		checkMaxValue("MaxChargingVoltage");
+		if(substr($_POST['ModelName'],-2)=="PS"){
+			checkMaxValue("MaxChargingVoltage");
+		}
 		checkMaxValue("AcMaxChargingCurrent");
 		checkMaxValue("MaxChargingDuration");
 		checkMaxValue("MaxChargingSoc");