diff --git a/application/views/sattimers/index.php b/application/views/sattimers/index.php index ac247ea2..53a494aa 100644 --- a/application/views/sattimers/index.php +++ b/application/views/sattimers/index.php @@ -14,8 +14,11 @@ var custom_date_format = ""; if ($activation['timestamp'] != null) { echo "var tevel".$i."Date = ".$activation['timestamp']." * 1000;\n"; echo "dateArray.push(tevel".$i."Date);\n"; + echo "var tevel".$i."Workable = ".($activation['timestamp'] > $activation['aos_time'] ? 1 : 0)."\n"; + echo "dateArray.push(tevel".$i."Workable);\n"; } else { echo "dateArray.push(0);\n"; + echo "dateArray.push(0);\n"; } $i++; endforeach; ?> diff --git a/assets/js/sections/sattimers.js b/assets/js/sections/sattimers.js index 3d8cac50..06f7af82 100644 --- a/assets/js/sections/sattimers.js +++ b/assets/js/sections/sattimers.js @@ -2,24 +2,24 @@ function update(i) { var now = new Date(); if (dateArray[i] == 0) { - var element = document.getElementById("tevel"+i+"Timer"); + var element = document.getElementById("tevel"+(i+1)/2+"Timer"); element.innerHTML = "NOT FUNCTIONAL"; element.classList.add("nonfunctional"); - element = document.getElementById("emoji"+i); + element = document.getElementById("emoji"+(i+1)/2); element.innerHTML = "💀"; - element = document.getElementById("tevel"+i+"Timeout"); + element = document.getElementById("tevel"+(i+1)/2+"Timeout"); element.className = "expired"; - element = document.getElementById("tevel"+i+"AosTime"); + element = document.getElementById("tevel"+(i+1)/2+"AosTime"); element.className = "expired"; - element = document.getElementById("tevel"+i+"LosTime"); + element = document.getElementById("tevel"+(i+1)/2+"LosTime"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Aos"); + element = document.getElementById("tevel"+(i+1)/2+"Aos"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Los"); + element = document.getElementById("tevel"+(i+1)/2+"Los"); element.className = "expired"; - element = document.getElementById("tevel"+i+"MaxEl"); + element = document.getElementById("tevel"+(i+1)/2+"MaxEl"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Duration"); + element = document.getElementById("tevel"+(i+1)/2+"Duration"); element.className = "expired"; } else { @@ -33,39 +33,66 @@ function update(i) { if (distance < 0) { clearInterval(x); - var element = document.getElementById("tevel"+i+"Timer"); + var element = document.getElementById("tevel"+(i+1)/2+"Timer"); element.innerHTML = "TIMED OUT"; element.classList.add("timedout"); - element = document.getElementById("emoji"+i); + element = document.getElementById("emoji"+(i+1)/2); element.innerHTML = "❌"; - element = document.getElementById("tevel"+i+"Timeout"); + element = document.getElementById("tevel"+(i+1)/2+"Timeout"); element.className = "expired"; element.innerHTML = moment(satDate).format(custom_date_format)+" "+satDate.getUTCHours().toString().padStart(2, '0')+":"+satDate.getUTCMinutes().toString().padStart(2, '0'); - element = document.getElementById("tevel"+i+"AosTime"); + element = document.getElementById("tevel"+(i+1)/2+"AosTime"); element.className = "expired"; - element = document.getElementById("tevel"+i+"LosTime"); + element = document.getElementById("tevel"+(i+1)/2+"LosTime"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Aos"); + element = document.getElementById("tevel"+(i+1)/2+"Aos"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Los"); + element = document.getElementById("tevel"+(i+1)/2+"Los"); element.className = "expired"; - element = document.getElementById("tevel"+i+"MaxEl"); + element = document.getElementById("tevel"+(i+1)/2+"MaxEl"); element.className = "expired"; - element = document.getElementById("tevel"+i+"Duration"); + element = document.getElementById("tevel"+(i+1)/2+"Duration"); element.className = "expired"; } else { - var element = document.getElementById("tevel"+i+"Timer"); + var element = document.getElementById("tevel"+(i+1)/2+"Timer"); element.innerHTML = days + "d " + hours + "h " + minutes.toString().padStart(2, '0') + "m " + seconds.toString().padStart(2, '0') + "s"; element.classList.add("active"); - element = document.getElementById("emoji"+i); + element = document.getElementById("emoji"+(i+1)/2); element.innerHTML = "✅"; - element = document.getElementById("tevel"+i+"Timeout"); + element = document.getElementById("tevel"+(i+1)/2+"Timeout"); element.innerHTML = moment(satDate).format(custom_date_format)+" "+satDate.getUTCHours().toString().padStart(2, '0')+":"+satDate.getUTCMinutes().toString().padStart(2, '0'); + if (dateArray[i+1] == 1) { + element = document.getElementById("tevel"+(i+1)/2+"AosTime"); + element.className = "active"; + element = document.getElementById("tevel"+(i+1)/2+"LosTime"); + element.className = "active"; + element = document.getElementById("tevel"+(i+1)/2+"Aos"); + element.className = "active"; + element = document.getElementById("tevel"+(i+1)/2+"Los"); + element.className = "active"; + element = document.getElementById("tevel"+(i+1)/2+"MaxEl"); + element.className = "active"; + element = document.getElementById("tevel"+(i+1)/2+"Duration"); + element.className = "active"; + } else if (dateArray[i+1] == 0) { + element = document.getElementById("tevel"+(i+1)/2+"AosTime"); + element.className = "timedout"; + element = document.getElementById("tevel"+(i+1)/2+"LosTime"); + element.className = "timedout"; + element = document.getElementById("tevel"+(i+1)/2+"Aos"); + element.className = "timedout"; + element = document.getElementById("tevel"+(i+1)/2+"Los"); + element.className = "timedout"; + element = document.getElementById("tevel"+(i+1)/2+"MaxEl"); + element.className = "timedout"; + element = document.getElementById("tevel"+(i+1)/2+"Duration"); + element.className = "timedout"; + } } } } -for (let i=1; i<=13; i++) { +for (let i=1; i<=26; i+=2) { var x = setInterval(function() { update(i); }, 1000);