Browse Source

if rules change, remove parsefloat and insert script in html to remove SunriseSunset when no data exist.

pull/345/head
DanielR92 3 years ago
parent
commit
4ea67effcc
  1. 13
      tools/esp8266/html/index.html
  2. 4
      tools/esp8266/html/setup.html
  3. 13
      tools/esp8266/web.cpp

13
tools/esp8266/html/index.html

@ -18,8 +18,12 @@
</p> </p>
<p><span class="des">Uptime: </span><span id="uptime"></span></p> <p><span class="des">Uptime: </span><span id="uptime"></span></p>
<p><span class="des">ESP-Time: </span><span id="date"></span></p> <p><span class="des">ESP-Time: </span><span id="date"></span></p>
<p><span class="des">Sunrise: </span><span id="sunrise"></span></p> <div id="sun">
<p><span class="des">Sunset: </span><span id="sunset"></span></p> <span class="des">Sunrise: </span><span id="sunrise"></span><br>
<span class="des">Sunset: </span><span id="sunset"></span>
</div>
<p><span class="des">RSSI: </span><span id="wifi_rssi"></span>dBm</p> <p><span class="des">RSSI: </span><span id="wifi_rssi"></span>dBm</p>
<p> <p>
<span class="des">Statistics: </span> <span class="des">Statistics: </span>
@ -69,6 +73,11 @@
document.getElementById("date").innerHTML = date.toLocaleString('de-DE', {timeZone: 'UTC'}); document.getElementById("date").innerHTML = date.toLocaleString('de-DE', {timeZone: 'UTC'});
document.getElementById("sunrise").innerHTML = sunrise.toLocaleString('de-DE', {timeZone: 'UTC'}); document.getElementById("sunrise").innerHTML = sunrise.toLocaleString('de-DE', {timeZone: 'UTC'});
document.getElementById("sunset").innerHTML = sunset.toLocaleString('de-DE', {timeZone: 'UTC'}); document.getElementById("sunset").innerHTML = sunset.toLocaleString('de-DE', {timeZone: 'UTC'});
if(!obj["ts_sun_upd"]) {
var elem = document.getElementById("sun");
elem.parentNode.removeChild(elem);
}
} }
function parseStat(obj) { function parseStat(obj) {

4
tools/esp8266/html/setup.html

@ -252,8 +252,8 @@
function parseSun(obj) { function parseSun(obj) {
document.getElementsByName("sunDisNightCom")[0].checked = obj["disnightcom"] ? true : false; document.getElementsByName("sunDisNightCom")[0].checked = obj["disnightcom"] ? true : false;
document.getElementsByName("sunLat")[0].value = parseFloat(obj["lat"]); document.getElementsByName("sunLat")[0].value = obj["lat"];
document.getElementsByName("sunLon")[0].value = parseFloat(obj["lon"]); document.getElementsByName("sunLon")[0].value = obj["lon"];
} }
function parsePinout(obj) { function parsePinout(obj) {

13
tools/esp8266/web.cpp

@ -273,9 +273,16 @@ void web::showSave(AsyncWebServerRequest *request) {
} }
// sun // sun
if(request->arg("sunDisNightCom") != "") mConfig->sunDisNightCom = (request->arg("sunDisNightCom") == "on"); if(request->arg("sunLat") == "" || (request->arg("sunLon") == "")) {
if(request->arg("sunLat") != "") mConfig->sunLat = request->arg("sunLat").toFloat(); mConfig->sunLat = 0.0;
if(request->arg("sunLon") != "") mConfig->sunLon = request->arg("sunLon").toFloat(); mConfig->sunLon = 0.0;
mConfig->sunDisNightCom = false;
} else {
mConfig->sunLat = request->arg("sunLat").toFloat();
mConfig->sunLon = request->arg("sunLon").toFloat();
mConfig->sunDisNightCom = (request->arg("sunDisNightCom") == "on");
}
// mqtt // mqtt
if(request->arg("mqttAddr") != "") { if(request->arg("mqttAddr") != "") {

Loading…
Cancel
Save