2020-05-29 / ct_chen

Actions:
1. modify web UI for third gun

Files:
1. as list

EVSE/Modularization/WebService.c

@@ -788,7 +788,7 @@ int main(int argc, char *argv[]) {
 		if (strcmp(argv[1], "aaa") == 0) {
 			//struct SysConfigData 	SysConfig;
 		//system
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ModelName, "DSLU601001T1P0D");
+		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ModelName, "DSLU601J1UT1P0D");
 		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SerialNumber, "SerialNumber");
 		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemId, "1234567890");
 		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemDateTime, "2019-12-31 23:59:59");
@@ -1052,6 +1052,7 @@ int main(int argc, char *argv[]) {
 		struct json_object *jobj4;
 		//system
 		struct json_object *ModelName;
+		struct json_object *AcModelName;
 		struct json_object *SerialNumber;
 		struct json_object *SystemId;
 		struct json_object *AcPhaseCount;
@@ -1196,6 +1197,7 @@ int main(int argc, char *argv[]) {
 		jobj4=json_object_new_object();
 		//system
 		ModelName = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.ModelName);
+		AcModelName = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.AcModelName);
 		SerialNumber = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.SerialNumber);
 		SystemId = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.SystemId);
 		AcPhaseCount = json_object_new_int(ShmSysConfigAndInfo->SysConfig.AcPhaseCount);
@@ -1627,6 +1629,7 @@ int main(int argc, char *argv[]) {
 
 		//system
 		json_object_object_add(jobj1,"ModelName",ModelName);
+		json_object_object_add(jobj1,"AcModelName",AcModelName);
 		json_object_object_add(jobj1,"SerialNumber",SerialNumber);
 		json_object_object_add(jobj1,"SystemId",SystemId);
 		json_object_object_add(jobj1,"AcPhaseCount",AcPhaseCount);

EVSE/rootfs/var/www/set_charging.php

@@ -292,19 +292,12 @@ img {
 											<small class="form-text text-muted-red"><label id="MaxChargingPowerText" style="display:none;">'0' means unlimit</label></small>
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Max Charging Current</label>
+											<label id="MaxChargingCurrentLbl">Max Charging Current</label>
 											<small class="form-text text-muted-red">amp</small>
 											<input type="text" name="MaxChargingCurrent" id="MaxChargingCurrent" class="form-control" value="<?php echo $obj['MaxChargingCurrent'];?>" placeholder="<?php echo ($obj['MaxChargingCurrent']==0||$obj['MaxChargingCurrent']=="")?"'0' means unlimit":"";?>" title="'0' means unlimit" onchange="MaxValue_changed(document.getElementById('MaxChargingCurrent').id,document.getElementById('MaxChargingCurrentText').id);">
 											<input type="hidden" name="RatingCurrent" id="RatingCurrent" value="<?php echo $RatingCurrent;?>">
 											<small class="form-text text-muted-red"><label id="MaxChargingCurrentText" style="display:none;">'0' means unlimit</label></small>
 										</div>
-										<div class="form-group" id="AcMaxChargingCurrentDiv">
-											<label>AC Max Charging Current</label>
-											<small class="form-text text-muted-red">amp</small>
-											<input type="text" name="AcMaxChargingCurrent" id="AcMaxChargingCurrent" class="form-control" value="<?php echo $obj['AcMaxChargingCurrent'];?>" placeholder="<?php echo ($obj['AcMaxChargingCurrent']==0||$obj['AcMaxChargingCurrent']=="")?"'0' means unlimit":"";?>" title="'0' means unlimit" onchange="MaxValue_changed(document.getElementById('AcMaxChargingCurrent').id,document.getElementById('AcMaxChargingCurrentText').id);">
-											<input type="hidden" name="AcRatingCurrent" id="AcRatingCurrent" value="<?php echo $AcRatingCurrent;?>">
-											<small class="form-text text-muted-red"><label id="AcMaxChargingCurrentText" style="display:none;">'0' means unlimit</label></small>
-										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Max Charging Duration</label>
 											<small class="form-text text-muted-red">minutes</small>
@@ -318,6 +311,13 @@ img {
 												<option value="1" <?php echo $obj['PhaseLossPolicy']=="1"?"selected":""?>>stop charging</option>
 											</select>
 										</div>
+										<div class="form-group" id="AcMaxChargingCurrentDiv">
+											<label>AC Max Charging Current</label>
+											<small class="form-text text-muted-red">amp</small>
+											<input type="text" name="AcMaxChargingCurrent" id="AcMaxChargingCurrent" class="form-control" value="<?php echo $obj['AcMaxChargingCurrent'];?>" placeholder="<?php echo ($obj['AcMaxChargingCurrent']==0||$obj['AcMaxChargingCurrent']=="")?"'0' means unlimit":"";?>" title="'0' means unlimit" onchange="MaxValue_changed(document.getElementById('AcMaxChargingCurrent').id,document.getElementById('AcMaxChargingCurrentText').id);">
+											<input type="hidden" name="AcRatingCurrent" id="AcRatingCurrent" value="<?php echo $AcRatingCurrent;?>">
+											<small class="form-text text-muted-red"><label id="AcMaxChargingCurrentText" style="display:none;">'0' means unlimit</label></small>
+										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Local White Card0</label>
 											<input type="text" name="LocalWhiteCard0" id="LocalWhiteCard0" class="form-control" value="<?php echo $obj['LocalWhiteCard'][0];?>">
@@ -819,6 +819,7 @@ img {
 			if(document.getElementById("AcMaxChargingCurrent").value=="0" || document.getElementById("AcMaxChargingCurrent").value==""){
 				document.getElementById("AcMaxChargingCurrentText").style.display="block";
 			}
+			document.getElementById("MaxChargingCurrentLbl").innerHTML="DC MaxCharging Current";
 		}
 		else{
 			document.getElementById("AcMaxChargingCurrentDiv").style.display="none";

EVSE/rootfs/var/www/set_system.php

@@ -95,6 +95,11 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'ModelName'};?>">
 											<input type="hidden" name="ModelName" id="ModelName" value="<?php echo $obj->{'ModelName'};?>">
 										</div>
+										<div class="form-group" id="AcModelNameDiv">
+											<label>AC Model Name</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'AcModelName'};?>">
+											<input type="hidden" name="AcModelName" id="AcModelName" value="<?php echo $obj->{'AcModelName'};?>">
+										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Serial Number</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'SerialNumber'};?>">
@@ -165,7 +170,7 @@ img {
 											</select>
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Rating Current</label>
+											<label id="RatingCurrentLbl">Rating Current</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'RatingCurrent'};?> amp">
 											<input type="hidden" name="RatingCurrent" id="RatingCurrent" value="<?php echo $obj->{'RatingCurrent'};?>">
 										</div>
@@ -303,6 +308,13 @@ img {
 			document.getElementById("isQRCodeLabel").style.display="none";
 			document.getElementById("isRFIDLabel").style.display="none";
 		}
+		if(document.getElementById("ModelName").value.substr(8,1) != "0"){
+			document.getElementById("AcModelNameDiv").style.display="block";
+			document.getElementById("RatingCurrentLbl").innerHTML="DC Rating Current";
+		}
+		else{
+			document.getElementById("AcModelNameDiv").style.display="none";
+		}
 		isQRCode_clicked();
 		QRCodeMadeMode_changed();
 	});