Eq removal with parser informed.. another fix

KiwiHC16 · Nov 10, 2023 · c20985a · c20985a
1 parent fff1e5f
commit c20985a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/desktop/js/Abeille.js b/desktop/js/Abeille.js
@@ -402,6 +402,28 @@ function removeSelectedEq(zgId) {
     for (const eqId of eqIdList) removeEq(zgId, eqId);
 }
 
+/* Click on 'remove' button in equipement details page.
+    Delete current equipment from Jeedom DB.
+    Default action from 'core/js/plugin.template.js' is redefined */
+$(".eqLogicAction[data-action=remove]")
+    .off("click")
+    .on("click", function (evt) {
+        console.log("eqLogicAction[data-action=remove] click: evt=", evt);
+        evt.stopPropagation();
+
+        if ($(".eqLogicAttr[data-l1key=id]").value() == undefined) {
+            console.log("ERROR: Undefined 'data-l1key=id'");
+            return;
+        }
+        eqId = $(".eqLogicAttr[data-l1key=id]").value();
+        eqLogicalId = $(".eqLogicAttr[data-l1key=logicalId]").value();
+        zgId = eqLogicalId.substring(7, 8);
+        console.log(
+            "eqId=" + eqId + ", logicId=" + eqLogicalId + " => zgId=" + zgId
+        );
+        removeEq(zgId, eqId);
+    });
+
 /* Remove from Jeedom eq with ID 'eqId' but list first how it is used and ask confirmation to user */
 function removeEq(zgId, eqId) {
     console.log("removeEq(" + eqId + ")");

diff --git a/desktop/php/Abeille.php b/desktop/php/Abeille.php
@@ -102,7 +102,6 @@
 </div>
 
 <!-- Scripts -->
-<!-- < ?php include 'Abeille-Js.php'; ?> -->
 <?php include_file('desktop', 'Abeille', 'js', 'Abeille'); ?>
 <script>
     // TODO: addCmdToTable() to be moved to Abeille.js but need to fix remaining PHP code in it.