Lora/Lora-Map
1
0
Fork 0
Code Issues 8 Pull Requests Releases 23 Wiki Activity

add settings for History

Browse Source
This commit is contained in:
BlubbFish 2021-04-13 21:11:35 +02:00
parent f67d1b465c
commit e90bd678c1
2 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Lora-Map/Model/Settings.cs
View File

@ -124,6 +124,18 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model {
} }
this.External.Sensors = sensors; this.External.Sensors = sensors;
} }
if(json.ContainsKey("History") && json["History"].IsObject) {
if(json["History"].ContainsKey("enabled") && json["History"]["enabled"].IsBoolean) {
this.External.History.Enabled = (Boolean)json["History"]["enabled"];
}
if(this.External.History.Enabled) {
this.External.History.Time = json["History"].ContainsKey("time") && json["History"]["time"].IsInt ? (Int32)json["History"]["time"] : 0;
this.External.History.Time = json["History"].ContainsKey("amount") && json["History"]["amount"].IsInt ? (Int32)json["History"]["amount"] : 0;
} else {
this.External.History.Amount = 0;
this.External.History.Time = 0;
}
}
this.gridradius = json.ContainsKey("GridRadius") && json["GridRadius"].IsInt && this.External.Startloclat != 0 && this.External.Startloclon != 0 ? (Int32)json["GridRadius"] : 0; this.gridradius = json.ContainsKey("GridRadius") && json["GridRadius"].IsInt && this.External.Startloclat != 0 && this.External.Startloclon != 0 ? (Int32)json["GridRadius"] : 0;
this.GenerateGrid(); this.GenerateGrid();
this.FindMapLayer(); this.FindMapLayer();
@ -294,6 +306,18 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model {
} }
} }
public class History {
public Boolean Enabled {
get; set;
} = false;
public Int32 Time {
get; set;
} = 0;
public Int32 Amount {
get; set;
} = 0;
}
public class PublicSettings { public class PublicSettings {
public Double Startloclat { public Double Startloclat {
get; set; get; set;
@ -319,6 +343,9 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model {
public JsonData GeoLayer { public JsonData GeoLayer {
get; set; get; set;
} }
public History History {
get; set;
} = new History();
} }
public class PrivateSettings { public class PrivateSettings {

69
Lora-Map/resources/admin/js/settings.js
View File

@ -58,34 +58,38 @@
"<td><img src='../icons/general/save.png' onclick='Settings.SaveRowSensor(this.parentNode.parentNode)' class='pointer'> <img src='../icons/general/remove.png' onclick='Settings.Abort(this.parentNode.parentNode)' class='pointer'></td>"; "<td><img src='../icons/general/save.png' onclick='Settings.SaveRowSensor(this.parentNode.parentNode)' class='pointer'> <img src='../icons/general/remove.png' onclick='Settings.Abort(this.parentNode.parentNode)' class='pointer'></td>";
}, },
ParseJson: function (jsonsettings) { ParseJson: function (jsonsettings) {
if (typeof jsonsettings.StartPos === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "StartPos")) {
jsonsettings.StartPos = { lat: 0, lon: 0 }; jsonsettings.StartPos = { lat: 0, lon: 0 };
} }
if (typeof jsonsettings.CellIds === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "CellIds")) {
jsonsettings.CellIds = []; jsonsettings.CellIds = [];
} }
if (typeof jsonsettings.GridRadius === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "GridRadius")) {
jsonsettings.GridRadius = 1000; jsonsettings.GridRadius = 1000;
} }
if (typeof jsonsettings.FightDedection === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "FightDedection")) {
jsonsettings.FightDedection = []; jsonsettings.FightDedection = [];
} }
if (typeof jsonsettings.CrwodDensity === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "CrwodDensity")) {
jsonsettings.CrwodDensity = []; jsonsettings.CrwodDensity = [];
} }
if (typeof jsonsettings.Counting === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "Counting")) {
jsonsettings.Counting = []; jsonsettings.Counting = [];
} }
if (typeof jsonsettings.Sensors === "undefined") { if (!Object.prototype.hasOwnProperty.call(jsonsettings, "Sensors")) {
jsonsettings.Sensors = []; jsonsettings.Sensors = [];
} }
if (!Object.prototype.hasOwnProperty.call(jsonsettings, "History")) {
jsonsettings.History = [];
}
var html = "<div id='settingseditor'><div class='title'>Einstellungen</div>"; var html = "<div id='settingseditor'><div class='title'>Einstellungen</div>";
html += "<div class='startloc'>Startpunkt: <input value='" + jsonsettings.StartPos.lat + "' id='startlat'> Lat, <input value='" + jsonsettings.StartPos.lon + "' id='startlon'> Lon</div>"; html += "<div class='startloc'>Startpunkt: <input value='" + jsonsettings.StartPos.lat + "' id='startlat'> Lat, <input value='" + jsonsettings.StartPos.lon + "' id='startlon'> Lon</div><hr>";
html += "<div class='wetterwarnings'>CellId's für DWD-Wetterwarnungen: <input value='" + jsonsettings.CellIds.join(";") + "' id='wetterids'> (Trennen durch \";\", <a href='https://www.dwd.de/DE/leistungen/opendata/help/warnungen/cap_warncellids_csv.html'>cap_warncellids_csv</a>)</div>"; html += "<div class='wetterwarnings'>CellId's für DWD-Wetterwarnungen: <input value='" + jsonsettings.CellIds.join(";") + "' id='wetterids'> (Trennen durch \";\", <a href='https://www.dwd.de/DE/leistungen/opendata/help/warnungen/cap_warncellids_csv.html'>cap_warncellids_csv</a>)</div><hr>";
html += "<div class='gridradius'>Radius für das Grid um den Startpunkt: <input value='" + jsonsettings.GridRadius + "' id='gridrad'>m</div>"; html += "<div class='gridradius'>Radius für das Grid um den Startpunkt: <input value='" + jsonsettings.GridRadius + "' id='gridrad'>m</div><hr>";
html += "<div class='fightdedection'>Fight Dedection Kameras: <br>" + this._renderFightDedection(jsonsettings.FightDedection) + "</div>"; html += "<div class='fightdedection'>Fight Dedection Kameras: <br>" + this._renderFightDedection(jsonsettings.FightDedection) + "</div><hr>";
html += "<div class='crowddensity'>Crowd Density Kameras: <br>" + this._renderCrowdDensity(jsonsettings.CrwodDensity) + "</div>"; html += "<div class='crowddensity'>Crowd Density Kameras: <br>" + this._renderCrowdDensity(jsonsettings.CrwodDensity) + "</div><hr>";
html += "<div class='sensorsettings'>Sensors: <br>" + this._renderSensorSettings(jsonsettings.Sensors) + "</div>"; html += "<div class='sensorsettings'>Sensors: <br>" + this._renderSensorSettings(jsonsettings.Sensors) + "</div><hr>";
html += "<div class='historysettings'>History: "+this._renderHistorySettings(jsonsettings.History)+"</div><hr>";
html += "<div class='savesettings'><img src='../icons/general/save.png' onclick='Settings.Save()' class='pointer'></div>"; html += "<div class='savesettings'><img src='../icons/general/save.png' onclick='Settings.Save()' class='pointer'></div>";
document.getElementById("content").innerHTML = html + "</div>"; document.getElementById("content").innerHTML = html + "</div>";
}, },
@ -159,6 +163,29 @@
} }
ret.Sensors = sensorjson; ret.Sensors = sensorjson;
ret.History = {};
if (document.getElementById("hist_yes").checked && !document.getElementById("hist_no").checked) {
ret.History.enabled = true;
var time = parseInt(document.getElementById("history_time").value);
if (isNaN(time)) {
time = 0;
}
var amount = parseInt(document.getElementById("history_amount").value);
if (isNaN(amount)) {
amount = 0;
}
if (time !== 0 && amount !== 0) {
alert("History: Entweder Zeit oder Menge muss 0 sein.");
return;
}
ret.History.time = time;
ret.History.amount = amount;
} else {
ret.History.enabled = false;
ret.History.time = 0;
ret.History.amount = 0;
}
var savesettings = new XMLHttpRequest(); var savesettings = new XMLHttpRequest();
savesettings.onreadystatechange = function () { savesettings.onreadystatechange = function () {
if (savesettings.readyState === 4) { if (savesettings.readyState === 4) {
@ -306,6 +333,20 @@
ret += "</table>"; ret += "</table>";
return ret; return ret;
}, },
_renderHistorySettings: function (json) {
if (!Object.prototype.hasOwnProperty.call(json, "enabled")) {
json.enabled = false;
}
if (!Object.prototype.hasOwnProperty.call(json, "time")) {
json.time = 0;
}
if (!Object.prototype.hasOwnProperty.call(json, "amount")) {
json.amount = 0;
}
var html = "Aktiv: <fieldset style='border:none;'> <label for='hist_no'>Nein </label> <input onclick=\"document.getElementById('history_settings_details').style.display='none'\" type='radio' id='hist_no' name='hist_en' value='no' " + (json.enabled ? "" : "checked='checked'") + "> <label for='hist_yes'>Ja </label> <input onclick=\"document.getElementById('history_settings_details').style.display='block'\" type='radio' id='hist_yes' name='hist_en' value='yes' " + (json.enabled ? "checked='checked'" : "") + "> </fieldset>";
html += "<span id='history_settings_details' style='display: " + (json.enabled ? "block" : "none") + "'>Zeit: <input type='number' id='history_time' value='" + json.time + "'>s, Menge: <input type='number' id='history_amount' value='" + json.amount +"'></span>"
return html;
},
_renderSensorSettings: function (json) { _renderSensorSettings: function (json) {
var ret = ""; var ret = "";
ret += "<table id='sensortable' class='settingstable'>"; ret += "<table id='sensortable' class='settingstable'>";
@ -326,5 +367,5 @@
ret += "<tfoot><tr><td></td><td></td><td></td><td></td><td><img src='../icons/general/add.png' onclick='Settings.AddSensor()' class='pointer'></td></tr></tfoot>"; ret += "<tfoot><tr><td></td><td></td><td></td><td></td><td><img src='../icons/general/add.png' onclick='Settings.AddSensor()' class='pointer'></td></tr></tfoot>";
ret += "</table>"; ret += "</table>";
return ret; return ret;
}, }
}; };