Compare commits

...

4 Commits

Author SHA1 Message Date
Vincent BOUQUET
e31b85246c implement max wet and rains sim 2023-12-11 21:31:10 +01:00
Vincent BOUQUET
05387f7bec fix indents 2023-12-11 21:30:48 +01:00
Vincent BOUQUET
df2d53dbca unnecessary logs and functions 2023-12-11 21:30:09 +01:00
Vincent BOUQUET
c61d29e0dc serialize name fix 2023-12-11 21:28:27 +01:00
2 changed files with 64 additions and 80 deletions

View File

@@ -1,4 +1,5 @@
var is_pressure_test_ongoing = false;
var rains_value = 0;
$(document).ready(function () {
initSessionStorage();
@@ -28,43 +29,13 @@ $(document).ready(function () {
$(document).on("click", "#scfg", function () {
$("#m-t").html("Site settings");
var h = "<h3>Password settings</h3>";
h += c_txt(
"opswd",
"Old password",
"Please put old password (four digits)",
"",
"password"
);
h += c_txt(
"npswd",
"New password",
"Please put new password (four digits)",
"",
"password"
);
h += c_txt(
"npsch",
"New password check",
"New passwords check failed",
"",
"password"
);
h += c_txt("opswd","Old password","Please put old password (four digits)","","password");
h += c_txt("npswd","New password","Please put new password (four digits)","","password");
h += c_txt("npsch","New password check","New passwords check failed","","password");
h += "<br><h3>Simulator</h3>";
h += c_btn("Reset demo values", "btnresetdemo", " btnresetdemo");
h += c_rad(
"iforte_demo_rains_age",
"RAINS tubes age",
["New", "Average", "Old"],
"",
""
);
h += c_rad(
"iforte_demo_pressure_test",
"Pressure test",
["OK", "Failing"],
"",
""
);
h += c_rad("iforte_demo_rains_age","RAINS tubes age",["New", "Average", "Old"],"","");
h += c_rad("iforte_demo_pressure_test","Pressure test",["OK", "Failing"],"","");
$("#m-b").html(h);
$(".sb").unbind();
copy_form_values(2);
@@ -73,22 +44,10 @@ $(document).ready(function () {
$(".sb").bind("click", function () {
loader(1);
var par = [
"opswd",
"npswd",
"npsch",
"iforte_demo_rains_age",
"iforte_demo_pressure_test",
];
do_ajax("/set_cfg", pv(par), function (json) {
if (json) {
if (json["status"] == 0) {
close_modal();
location = "/";
}
show_errors(json["status"], par);
loader(0);
}
});
do_ajax("/set_cfg", serialize_parameters(par));
});
});
@@ -121,6 +80,29 @@ function toggleStandbyMode() {
}
function loopRainsSimulator() {
var rains_tube_age = sessionStorage.getItem("iforte_demo_rains_age");
var rains_lowest = sessionStorage.getItem("iforte_demo_rains_lowest");
if (rains_tube_age == 0) {
// new
rains_value = Math.floor(Math.random() * 19) + 80;
} else if (rains_tube_age == 1) {
// average
rains_value = Math.floor(Math.random() * 21) + 40;
} else {
// old
rains_value = Math.floor(Math.random() * 20) + 1;
}
$("#iforte_rains_bar_current").width(rains_value + "%");
if (rains_value < rains_lowest) {
sessionStorage.setItem("iforte_demo_rains_lowest", rains_value);
$("#iforte_rains_bar_max").width(rains_value + "%");
}
setTimeout(() => {
loopRainsSimulator();
}, 1000);
@@ -154,13 +136,15 @@ function pressure_test_loop(time, temp, pressure) {
$("#pt-l1").html("");
$("#pt-l3").html("");
// TODO : implement pressure failing here
$("#pt-l2").html("OK");
$("#pt-l2").addClass("ptok");
/*
var is_test_failing = sessionStorage.getItem("iforte_demo_pressure_test");
if (is_test_failing == 1) {
$('#pt-l2').html('FAIL')
$('#pt-l2').addClass('ptf')
*/
} else {
$("#pt-l2").html("OK");
$("#pt-l2").addClass("ptok");
}
$("#pt_b").html("Start test");
$("#pt_b").addClass("btn-success");
@@ -210,10 +194,7 @@ function do_ajax(p_url, p_data) {
// convert p_data to an Object
const data_object = {};
p_data
.toString()
.split("&")
.forEach((element) => {
p_data.toString().split("&").forEach((element) => {
var kvp = element.split("=");
data_object[kvp[0]] = kvp[1];
});
@@ -228,35 +209,32 @@ function do_ajax(p_url, p_data) {
sessionStorage.setItem("iforte_hr1", "0");
}
break;
case "/reset_temps":
if (p_data.rt == 0) {
sessionStorage.setItem(
"iforte_tmr0",
sessionStorage.getItem("iforte_t0")
);
sessionStorage.setItem("iforte_tmr0", sessionStorage.getItem("iforte_t0"));
} else if (p_data.rt == 3) {
sessionStorage.setItem(
"iforte_tmr3",
sessionStorage.getItem("iforte_t3")
);
sessionStorage.setItem("iforte_tmr3",sessionStorage.getItem("iforte_t3"));
} else if (p_data.rt == 2) {
sessionStorage.setItem(
"iforte_tmr2",
sessionStorage.getItem("iforte_t2")
);
sessionStorage.setItem("iforte_tmr2",sessionStorage.getItem("iforte_t2"));
} else if (p_data.rt == 1) {
sessionStorage.setItem(
"iforte_tmr1",
sessionStorage.getItem("iforte_t1")
);
sessionStorage.setItem("iforte_tmr1",sessionStorage.getItem("iforte_t1"));
}
break;
case "/max_wet":
sessionStorage.setItem("iforte_demo_rains_lowest", "100");
$("#iforte_rains_bar_max").width("100%");
var now = new Date();
var reset_string = "last reset: " + now.getDate() + "." + (now.getMonth() + 1) + "." + now.getFullYear() + " " + now.getHours() + ":" + now.getMinutes() + ":" + now.getSeconds()
sessionStorage.setItem("iforte_demo_rains_last_reset", reset_string);
$("#iforte_demo_rains_last_reset").html(sessionStorage.getItem("iforte_demo_rains_last_reset"));
break;
default:
for (const [key, value] of Object.entries(p_data)) {
//sessionStorage.setItem(key, value)
console.log("key: %o", key);
console.log("val: %o", value);
sessionStorage.setItem(key, value)
console.log("set key: " + key + " to val: " + value);
if (key == "iforte_tmpu") {
if (value == 0) {
@@ -336,7 +314,7 @@ function close_modal() {
}, 500);
}
function pv(p) {
function serialize_parameters(p) {
var s = "";
for (var i in p) {
@@ -491,6 +469,9 @@ function initSessionStorage() {
/* DEMO */
sessionStorage.setItem("iforte_demo_rains_age", "1"); // rains tubes age 0new 1avg 2old
sessionStorage.setItem("iforte_demo_pressure_test", "0"); // type of pressure test, 0ok 1failing
sessionStorage.setItem("iforte_demo_rains_lowest", "100");
sessionStorage.setItem("iforte_demo_rains_last_reset", "last reset: 2.3.2023 16:19:57");
/* VARIABLES */
sessionStorage.setItem("iforte_dmxa", "1"); // dmx addr
@@ -735,6 +716,9 @@ function populateUIFromSessionStorage() {
case "iforte_frq":
var valueToLoad = iforte_frq_s(sessionStorage.getItem("iforte_frq"));
break;
case "iforte_demo_rains_last_reset":
$("#iforte_demo_rains_last_reset").html(sessionStorage.getItem("iforte_demo_rains_last_reset"));
break;
default:
var valueToLoad = sessionStorage.getItem(sessionStorage.key(i));
break;

View File

@@ -566,7 +566,7 @@
if (a_m == 6) {
p_add = "&frq=" + frq;
}
do_ajax(addrs[a_m], pv(params[a_m]) + p_add, function (json) {
do_ajax(addrs[a_m], serialize_parameters(params[a_m]) + p_add, function (json) {
if (json) {
if (json["status"] == 0) {
copy_form_values(0);