@crystaldesign/web-planner-logic 26.8.0-beta.6 → 26.8.0-beta.60

package/build/cjs/{DivaBoxPlanner-2e2137f1.js → DivaBoxPlanner-fc71667b.js}

@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-cab186f5.js');
+var PlannerHandler2D = require('./PlannerHandler2D-5f39e0af.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');
@@ -2664,6 +2664,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
       var changedElement = elements[changedElementIdx];
       if (!changedElement) return; // nothing changed in this row
       var t = Object.entries(changedOPTs);
+      if (t.length == 0) return;
       var opt = t[0][0];
       var opv = t[0][1];
       var hadSpace = false;
@@ -2843,6 +2844,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
         var seriesWidthToPlateOpv = coverPlateRule.seriesWidthToPlateOpv;
 
         // default => set all to ohne
+
         serie.forEach(function (element) {
           var _element$size$width;
           seriesWidth += (_element$size$width = element.size.width) !== null && _element$size$width !== void 0 ? _element$size$width : 0;
@@ -2852,37 +2854,30 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
           _this5.setOptionValue(element.elementId, coverPlateRule.optABD, 'OPVOHNE', optionHandler);
         });
         var firstUncoveredElement = serie[0];
-        var _loop = function _loop() {
-            var opv = seriesWidthToPlateOpv.findLast(function (stp) {
-              // is a clean element ending
-              var helperWidth = 0;
-              var isClean = false;
-              serie.forEach(function (element) {
-                var _element$size$width2;
-                helperWidth += (_element$size$width2 = element.size.width) !== null && _element$size$width2 !== void 0 ? _element$size$width2 : 0;
-                if (Math.abs(helperWidth - stp.limit) < 1) isClean = true;
-              });
-              if (stp.limit <= seriesWidth && isClean) return true;
-              return false;
-            });
-            if (!opv) return {
-              v: void 0
-            };
-            _this5.setOptionValue(firstUncoveredElement.elementId, coverPlateRule.optABD, opv.plateOpv, optionHandler);
+        var elementCoverage = firstUncoveredElement.area.fromX;
+        while (seriesWidth != 0) {
+          var _boxPlannerGrid$GridS;
+          var opv = seriesWidthToPlateOpv.findLast(function (stp) {
+            // is a clean element ending
             var helperWidth = 0;
-            firstUncoveredElement = serie.find(function (e) {
-              var _e$size$width;
-              helperWidth += (_e$size$width = e.size.width) !== null && _e$size$width !== void 0 ? _e$size$width : 0;
-              if (helperWidth > opv.limit) return true;
-              return false;
+            var isClean = false;
+            serie.forEach(function (element) {
+              var _element$size$width2;
+              helperWidth += (_element$size$width2 = element.size.width) !== null && _element$size$width2 !== void 0 ? _element$size$width2 : 0;
+              if (Math.abs(helperWidth - stp.limit) < 1) isClean = true;
             });
-            seriesWidth = seriesWidth - opv.limit;
-            if (seriesWidthToPlateOpv[1].limit > seriesWidth) seriesWidth = 0;
-          },
-          _ret;
-        while (seriesWidth != 0) {
-          _ret = _loop();
-          if (_ret) return _ret.v;
+            if (stp.limit <= seriesWidth && isClean) return true;
+            return false;
+          });
+          if (!opv) return;
+          _this5.setOptionValue(firstUncoveredElement.elementId, coverPlateRule.optABD, opv.plateOpv, optionHandler);
+          elementCoverage += Math.round(opv.limit / ((_boxPlannerGrid$GridS = boxPlannerGrid.GridSetupParams.fixCellRasterWidth) !== null && _boxPlannerGrid$GridS !== void 0 ? _boxPlannerGrid$GridS : 1));
+          firstUncoveredElement = serie.find(function (e) {
+            if (e.area.fromX >= elementCoverage) return true;
+            return false;
+          });
+          seriesWidth = seriesWidth - opv.limit;
+          if (seriesWidthToPlateOpv[1].limit > seriesWidth) seriesWidth = 0;
         }
       });
     }
@@ -3767,6 +3762,9 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
     }
   }, {
     key: "GridSetupParams",
+    get: function get() {
+      return this.gridSetupParams;
+    },
     set: function set(gridSetupParams) {
       this.gridSetupParams = gridSetupParams;
     }

package/build/cjs/{DivaStandardPlanner-f389ef1a.js → DivaStandardPlanner-732f9d86.js}

@@ -5,9 +5,9 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-cab186f5.js');
+var PlannerHandler2D = require('./PlannerHandler2D-5f39e0af.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
@@ -440,7 +440,7 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
                     //This is the center position of the element - This is needed in order to set the static room layout correctly
 
                     if (globalBoundingBox == undefined) {
-                      plannerElement.WorldPosCenter = new index.Vector3(this.plannerBoundingBox.WorldPos.x + this.plannerBoundingBox.Size.x + (this.plannerBoundingBox.Size.x == 0 ? 0 : plannerElement.Width / 2 + xOffset), this.plannerBoundingBox.WorldPos.y + plannerElement.Height / 2, this.plannerBoundingBox.WorldPos.z + plannerElement.Depth / 2);
+                      plannerElement.WorldPosCenter = new index.Vector3(this.plannerBoundingBox.WorldPos.x + this.plannerBoundingBox.Size.x + (this.plannerBoundingBox.Size.x == 0 ? 0 : plannerElement.Width / 2 + xOffset), this.plannerBoundingBox.WorldPos.y, this.plannerBoundingBox.WorldPos.z + plannerElement.Depth / 2);
                     }
 
                     //Tell the set this the element was not docked

package/build/cjs/{DoorPlanner-fa73b631.js → DoorPlanner-e8e8ec7c.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-3891c460.js');
+require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-b0567441.js → Host3DSignalR-b148cbae.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-7d16f2f9.js → LiviqueWWSHandler-bf59df95.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-3891c460.js');
+require('./index-98d1cddd.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-5ebc0e14.js → PfisterWWSHandler-d566562f.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
@@ -284,6 +284,15 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
         } else {
           sapOrderlines = sapOrderlines.concat(blindSAPOrderLines);
         }
+      } else if (blindSAPOrderLines.length > 0) {
+        //ZKAT/blind Artikel zusätzlich zu expliziten SAP Orderlines nur listen, wenn per ADD_AS_ZKAT markiert
+        var zkatLinesToAdd = blindSAPOrderLines.filter(function (line) {
+          return line.basketIds.some(function (id) {
+            var _articles$id;
+            return (_articles$id = articles[id]) === null || _articles$id === void 0 ? void 0 : _articles$id.addAsZKAT;
+          });
+        });
+        sapOrderlines = sapOrderlines.concat(zkatLinesToAdd);
       }
       if (orderSet.BruttoSetPrice) orderSet.SetPrice = orderSet.BruttoSetPrice;
       return {

package/build/cjs/{PlannerHandler2D-cab186f5.js → PlannerHandler2D-5f39e0af.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');
@@ -1670,8 +1670,9 @@ var DockingPointHandler = /*#__PURE__*/function () {
     value: function checkDPAVLFilterDoMatch(plannerElement1, plannerElement2) {
       var avrFilter1 = plannerElement1.FilterAVR;
       var avlFilter2 = plannerElement2.FilterAVL;
-      if (avlFilter2.length == 0 && avrFilter1.length == 0) return true; //Diese überprüfung bin ich mir nicht sicher, dass es so passt.
 
+      // An empty filter on either side means "no connector restriction" -> always dockable.
+      if (avlFilter2.length == 0 || avrFilter1.length == 0) return true;
       for (var i = 0; i < avrFilter1.length; i++) {
         for (var j = 0; j < avlFilter2.length; j++) {
           if (avrFilter1[i] == avlFilter2[j]) {
@@ -1686,7 +1687,9 @@ var DockingPointHandler = /*#__PURE__*/function () {
     value: function checkDPAVRFilterDoMatch(plannerElement1, plannerElement2) {
       var avlFilter1 = plannerElement1.FilterAVL;
       var avrFilter2 = plannerElement2.FilterAVR;
-      if (avlFilter1.length == 0 && avrFilter2.length == 0) return true; //Diese überprüfung bin ich mir nicht sicher, dass es so passt.
+
+      // An empty filter on either side means "no connector restriction" -> always dockable.
+      if (avlFilter1.length == 0 || avrFilter2.length == 0) return true;
       for (var i = 0; i < avlFilter1.length; i++) {
         for (var j = 0; j < avrFilter2.length; j++) {
           if (avlFilter1[i] == avrFilter2[j]) {
@@ -1706,10 +1709,18 @@ var DockingPointHandler = /*#__PURE__*/function () {
       var avrDockable = this.checkDPAVRFilterDoMatch(sourcePlannerElement, targetElement);
       var avlDockable = this.checkDPAVLFilterDoMatch(sourcePlannerElement, targetElement);
       var refDPType = this.getReferenceDPType(dp1.Type);
-      if (refDPType == 'AVL' && !avlDockable) return false;
-      if (refDPType == 'AVR' && !avrDockable) return false;
-      if (dp2.Type != refDPType) return false;
-      if (dp1.IsDocking || dp2.IsDocking) return false;
+      if (refDPType == 'AVL' && !avlDockable) {
+        return false;
+      }
+      if (refDPType == 'AVR' && !avrDockable) {
+        return false;
+      }
+      if (dp2.Type != refDPType) {
+        return false;
+      }
+      if (dp1.IsDocking || dp2.IsDocking) {
+        return false;
+      }
       if (!dp1.IgnoreLayer || !dp2.IgnoreLayer) {
         var doCheckLayer = true;
         if (dp1.PlannerConfig.ignoreLayerAVC && (dp1.Type == 'AVC' || dp2.Type == 'AVC')) {
@@ -1722,9 +1733,13 @@ var DockingPointHandler = /*#__PURE__*/function () {
           doCheckLayer = false;
         }
         //Check layer
-        if (doCheckLayer && dp2.Layer == dp1.Layer) return false;
+        if (doCheckLayer && dp2.Layer == dp1.Layer) {
+          return false;
+        }
+      }
+      if (!dp1.PlannerConfig.ignoreDockingNumber && dp1.HasNumber && dp2.HasNumber && dp1.Number != dp2.Number) {
+        return false;
       }
-      if (dp1.HasNumber && dp2.HasNumber && dp1.Number != dp2.Number) return false;
       return true;
     }
 

package/build/cjs/{SeriousBasketHandler-7563aaa9.js → SeriousBasketHandler-e037310e.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-acc07376.js → ShelfPlanner-2694fa00.js}

@@ -6,7 +6,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-abd363ef.js → StandardWWSHandler-07940a73.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-3891c460.js');
+require('./index-98d1cddd.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');