Fix outdoor-indoor and nodes-servers toggles

Author: Léna Voinchet

index.html

@@ -669,13 +669,13 @@ <h3>Front wall scene size</h3>
             <div id="lidars-buttons" class="row center-x hidden">
               <!-- ADD BUTTON -->
               <div id="add-lidar-button" class="button main-button" >
-                <p>+ New lidar</p>
+                <p>+ New LiDAR</p>
               </div>
 
               <!-- DELETE BUTTON -->
               <div id="delete-all-lidars-button" class="button default-button" >
                 <span class="iconify secondary-icon" data-icon="fluent:delete-16-filled"></span>
-                <p>Delete all lidars</p>
+                <p>Delete all LiDARs</p>
               </div>
             </div>
           </div>

js/UI/LidarUI.js

@@ -23,7 +23,7 @@ class LidarUI{
                 <div id="lidar-` + (lidar.id) + `-UI-header" class="row center-x-spaced center-y">
                     <div class="row center-y">
                         <div class="sensor-color" style="background-color: #`+ lidar.color.getHexString() + `;"></div>
-                        <p class="main-text">Lidar ` + (lidar.id + 1) + `</p>
+                        <p class="main-text">LiDAR ` + (lidar.id + 1) + `</p>
                     </div>
                     <div class="row center-y">
                         <!-- <div id="lidar-` + (lidar.id) + `-solo-button"><span class="iconify" data-icon="bx:search-alt-2"></span></div> -->

js/UI/Popup.js

@@ -584,30 +584,23 @@ class Popup{
 
         function bindHardwareEventListeners(sensorsElements)
         {
-            //New toggle indoor-outoor events
+            // Environment and equipment toggle listening
             const toggleElemOutIn = document.getElementById("toggle-outdoor-indoor");
+            const toggleElemNodSer = document.getElementById("toggle-node-server");
+
+            let sceneEnvironment = toggleElemOutIn.checked ? 'outdoor' : 'indoor';
+            let nodesOrServers = toggleElemNodSer.checked ? 'nodes' : 'servers';
+
             toggleElemOutIn.addEventListener('change', () => {
-                let sceneEnvironment;
-                if(toggleElemOutIn.checked){
-                    sceneEnvironment = 'outdoor'
-                } else{
-                    sceneEnvironment = 'indoor'
-                }
-                disableSensorsConsideringEnvironment(sceneEnvironment);
+                sceneEnvironment = toggleElemOutIn.checked ? 'outdoor' : 'indoor';
                 sceneManager.changeEnvironment(sceneEnvironment);
+                disableSensorsConsideringEnvironmentAndEquipment(sceneEnvironment, nodesOrServers);
             });
 
-            //New toggle node-server events
-            // TODO
-            const toggleElemNodSer = document.getElementById("toggle-node-server");
             toggleElemNodSer.addEventListener('change', () => {
-                if(toggleElemNodSer.checked){
-                    nodesOrServers = "nodes"
-                } else {
-                    nodesOrServers = "servers"
-                }
-                disableSensorsConsideringNodesAndServers(nodesOrServers)
-            })
+                nodesOrServers = toggleElemNodSer.checked ? 'nodes' : 'servers';
+                disableSensorsConsideringEnvironmentAndEquipment(sceneEnvironment, nodesOrServers);
+            });
 
             // OLD Switch indoor-outdoor events
             // const switchElement = document.getElementById('hardware-switch-indoor-outdoor');
@@ -751,7 +744,6 @@ class Popup{
         //New function
         function disableSensorsConsideringNodesAndServers(nodesOrServers)
         {
-            //TODO
             sensorsCompatible.forEach(s => {
                 if(s.usedWith.includes(nodesOrServers)){
                     document.getElementById(s.textId).classList.remove("hidden");
@@ -762,6 +754,28 @@ class Popup{
             });
         }
 
+        //NEW FUNCTION A CORRIGER
+        function disableSensorsConsideringEnvironmentAndEquipment(environment, nodesOrServers)
+        {
+            let disabledSensorsNumber = 0;
+
+            sensorsCompatible.forEach(s => {
+                if(s.canBeUsed.includes(environment) && s.usedWith.includes(nodesOrServers)) {
+                    document.getElementById(s.textId).classList.remove("hidden");
+                } else {
+                    document.getElementById(s.textId).classList.add("hidden");
+                    disabledSensorsNumber++;
+                }
+            });
+
+            if(sensorsCompatible.length === disabledSensorsNumber){
+                document.getElementById('hardware-warning-message').classList.remove("hidden");
+            } else {
+                document.getElementById('hardware-warning-message').classList.add("hidden");
+                selectFirstSensorAvailable();
+            }
+        }
+
         function selectFirstSensorAvailable()
         {
             const sensorsDiv = document.getElementById('multi-select-sensors');