'auth' to 'swauth'

web_interface/src/wui/main.js

@@ -290,7 +290,7 @@ function radiusState() {
   }
 }
 function authState() {
-  if (!$('auth').checked) {
+  if (!$('swauth').checked) {
     $('rs_enabled').setAttribute('disabled', 'disabled');
     $('rs_enabled').checked = false;
   } else {
@@ -495,34 +495,31 @@ function paramsRefresh() {
 }
 var mint;
 //########## History ############
-var H_PARAM    = 0,
-  H_EVENT    = 1,
-  H_DATETIME = 2;
+
+var ctrl_inputs = [
+  'h_param_',
+  'h_event_',
+  'h_datetime_'
+];
+
 function getPage(pn){
   getJSON('history.cgi?page=' + pn, function(data){
     $('history_data').textContent = '';
     var n = data.page;
     $('currentpage').value = pn;
     $('pagelimit').innerHTML = data.pages;
+
     for (var i in n){
       var tr = document.createElement('tr');
-      var td = [
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td')
-      ];
-      td[0].innerHTML = n[i].split(';')[H_PARAM];
-      td[0].id = 'h_param_'+ i;
-      tr.appendChild(td[0]);
-      td[1].id = 'h_event_'+ i;
-      td[1].innerHTML = n[i].split(';')[H_EVENT];
-      tr.appendChild(td[1]);
-      td[2].id = 'h_datetime_'+ i;
-      td[2].innerHTML = n[i].split(';')[H_DATETIME];
-      tr.appendChild(td[2]);
+      for (var num = 0; num < ctrl_inputs.length; num++) {
+        var td = document.createElement('td');
+        td.innerHTML = n[i].split(';')[num];
+        td.id = ctrl_inputs[num] + i;
+        tr.appendChild(td);
+      }
       $('history_data').appendChild(tr);
     }
-    // utcParam = data.utc;
+
     window.setCookie('netsettings_changed', data.netsettings_changed);
     checkNotify();
     clearTimeout(mint);
@@ -541,15 +538,14 @@ function history_dataref() {
   var pn = parseInt($('currentpage').value);
   getJSON('history.cgi?page=' + pn, function(data) {
     var p = data.page;
+
     for (var j in p) {
-      var param_col = $('h_param_'+ j);
-      var event_col = $('h_event_'+ j);
-      var datetime_col = $('h_datetime_'+ j);
-      param_col.innerHTML = p[j].split(';')[H_PARAM];
-      event_col.innerHTML = p[j].split(';')[H_EVENT];
-      datetime_col.innerHTML = p[j].split(';')[H_DATETIME];
+      for (var num = 0; num < ctrl_inputs.length; num++) {
+        $(ctrl_inputs[num] + j).innerHTML = p[j].split(';')[num];
+      }
       $('pagelimit').innerHTML = data.pages;
     }
+
     clearTimeout(mint);
     mint = setTimeout(history_dataref, 5000);
   });
@@ -569,67 +565,34 @@ function prevPage(){
   }
 }
 //########## UPS History ############
-var INPUT_V  = 0,
-  INPUT_FV   = 1,
-  OUTPUT_V   = 2,
-  OUTPUT_C   = 3,
-  INPUT_F    = 4,
-  BAT_V      = 5,
-  TEMP       = 6,
-  STATUS     = 7,
-  TIME       = 8;
+var ups_inputs = [
+  { id: 'h_inputv_',  unit: ' В',  parse: 'float' },
+  { id: 'h_inputfv_', unit: ' В',  parse: 'float' },
+  { id: 'h_outputv_', unit: ' В',  parse: 'float' },
+  { id: 'h_outputc_', unit: '%',   parse: 'float' },
+  { id: 'h_inputf_',  unit: ' Гц', parse: 'float' },
+  { id: 'h_batv_',    unit: ' В',  parse: 'float' },
+  { id: 'h_temp_',    unit: ' °C', parse: 'float' },
+  { id: 'h_status_',  unit: '',    parse: 'string' },
+  { id: 'h_time_',    unit: '',    parse: 'string' }
+];
+
 function getUPSPage(pn){
   getJSON('ups_history.cgi?page=' + pn, function(data){
     $('history_data').textContent = '';
     var n = data.page;
     $('currentpage').value = pn;
     $('pagelimit').innerHTML = data.pages;
-    // var inputs = [
-    //   {id: 'h_inputv_', val: INPUT_V}
-    // ];
     for (var i in n){
       var tr = document.createElement('tr');
-      var td = [
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td'),
-        document.createElement('td')
-      ];
-      td[0].innerHTML = parseFloat(n[i].split(';')[INPUT_V]) + ' В';
-      td[0].id = 'h_inputv_'+ i;
-      tr.appendChild(td[0]);
-      td[1].id = 'h_inputfv_'+ i;
-      td[1].innerHTML = parseFloat(n[i].split(';')[INPUT_FV]) + ' В';
-      tr.appendChild(td[1]);
-      td[2].id = 'h_outputv_'+ i;
-      td[2].innerHTML = parseFloat(n[i].split(';')[OUTPUT_V]) + ' В';
-      tr.appendChild(td[2]);
-      td[3].id = 'h_outputc_'+ i;
-      td[3].innerHTML = parseFloat(n[i].split(';')[OUTPUT_C]) + '%';
-      tr.appendChild(td[3]);
-      td[4].id = 'h_inputf_'+ i;
-      td[4].innerHTML = parseFloat(n[i].split(';')[INPUT_F]) + ' Гц';
-      tr.appendChild(td[4]);
-      td[5].id = 'h_batv_'+ i;
-      td[5].innerHTML = parseFloat(n[i].split(';')[BAT_V]) + ' В';
-      tr.appendChild(td[5]);
-      td[6].id = 'h_temp_'+ i;
-      td[6].innerHTML = parseFloat(n[i].split(';')[TEMP]) + ' °C';
-      tr.appendChild(td[6]);
-      td[7].id = 'h_status_'+ i;
-      td[7].innerHTML = n[i].split(';')[STATUS];
-      tr.appendChild(td[7]);
-      td[8].id = 'h_time_'+ i;
-      td[8].innerHTML = n[i].split(';')[TIME];
-      tr.appendChild(td[8]);
+      for (var num = 0; num < ups_inputs.length; num++) {
+        var td = document.createElement('td');
+        td.innerHTML = ups_inputs[num].parse === 'float' ? parseFloat(n[i].split(';')[num]) + ups_inputs[num].unit : n[i].split(';')[num] + ups_inputs[num].unit;
+        td.id = ups_inputs[num].id + i;
+        tr.appendChild(td);
+      }
       $('history_data').appendChild(tr);
     }
-    // utcParam = data.utc;
     window.setCookie('netsettings_changed', data.netsettings_changed);
     checkNotify();
     clearTimeout(mint);
@@ -649,26 +612,9 @@ function ups_history_dataref() {
   getJSON('ups_history.cgi?page=' + pn, function(data) {
     var p = data.page;
     for (var j in p) {
-      var inputv_col  = $('h_inputv_' + j);
-      var inputfv_col = $('h_inputfv_' + j);
-      var outputv_col = $('h_outputv_' + j);
-      var outputc_col = $('h_outputc_' + j);
-      var inputf_col  = $('h_inputf_' + j);
-      var batv_col    = $('h_batv_' + j);
-      var trmp_col    = $('h_temp_' + j);
-      var status_col  = $('h_status_' + j);
-      var time_col    = $('h_time_' + j);
-
-      inputv_col.innerHTML  =  parseFloat(p[j].split(';')[INPUT_V]) + ' В';
-      inputfv_col.innerHTML =  parseFloat(p[j].split(';')[INPUT_FV]) + ' В';
-      outputv_col.innerHTML =  parseFloat(p[j].split(';')[OUTPUT_V]) + ' В';
-      outputc_col.innerHTML =  parseFloat(p[j].split(';')[OUTPUT_C]) + '%';
-      inputf_col.innerHTML  =  parseFloat(p[j].split(';')[INPUT_F]) + ' Гц';
-      batv_col.innerHTML    =  parseFloat(p[j].split(';')[BAT_V]) + ' В';
-      trmp_col.innerHTML    =  parseFloat(p[j].split(';')[TEMP]) + ' °C';
-      status_col.innerHTML  =  p[j].split(';')[STATUS];
-      time_col.innerHTML    =  p[j].split(';')[TIME];
-
+      for (var num = 0; num < ups_inputs.length; num++) {
+        $(ups_inputs[num].id + j).innerHTML = ups_inputs[num].parse === 'float' ? parseFloat(p[j].split(';')[num]) + ups_inputs[num].unit : p[j].split(';')[num] + ups_inputs[num].unit;
+      }
       $('pagelimit').innerHTML = data.pages;
     }
     clearTimeout(mint);
@@ -836,7 +782,7 @@ function settingsGET(){
     $('rs_pwd').value       = data.rs_pwd;
     $('rs_key').value       = data.rs_key;
     $('rs_enabled').checked = data.rs_enabled;
-    $('auth').checked       = data.auth;
+    $('swauth').checked       = data.swauth;
     // DateTime
     if (data.ntpservip != $('ntpservip').options[0].value &&
         data.ntpservip != $('ntpservip').options[1].value &&

web_interface/src/wui/settings.cgi

@@ -27,7 +27,7 @@ JSON = {
   "rs_port":"1227",
   "rs_pwd":"12345",
   "rs_key":"123",
-  "auth":0,
+  "swauth":0,
   "ipaddr":"192.168.10.254",
   "gw":"192.168.10.1",
   "mask":"255.255.255.0",

web_interface/src/wui/settings.html

@@ -245,7 +245,7 @@
       <h4 class="col span_2_of_2">Контроллер</h4>
       <div class="checkbox col span_2_of_2">
         <label>
-          <input type="checkbox" name="auth" id="auth" onchange="authState()"> Включить авторизацию
+          <input type="checkbox" name="swauth" id="swauth" onchange="authState()"> Включить авторизацию
         </label>
       </div>