OP task #517 | add sysname to the info page

web_interface/src/wui-6/info.cgi

@@ -5,11 +5,12 @@ print("Content-Type: text/html")
 print("")
 JSON = {
   "uptime": "2 часа",
-  "model": "BT-6037(v2)",
+  "model": "BT-6706",
   "prodate": "10.10.2015",
   "fwversion": "beta v 0.8",
   "macaddr": "FF:00:FF:00:FF:00",
   "serno": "2650475",
+  "sysname": "Btunchik",
   "owner": "Karen",
   "sysLocation": "Moscow",
   "comment": "No comments",

web_interface/src/wui-6/info.html

@@ -57,6 +57,10 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
+    <tr>
+      <td>Название устройства</td>
+      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
+    </tr>
     <tr>
       <td>Владелец</td>
       <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>

web_interface/src/wui-6/main.js

@@ -317,12 +317,14 @@ function telnetState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var owner, location,comment;
+  var sysname, owner, location,comment;
+  sysname  = $('sysname').value,
   owner    = $('owner').value,
   location = $('location').value,
   comment  = $('comment').value;
 
   var flag = true;
+  if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
   if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
@@ -894,6 +896,7 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
+    $('sysname').value       = data.sysname;
     $('owner').value         = data.owner;
     $('location').value      = data.sysLocation;
     $('comment').value       = data.comment;

web_interface/src/wui-8/info.cgi

@@ -10,6 +10,7 @@ JSON = {
   "fwversion": "v 1.0",
   "macaddr": "FF:00:FF:00:FF:00",
   "serno": "2650475",
+  "sysname": "Btunchik",
   "owner": "Karen",
   "sysLocation": "Moscow",
   "comment": "No comments",

web_interface/src/wui-8/info.html

@@ -57,6 +57,10 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
+    <tr>
+      <td>Название устройства</td>
+      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
+    </tr>
     <tr>
       <td>Владелец</td>
       <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>

web_interface/src/wui-8/main.js

@@ -345,12 +345,14 @@ function telnetState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var owner, location,comment;
+  var sysname, owner, location,comment;
+  sysname  = $('sysname').value,
   owner    = $('owner').value,
   location = $('location').value,
   comment  = $('comment').value;
 
   var flag = true;
+  if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
   if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
@@ -929,6 +931,7 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
+    $('sysname').value       = data.sysname;
     $('owner').value         = data.owner;
     $('location').value      = data.sysLocation;
     $('comment').value       = data.comment;

web_interface/src/wui/info.cgi

@@ -5,11 +5,12 @@ print("Content-Type: text/html")
 print("")
 JSON = {
   "uptime": "2 часа",
-  "model": "BT-6037(v2)",
+  "model": "BT-6702",
   "prodate": "10.10.2015",
   "fwversion": "beta v 0.8",
   "macaddr": "FF:00:FF:00:FF:00",
   "serno": "2650475",
+  "sysname": "Btunchik",
   "owner": "Karen",
   "sysLocation": "Moscow",
   "comment": "No comments",

web_interface/src/wui/info.html

@@ -57,6 +57,10 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
+    <tr>
+      <td>Название устройства</td>
+      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
+    </tr>
     <tr>
       <td>Владелец</td>
       <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>

web_interface/src/wui/main.js

@@ -336,12 +336,14 @@ function authState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var owner, location,comment;
+  var sysname, owner, location,comment;
+  sysname  = $('sysname').value,
   owner    = $('owner').value,
   location = $('location').value,
   comment  = $('comment').value;
 
   var flag = true;
+  if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
   if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
@@ -914,6 +916,7 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
+    $('sysname').value       = data.sysname;
     $('owner').value         = data.owner;
     $('location').value      = data.sysLocation;
     $('comment').value       = data.comment;