only allow tests to start if system is fully armed

diff --git a/ui/app.py b/ui/app.py
index b3588d6f4349ade67391d6d6f940515acd1b24de..c71ccf446ef58a94d6425de83696e54a71db0d77 100755 (executable)
--- a/ui/app.py
+++ b/ui/app.py
@@ -78,8 +78,7 @@ def sense_armed():
           else:
             return 'remote'
         else:
-          return armreq
-          #return 'safe'
+          return 'safe'
 
 path   = os.path.abspath(os.path.dirname(__file__))
 config = {

diff --git a/ui/index.html b/ui/index.html
index c83b36535392bea10328ae7afccee16f0a0952dd..1b5effc80a03cffa816c5e38b45cbcdbd3d93d4e 100644 (file)
--- a/ui/index.html
+++ b/ui/index.html
@@ -19,6 +19,11 @@
           $('#pyro').text(response.pyro);
           $('#battery').text(response.battery);
           $('#armed').text(response.armed);
+          if (response.armed == "armed") {
+            document.querySelector('#startTest').removeAttribute('disabled');
+          } else {
+            document.querySelector('#startTest').setAttribute('disabled', true);
+          }
         });
         request.fail(function(jqXHR, textStatus) 
         {
@@ -33,19 +38,16 @@
     <script>
       // manage system armed state, starting disarmed
       let armreq = "disarm"
-      document.querySelector('#startTest').setAttribute('disabled', true);
 
       function armSystem() {
         if (armreq == "disarm") {
           armreq = "arm";
           var jsonString = '{"request": "arm"}';
           document.querySelector('#ArmButton').textContent = 'Disarm';
-          document.querySelector('#startTest').removeAttribute('disabled');
         } else {
           armreq = "disarm";
           var jsonString = '{"request": "disarm"}';
           document.querySelector('#ArmButton').textContent = 'Arm';
-          document.querySelector('#startTest').setAttribute('disabled', true);
         }
        console.log({ armreq });
         const fetchOptions = {