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

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-3891c460.js');
+var index = require('./index-98d1cddd.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/classCallCheck');

package/build/esm/{DivaBoxPlanner-9b70334c.js → DivaBoxPlanner-8b5206ab.js}

@@ -3,11 +3,11 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-cb39833e.js';
+import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-213f70af.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-5524f621.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-919ad010.js';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
 import '@crystaldesign/basket-model';
@@ -2651,6 +2651,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;
@@ -2830,6 +2831,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;
@@ -2839,37 +2841,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;
         }
       });
     }
@@ -3754,6 +3749,9 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
     }
   }, {
     key: "GridSetupParams",
+    get: function get() {
+      return this.gridSetupParams;
+    },
     set: function set(gridSetupParams) {
       this.gridSetupParams = gridSetupParams;
     }

package/build/esm/{DivaStandardPlanner-6d3690b8.js → DivaStandardPlanner-63ce6a04.js}

@@ -3,9 +3,9 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { V as Vector3, c as Vector2, P as PlannerElementData, B as BoundingBox } from './index-cb39833e.js';
+import { V as Vector3, c as Vector2, P as PlannerElementData, B as BoundingBox } from './index-213f70af.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-5524f621.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-919ad010.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
@@ -429,7 +429,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 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 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/esm/{DoorPlanner-81a93a41.js → DoorPlanner-7e0146b3.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import './index-cb39833e.js';
+import './index-213f70af.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';

package/build/esm/{Host3DSignalR-adc38975.js → Host3DSignalR-69df2c2d.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { R as Rendering, H as HQRenderScript } from './index-cb39833e.js';
+import { R as Rendering, H as HQRenderScript } from './index-213f70af.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 import io from 'socket.io-client';

package/build/esm/{LiviqueWWSHandler-1bba645a.js → LiviqueWWSHandler-7e2fdbd9.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-cb39833e.js';
+import './index-213f70af.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';

package/build/esm/{PfisterWWSHandler-f5d757ea.js → PfisterWWSHandler-1abd4f92.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { a as articleHandlerInstance } from './index-cb39833e.js';
+import { a as articleHandlerInstance } from './index-213f70af.js';
 import { SAPOrderLineData } from '@crystaldesign/basket-model';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
@@ -276,6 +276,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/esm/{PlannerHandler2D-5524f621.js → PlannerHandler2D-919ad010.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { c as Vector2, D as DockingPoint, V as Vector3 } from './index-cb39833e.js';
+import { c as Vector2, D as DockingPoint, V as Vector3 } from './index-213f70af.js';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { fabric } from 'fabric';
@@ -1656,8 +1656,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]) {
@@ -1672,7 +1673,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]) {
@@ -1692,10 +1695,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')) {
@@ -1708,9 +1719,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/esm/{SeriousBasketHandler-ec11fc25.js → SeriousBasketHandler-d91fa4df.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { s as summaryHandlerInstance } from './index-cb39833e.js';
+import { s as summaryHandlerInstance } from './index-213f70af.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';

package/build/esm/{ShelfPlanner-3e4a62e1.js → ShelfPlanner-a0bdd125.js}

@@ -4,7 +4,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { G as Grid, b as setHandlerInstance, a as articleHandlerInstance } from './index-cb39833e.js';
+import { G as Grid, b as setHandlerInstance, a as articleHandlerInstance } from './index-213f70af.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';

package/build/esm/{StandardWWSHandler-4a01f807.js → StandardWWSHandler-370bce91.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-cb39833e.js';
+import './index-213f70af.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';