Merge branch 'fronkdev' into 'master'

Added preorderTrigger / added cif api docs

See merge request fronk/thetool!268

Layout/default/Preorder/Index.php

@@ -705,5 +705,195 @@
           setTimeout((id) => {maps["map-" + id].invalidateSize()}, 50, id);
         }
       }
+      
+      
+      // detail
+      function togglePortdata(pid) {
+        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default"));
+        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default"));
+        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default"));
+
+        $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val($("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default"));
+
+
+        $("#preorder-detail-" + pid + "-patchposition-data-form").toggle();
+        $("#preorder-detail-" + pid + "-patchposition-string").toggle();
+
+        $("#preorder-detail-" + pid + "-patchposition-port-form").toggle();
+        $("#preorder-detail-" + pid + "-patchposition-port").toggle();
+
+        $("#preorder-detail-" + pid + "-patchposition-edit").toggle();
+        $("#preorder-detail-" + pid + "-patchposition-controls").toggle();
+
+      }
+
+      function savePortdata(pid) {
+        if(!pid) return;
+
+        var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
+        var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
+        var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
+        var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
+
+        $.post("<?=self::getUrl("Preorder", "Api")?>", {
+            do: "savePatchposition",
+            id: pid,
+            cluster: cluster,
+            shelf: shelf,
+            module: module,
+            port: port
+          },
+          (success) => {
+            if(success.status == "OK") {
+              var pid = success.result.id;
+              var default_cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default");
+              var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
+              var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
+              var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
+              var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
+
+              if(!cluster) cluster = default_cluster;
+
+              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default", cluster);
+              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default", shelf);
+              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default", module);
+              $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default", port);
+              $("#preorder-detail-" + pid + "-patchposition-string").text(cluster + "-" + shelf + "-" + module);
+              $("#preorder-detail-" + pid + "-patchposition-port").text(port);
+              togglePortdata(pid);
+
+            }
+          },
+          "json"
+        );
+      }
+
+      function toggleStatusControl(pid, sid) {
+        // set select to current status id
+        $("#preorder-detail-status-" + pid + "-input select").val($("#preorder-detail-status-" + pid + "-text").data("status-id"));
+
+        // toggle controls
+        $("#preorder-detail-status-" + pid + "-text").toggle();
+        $("#preorder-detail-status-" + pid + "-input").toggle();
+
+        return false;
+      }
+
+      function savePreorderStatusControl(pid) {
+        if(!Number.isInteger(pid) || pid < 1) {
+          return false;
+        }
+
+        var value = $("#preorder-detail-status-" + pid + "-input select").val();
+
+        //console.log("add opacity-5 to ")
+        $("#preorder-" + pid + "-body").addClass("opacity-5");
+        $("#preorder-" + pid + "-body .loader-big").show();
+
+        // reset loading overlay if request times out
+        setTimeout(() => {
+          $("#preorder-" + pid + "-body").removeClass("opacity-5");
+          $("#preorder-" + pid + "-body .loader-big").hide();
+        }, 5000);
+
+        $.post("<?=self::getUrl("Preorder","Api")?>",
+        {
+          'do': "updateStatus",
+          id: pid,
+          status_id: value
+        },
+        function(success) {
+          if(success.status == "OK") {
+            var updates = success.result.updates;
+            //console.log(updates);
+
+            updates.forEach(function(u) {
+              //console.log(u);
+              // update detail status text
+              $("#preorder-detail-status-" + u.id + "-statustext").text(u.code + " - " + u.text);
+              $("#preorder-detail-status-" + u.id + "-text").addClass("text-success");
+              setTimeout(() => { $("#preorder-detail-status-" + u.id + "-text").removeClass("text-success") }, 1500);
+
+              // update list status text
+              $("#preorder-" + u.id + " .status").text(u.code + " - " + u.text);
+              $("#preorder-" + u.id + " .status").addClass("text-success");
+              setTimeout(() => { $("#preorder-" + u.id + " .status").removeClass("text-success") }, 1500);
+
+              // update status id data attribute
+              $("#preorder-detail-status-" + u.id + "-text").data("status-id", u.sid);
+
+              if(u.bcode) {
+                $("#preorder-detail-building-status-" + u.id).text(u.bcode + " - " + u.btext);
+              }
+              if(u.ucode) {
+                $("#preorder-detail-unit-status-" + u.id).text(u.ucode + " - " + u.utext);
+              }
+
+              if(u.ciftoken) {
+                $("#preorder-detail-ciftoken-" + u.id).text(u.ciftoken);
+              }
+              if(u.cifcableurl) {
+                $("#preorder-detail-cifcableurl-" + u.id).text(u.cifcableurl);
+              }
+            });
+            /*
+            if("preorder" in update) {
+              // update detail status text
+              $("#preorder-detail-status-" + pid + "-statustext").text(update.preorder.status.code + " - " + update.preorder.status.text);
+              $("#preorder-detail-status-" + pid + "-text").addClass("text-success");
+              setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
+
+              // update list status text
+              $("#preorder-" + pid + " .status").text(update.preorder.status.code + " - " + update.preorder.status.text);
+              $("#preorder-" + pid + " .status").addClass("text-success");
+              setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
+
+              // update status id data attribute
+              $("#preorder-detail-status-" + pid + "-text").data("status-id", update.preorder.status.id);
+            }
+
+            if("building" in update) {
+              // update building status text
+              $("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text);
+            }
+            if("unit" in update) {
+              // update unit status text
+              $("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text);
+            }
+            */
+            toggleStatusControl(pid);
+
+          }
+
+          $("#preorder-" + pid + "-body").removeClass("opacity-5");
+          $("#preorder-" + pid + "-body .loader-big").hide();
+        },
+        'json');
+      }
+
+      function deleteWorkorder(pid) {
+        console.log("in delete workorder");
+        if(!Number.isInteger(pid) || pid < 1) {
+          return false;
+        }
+
+        $.post("<?=self::getUrl("Preorder","Api")?>",
+        {
+          'do': "deleteWorkorder",
+          id: pid,
+        },
+        function(success) {
+          if(success.status == "OK") {
+            $("#preorder-detail-" + success.result.id + "-workorder td").each(function() {
+              $(this).html("<em class='text-monospace'>--gelöscht--</em>");
+            });
+
+            $("#preorder-detail-" + success.result.id + "-workorder-del").remove();
+          }
+        },
+        'json');
+
+        return false;
+      }
     </script>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Preorder/include/preorder-detail.php

@@ -113,10 +113,10 @@
                         <table class="table table-sm table-striped">
                           <tr>
                             <th>CIF Token:</th>
-                            <td class="text-monospace"><?=$preorder->ciftoken?></td>
+                            <td class="text-monospace" id="preorder-detail-ciftoken-<?=$preorder->id?>"><?=$preorder->ciftoken?></td>
                           </tr><tr>
                             <th>CIF Kabelnachbestell-Url:</th>
-                            <td class="text-monospace"><?=$preorder->cifcableurl?></td>
+                            <td class="text-monospace" id="preorder-detail-cifcableurl-<?=$preorder->id?>"><?=$preorder->cifcableurl?></td>
                           </tr><tr>
                             <th>Starterpaket versandt:</th>
                             <td class="text-monospace"><?=($preorder->logistics && $preorder->logistics->sent) ? '<i class="fas fa-fw fa-check text-success"></i> '.date("d.m.Y H:i", $preorder->logistics->sent) : '<i class="fas fa-fw fa-xmark text-danger"></i>'?></td>
@@ -466,187 +466,3 @@
 
 </div>
 
-<script type="text/javascript">
-  
-  function togglePortdata(pid) {
-    $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default"));
-    $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default"));
-    $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default"));
-    
-    $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val($("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default"));
-    
-    
-    $("#preorder-detail-" + pid + "-patchposition-data-form").toggle();
-    $("#preorder-detail-" + pid + "-patchposition-string").toggle();
-
-    $("#preorder-detail-" + pid + "-patchposition-port-form").toggle();
-    $("#preorder-detail-" + pid + "-patchposition-port").toggle();
-    
-    $("#preorder-detail-" + pid + "-patchposition-edit").toggle();
-    $("#preorder-detail-" + pid + "-patchposition-controls").toggle();
-    
-  }
-  
-  function savePortdata(pid) {
-    if(!pid) return;
-    
-    var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
-    var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
-    var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
-    var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
-    
-    $.post("<?=self::getUrl("Preorder", "Api")?>", {
-        do: "savePatchposition",
-        id: pid,
-        cluster: cluster,
-        shelf: shelf,
-        module: module,
-        port: port
-      },
-      (success) => {
-        if(success.status == "OK") {
-          var pid = success.result.id;
-          var default_cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default");
-          var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
-          var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
-          var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
-          var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
-          
-          if(!cluster) cluster = default_cluster;
-          
-          $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default", cluster);
-          $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default", shelf);
-          $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default", module);
-          $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default", port);
-          $("#preorder-detail-" + pid + "-patchposition-string").text(cluster + "-" + shelf + "-" + module);
-          $("#preorder-detail-" + pid + "-patchposition-port").text(port);
-          togglePortdata(pid);
-          
-        }
-      },
-      "json"
-    );
-  }
-  
-  function toggleStatusControl(pid, sid) {
-    // set select to current status id
-    $("#preorder-detail-status-" + pid + "-input select").val($("#preorder-detail-status-" + pid + "-text").data("status-id"));
-    
-    // toggle controls
-    $("#preorder-detail-status-" + pid + "-text").toggle();
-    $("#preorder-detail-status-" + pid + "-input").toggle();
-    
-    return false;
-  }
-  
-  function savePreorderStatusControl(pid) {
-    if(!Number.isInteger(pid) || pid < 1) {
-      return false;
-    }
-    
-    var value = $("#preorder-detail-status-" + pid + "-input select").val();
-    
-    //console.log("add opacity-5 to ")
-    $("#preorder-" + pid + "-body").addClass("opacity-5");
-    $("#preorder-" + pid + "-body .loader-big").show();
-
-    // reset loading overlay if request times out
-    setTimeout(() => {
-      $("#preorder-" + pid + "-body").removeClass("opacity-5");
-      $("#preorder-" + pid + "-body .loader-big").hide();
-    }, 5000);
-    
-    $.post("<?=self::getUrl("Preorder","Api")?>",
-    {
-      'do': "updateStatus",
-      id: pid,
-      status_id: value
-    },
-    function(success) {
-      if(success.status == "OK") {
-        var updates = success.result.updates;
-        //console.log(updates);
-        
-        updates.forEach(function(u) {
-          //console.log(u);
-          // update detail status text
-          $("#preorder-detail-status-" + u.id + "-statustext").text(u.code + " - " + u.text);
-          $("#preorder-detail-status-" + u.id + "-text").addClass("text-success");
-          setTimeout(() => { $("#preorder-detail-status-" + u.id + "-text").removeClass("text-success") }, 1500);
-          
-          // update list status text
-          $("#preorder-" + u.id + " .status").text(u.code + " - " + u.text);
-          $("#preorder-" + u.id + " .status").addClass("text-success");
-          setTimeout(() => { $("#preorder-" + u.id + " .status").removeClass("text-success") }, 1500);
-          
-          // update status id data attribute
-          $("#preorder-detail-status-" + u.id + "-text").data("status-id", u.sid);
-          
-          if(u.bcode) {
-            $("#preorder-detail-building-status-" + u.id).text(u.bcode + " - " + u.btext);
-          }
-          if(u.ucode) {
-            $("#preorder-detail-unit-status-" + u.id).text(u.ucode + " - " + u.utext);
-          }
-        });
-        /*
-        if("preorder" in update) {
-          // update detail status text
-          $("#preorder-detail-status-" + pid + "-statustext").text(update.preorder.status.code + " - " + update.preorder.status.text);
-          $("#preorder-detail-status-" + pid + "-text").addClass("text-success");
-          setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
-
-          // update list status text
-          $("#preorder-" + pid + " .status").text(update.preorder.status.code + " - " + update.preorder.status.text);
-          $("#preorder-" + pid + " .status").addClass("text-success");
-          setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
-          
-          // update status id data attribute
-          $("#preorder-detail-status-" + pid + "-text").data("status-id", update.preorder.status.id);
-        }
-        
-        if("building" in update) {
-          // update building status text
-          $("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text);
-        }
-        if("unit" in update) {
-          // update unit status text
-          $("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text);
-        }
-        */
-        toggleStatusControl(pid);
-        
-      }
-      
-      $("#preorder-" + pid + "-body").removeClass("opacity-5");
-      $("#preorder-" + pid + "-body .loader-big").hide();
-    },
-    'json');
-  }
-  
-  function deleteWorkorder(pid) {
-    console.log("in delete workorder");
-    if(!Number.isInteger(pid) || pid < 1) {
-      return false;
-    }
-    
-    $.post("<?=self::getUrl("Preorder","Api")?>",
-    {
-      'do': "deleteWorkorder",
-      id: pid,
-    },
-    function(success) {
-      if(success.status == "OK") {
-        $("#preorder-detail-" + success.result.id + "-workorder td").each(function() {
-          $(this).html("<em class='text-monospace'>--gelöscht--</em>");
-        });
-        
-        $("#preorder-detail-" + success.result.id + "-workorder-del").remove();
-      }
-    },
-    'json');
-    
-    return false;
-  }
-
-</script>