2020-06-15 / ct_chen

Actions:
1. Webservice modify Wifi display

Files:
1. EVSE/rootfs/var/www/set_network.php

EVSE/rootfs/var/www/set_network.php

@@ -191,51 +191,51 @@ img {
 <?php /*												<option value="3" <?php echo $obj->{'WifiMode'}=="3"?"selected":""?>>Ad-Hoc</option>*/?>
 											</select>
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiSsidDiv">
 											<label>SSID</label>
 											<input type="text" name="WifiSsid" id="WifiSsid" class="form-control" value="<?php echo $obj->{'WifiSsid'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiPasswordDiv">
 											<label>Password</label>
 											<input type="text" name="WifiPassword" id="WifiPassword" class="form-control" value="<?php echo $obj->{'WifiPassword'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiRssiDiv">
 											<label>RSSI</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'WifiRssi'};?> dBm">
 											<input type="hidden" name="WifiRssi" id="WifiRssi" value="<?php echo $obj->{'WifiRssi'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiDhcpServerDiv">
 											<label>DHCP Server</label>
 											<select class="form-control" id="WifiDhcpServer" name="WifiDhcpServer">
 												<option value="0" <?php echo $obj->{'WifiDhcpServer'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'WifiDhcpServer'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiDhcpClientDiv">
 											<label>DHCP Client</label>
 											<select class="form-control" id="WifiDhcpClient" name="WifiDhcpClient" onchange="WifiDhcp_changed();">
 												<option value="0" <?php echo $obj->{'WifiDhcpClient'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'WifiDhcpClient'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiMacAddressDiv">
 											<label>Mac Address</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'WifiMacAddress'};?>">
 											<input type="hidden" name="WifiMacAddress" id="WifiMacAddress" value="<?php echo $obj->{'WifiMacAddress'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiIpAddressDiv">
 											<label>IP Address</label>
 											<input type="text" name="WifiIpAddress" id="WifiIpAddress" class="form-control" value="<?php echo $obj->{'WifiIpAddress'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiSubmaskAddressDiv">
 											<label>Submask Address</label>
 											<input type="text" name="WifiSubmaskAddress" id="WifiSubmaskAddress" class="form-control" value="<?php echo $obj->{'WifiSubmaskAddress'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiGatewayAddressDiv">
 											<label>Gateway Address</label>
 											<input type="text" name="WifiGatewayAddress" id="WifiGatewayAddress" class="form-control" value="<?php echo $obj->{'WifiGatewayAddress'};?>">
 										</div>
-										<div class="form-group">
+										<div class="form-group" id="WifiNetworkConnDiv">
 											<label>Network Connection Status</label>
 											<input type="text" readonly class="form-control" value="<?php echo $WifiNetworkConn;?>">
 											<input type="hidden" name="WifiNetworkConn" id="WifiNetworkConn" value="<?php echo $obj->{'WifiNetworkConn'};?>">
@@ -440,24 +440,25 @@ img {
 		if(document.getElementById("WifiMode").value=="0"){
 			document.getElementById("WifiDhcpServer").disabled=true;
 			document.getElementById("WifiDhcpClient").disabled=true;
-//			document.getElementById("WifiDhcpServer").selectedIndex=1;
-//			document.getElementById("WifiDhcpClient").selectedIndex=1;
 			document.getElementById("WifiSsid").disabled=true;
 			document.getElementById("WifiPassword").disabled=true;
-			document.getElementById("WifiSsid").value="";
-			document.getElementById("WifiPassword").value="";
 			document.getElementById("WifiIpAddress").disabled=true;
 			document.getElementById("WifiSubmaskAddress").disabled=true;
 			document.getElementById("WifiGatewayAddress").disabled=true;
-			document.getElementById("WifiIpAddress").value="";
-			document.getElementById("WifiSubmaskAddress").value="";
-			document.getElementById("WifiGatewayAddress").value="";
+			document.getElementById("WifiDhcpServerDiv").style.display="none";
+			document.getElementById("WifiDhcpClientDiv").style.display="none";
+			document.getElementById("WifiSsidDiv").style.display="none";
+			document.getElementById("WifiPasswordDiv").style.display="none";
+			document.getElementById("WifiRssiDiv").style.display="none";
+			document.getElementById("WifiMacAddressDiv").style.display="none";
+			document.getElementById("WifiIpAddressDiv").style.display="none";
+			document.getElementById("WifiSubmaskAddressDiv").style.display="none";
+			document.getElementById("WifiGatewayAddressDiv").style.display="none";
+			document.getElementById("WifiNetworkConnDiv").style.display="none";
 		}
 		if(document.getElementById("WifiMode").value=="1"){
 			document.getElementById("WifiDhcpServer").disabled=true;
 			document.getElementById("WifiDhcpClient").disabled=false;
-//			document.getElementById("WifiDhcpServer").selectedIndex=1;
-//			document.getElementById("WifiDhcpClient").selectedIndex=0;
 			document.getElementById("WifiSsid").disabled=false;
 			document.getElementById("WifiPassword").disabled=false;
 			document.getElementById("WifiSsid").value="<?php echo $obj->{'WifiSsid'};?>";
@@ -468,12 +469,20 @@ img {
 			document.getElementById("WifiIpAddress").value="<?php echo $obj->{'WifiIpAddress'};?>";
 			document.getElementById("WifiSubmaskAddress").value="<?php echo $obj->{'WifiSubmaskAddress'};?>";
 			document.getElementById("WifiGatewayAddress").value="<?php echo $obj->{'WifiGatewayAddress'};?>";
+			document.getElementById("WifiDhcpServerDiv").style.display="none";
+			document.getElementById("WifiDhcpClientDiv").style.display="block";
+			document.getElementById("WifiSsidDiv").style.display="block";
+			document.getElementById("WifiPasswordDiv").style.display="block";
+			document.getElementById("WifiRssiDiv").style.display="block";
+			document.getElementById("WifiMacAddressDiv").style.display="block";
+			document.getElementById("WifiIpAddressDiv").style.display="block";
+			document.getElementById("WifiSubmaskAddressDiv").style.display="block";
+			document.getElementById("WifiGatewayAddressDiv").style.display="block";
+			document.getElementById("WifiNetworkConnDiv").style.display="block";
 		}
 		if(document.getElementById("WifiMode").value=="2"){
 			document.getElementById("WifiDhcpServer").disabled=false;
 			document.getElementById("WifiDhcpClient").disabled=true;
-//			document.getElementById("WifiDhcpServer").selectedIndex=0;
-//			document.getElementById("WifiDhcpClient").selectedIndex=1;
 			document.getElementById("WifiSsid").disabled=true;
 			document.getElementById("WifiPassword").disabled=true;
 			document.getElementById("WifiSsid").value="<?php echo $ModelName.$SerialNumber?>";
@@ -481,9 +490,16 @@ img {
 			document.getElementById("WifiIpAddress").disabled=true;
 			document.getElementById("WifiSubmaskAddress").disabled=true;
 			document.getElementById("WifiGatewayAddress").disabled=true;
-			document.getElementById("WifiIpAddress").value="";
-			document.getElementById("WifiSubmaskAddress").value="";
-			document.getElementById("WifiGatewayAddress").value="";
+			document.getElementById("WifiDhcpServerDiv").style.display="block";
+			document.getElementById("WifiDhcpClientDiv").style.display="none";
+			document.getElementById("WifiSsidDiv").style.display="block";
+			document.getElementById("WifiPasswordDiv").style.display="block";
+			document.getElementById("WifiRssiDiv").style.display="block";
+			document.getElementById("WifiMacAddressDiv").style.display="block";
+			document.getElementById("WifiIpAddressDiv").style.display="none";
+			document.getElementById("WifiSubmaskAddressDiv").style.display="none";
+			document.getElementById("WifiGatewayAddressDiv").style.display="none";
+			document.getElementById("WifiNetworkConnDiv").style.display="block";
 		}
 		WifiDhcp_changed();
 	}
@@ -492,9 +508,6 @@ img {
 			document.getElementById("Eth0IpAddress").disabled=true;
 			document.getElementById("Eth0SubmaskAddress").disabled=true;
 			document.getElementById("Eth0GatewayAddress").disabled=true;
-			document.getElementById("Eth0IpAddress").value="";
-			document.getElementById("Eth0SubmaskAddress").value="";
-			document.getElementById("Eth0GatewayAddress").value="";
 		}
 		if(document.getElementById("Eth0DhcpClient").value=="1"){
 			document.getElementById("Eth0IpAddress").disabled=false;
@@ -510,9 +523,6 @@ img {
 			document.getElementById("WifiIpAddress").disabled=true;
 			document.getElementById("WifiSubmaskAddress").disabled=true;
 			document.getElementById("WifiGatewayAddress").disabled=true;
-			document.getElementById("WifiIpAddress").value="";
-			document.getElementById("WifiSubmaskAddress").value="";
-			document.getElementById("WifiGatewayAddress").value="";
 		}
 		if(document.getElementById("WifiDhcpClient").disabled===false && document.getElementById("WifiDhcpClient").value=="1"){
 			document.getElementById("WifiIpAddress").disabled=false;