OP task #617 | add battery settings

web_interface/src/wui-9/main.js

@@ -848,7 +848,14 @@ function settingsGET(){
 
     $('tn_enabled').checked   = data.tn_enabled;
     $('tn_port').value        = data.tn_port;
-
+    $("bat_prod").value       = data.bat_prod;
+    ups_max_power = new SpinBox('ups_max_power', {
+      'value': data.ups_max_power,
+      'name':'ups_max_power',
+      'minimum':400,
+      'maximum':10000,
+      'step':50
+    });
     ups_cell_min = new SpinBox('ups_cell_min', {
       'value': data.ups_cell_min,
       'name':'ups_cell_min',
@@ -865,6 +872,27 @@ function settingsGET(){
       'decimals':2,
       'step':0.01
     });
+    bat_exp = new SpinBox('bat_exp', {
+      'value': data.bat_exp,
+      'name':'bat_exp',
+      'minimum':1,
+      'maximum':10,
+      'step':1
+    });
+    bat_cap = new SpinBox('bat_cap', {
+      'value': data.bat_cap,
+      'name':'bat_cap',
+      'minimum':1,
+      'maximum':200,
+      'step':1
+    });
+    bat_charge = new SpinBox('bat_charge', {
+      'value': data.bat_charge,
+      'name':'bat_charge',
+      'minimum':12,
+      'maximum':240,
+      'step':12
+    });
     // DateTime
     if (data.ntpservip != $('ntpservip').options[0].value &&
         data.ntpservip != $('ntpservip').options[1].value &&

web_interface/src/wui-9/settings.cgi

@@ -20,6 +20,11 @@ JSON = {
   "batvoltage_min_hist":0.25,
   "batcap":7,
   "batcharge_volt":2.275,
+  "bat_prod":"2016-12-26",
+  "ups_max_power": 550,
+  "bat_exp": 5,
+  "bat_cap": 100,
+  "bat_charge": 228,
   "tempcomp":False,
   "tempcomp_k_buf":3,
   "tempcomp_k_cycle":4,

web_interface/src/wui-9/settings.html

@@ -96,6 +96,28 @@
   <div class="panel-heading">Аккумуляторные батареи</div>
   <div class="panel-body section group">
     <div class="col span_1_of_2">
+      <label for="bat_prod" class="col span_1_of_2">Дата установки</label>
+      <div class="col span_1_of_2">
+        <input type="date" class="form-control" id="bat_prod" name="bat_prod">
+      </div>
+      <label for="bat_exp" class="col span_1_of_2">Срок службы (лет)</label>
+      <div class="col span_1_of_2">
+        <span id="bat_exp"></span>
+      </div>
+      <label for="bat_cap" class="col span_1_of_2">Емкость (А·ч)</label>
+      <div class="col span_1_of_2">
+        <span id="bat_cap"></span>
+      </div>
+      <label for="bat_charge" class="col span_1_of_2">Номинальное напряжение (В)</label>
+      <div class="col span_1_of_2">
+        <span id="bat_charge"></span>
+      </div>
+    </div>
+    <div class="col span_1_of_2">
+      <label for="ups_max_power" class="col span_1_of_2">Полная мощность ИБП (ВА)</label>
+      <div class="col span_1_of_2">
+        <span id="ups_max_power"></span>
+      </div>
       <label for="ups_cell_min" class="col span_1_of_2">Мин. напряжение ячейки (В)</label>
       <div class="col span_1_of_2">
         <span id="ups_cell_min"></span>
@@ -355,8 +377,12 @@ DYN_WEB.Tabs.setup({
 });
 var ntpservipValue;
 
-var ups_cell_min  = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum':0,'maximum':3,'step':0.01});
-var ups_cell_max  = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.01});
+var ups_max_power = new SpinBox('ups_max_power', {'name':'ups_max_power','minimum':400,'maximum':10000,'step':50});
+var ups_cell_min  = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum':0,'maximum':3,'step':0.1});
+var ups_cell_max  = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.1});
+var bat_exp       = new SpinBox('bat_exp', {'name':'bat_exp','minimum':1,'maximum':10,'step':1});
+var bat_cap       = new SpinBox('bat_cap', {'name':'bat_cap','minimum':1,'maximum':200,'step':1});
+var bat_charge    = new SpinBox('bat_charge', {'name':'bat_charge','minimum':12,'maximum':240,'step':12});
 var temp_hist     = new SpinBox('temp_hist', {'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var loadvolt_hist = new SpinBox('loadvolt_hist', {'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var mainvolt_hist = new SpinBox('mainvolt_hist', {'name':'mainvolt_hist','minimum':10,'maximum':30,'step':1});