Browse Source

Merge branch 'hpd96-devel03-alarm-list' into development03

pull/1190/head
lumapu 1 year ago
parent
commit
4d65fd3789
  1. 1
      src/web/RestApi.h
  2. 4
      src/web/html/visualization.html

1
src/web/RestApi.h

@ -424,6 +424,7 @@ class RestApi {
record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
obj[F("iv_id")] = id; obj[F("iv_id")] = id;
obj[F("iv_name")] = String(iv->config->name);
obj[F("cnt")] = iv->alarmCnt; obj[F("cnt")] = iv->alarmCnt;
obj[F("last_id")] = iv->getChannelFieldValue(CH0, FLD_EVT, rec); obj[F("last_id")] = iv->getChannelFieldValue(CH0, FLD_EVT, rec);

4
src/web/html/visualization.html

@ -243,7 +243,7 @@
var offs = new Date().getTimezoneOffset() * -60; var offs = new Date().getTimezoneOffset() * -60;
html.push( html.push(
ml("div", {class: "row"}, [ ml("div", {class: "row"}, [
ml("div", {class: "col"}, ml("strong", {}, "String")), ml("div", {class: "col"}, ml("strong", {}, "Event")),
ml("div", {class: "col"}, ml("strong", {}, "ID")), ml("div", {class: "col"}, ml("strong", {}, "ID")),
ml("div", {class: "col"}, ml("strong", {}, "Start")), ml("div", {class: "col"}, ml("strong", {}, "Start")),
ml("div", {class: "col"}, ml("strong", {}, "End")) ml("div", {class: "col"}, ml("strong", {}, "End"))
@ -262,7 +262,7 @@
); );
} }
} }
modal("Alarms of inverter #" + obj.iv_id, ml("div", {}, html)); modal("Alarms of inverter " + obj.iv_name, ml("div", {}, html));
} }
function parseIvVersion(obj) { function parseIvVersion(obj) {

Loading…
Cancel
Save