@colijnit/transaction 258.1.6 → 258.1.7

package/bundles/colijnit-transaction.umd.js

@@ -33,8 +33,8 @@
         function Version() {
             this.name = "@colijnit/transaction";
             this.description = "Colijn IT transaction package";
-            this.symVer = "258.1.6";
-            this.publishDate = "28-4-2025 18:16:56";
+            this.symVer = "258.1.7";
+            this.publishDate = "29-4-2025 16:49:11";
         }
         return Version;
     }());
@@ -1556,6 +1556,7 @@
             this.selectAllSalesOrderLinesToBePicked = new rxjs.Subject();
             this.togglePurchaseOrderMarginInfo = new rxjs.Subject();
             this.selectedTransportDay = new rxjs.Subject();
+            this.resetTransportDayFilteredOrders = new rxjs.Subject();
             this.selectAllPurchaseOrderLinesForReceiveGoods = new rxjs.Subject();
             this.updatingSalesOrderGeneratePurchaseOrders = new rxjs.Subject();
             this.updatingSalesOrderConfirmation = new rxjs.Subject();
@@ -31122,11 +31123,13 @@
             // Swap positions in the array
             _b = __read([array[newIndex], array[index]], 2), array[index] = _b[0], array[newIndex] = _b[1];
         };
-        DeliveryPlanningService.prototype.deliveryMethodAvailabilityCheck = function (planOrder, available, transportDay) {
+        DeliveryPlanningService.prototype.deliveryMethodAvailabilityCheck = function (planOrder, transportDay) {
             return __awaiter(this, void 0, void 0, function () {
+                var available;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            available = true;
                             if (!available) return [3 /*break*/, 4];
                             if (!!planOrder.partDelivery) return [3 /*break*/, 1];
                             if (!transportDay.deliveryMethods.find(function (method) { return method === planOrder.deliveryMethod.toString(); })) {
@@ -31148,11 +31151,11 @@
                 });
             });
         };
-        DeliveryPlanningService.prototype.districtAvailabilityCheck = function (planOrder, available, transportDay) {
+        DeliveryPlanningService.prototype.districtAvailabilityCheck = function (planOrder, transportDay) {
             return __awaiter(this, void 0, void 0, function () {
+                var available;
                 return __generator(this, function (_b) {
-                    //If true: you can plan without rayons/districts. Orders without districts can go everywhere in this case. Does it have districts that it needs to match a district in the plan resource.
-                    //If false: orders without district can not be planned. On a plan resource without districts you can't plan. Other than that same rules apply.
+                    available = true;
                     if (available) {
                         if (!this.planRayon) {
                             if (!planOrder.districts || planOrder.districts.length) {
@@ -42093,18 +42096,27 @@
         };
         DeliveryPlanningOverviewTileComponent.prototype.handleAvailabilityChecked = function (planOrder) {
             return __awaiter(this, void 0, void 0, function () {
-                var available;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var _b, _c, _d, _e, _f;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
-                            available = this.transportDay.availableOnDate;
-                            return [4 /*yield*/, this.deliveryMethodAvailabilityCheck(planOrder, available)];
+                            _c = (_b = this.availabilityChecked).emit;
+                            _d = { transportDay: this.transportDay };
+                            _f = this.transportDay.availableOnDate;
+                            if (!_f) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.deliveryMethodAvailabilityCheck(planOrder)];
                         case 1:
-                            available = _b.sent();
-                            return [4 /*yield*/, this.districtAvailabilityCheck(planOrder, available)];
+                            _f = (_g.sent());
+                            _g.label = 2;
                         case 2:
-                            available = _b.sent();
-                            this.availabilityChecked.emit({ transportDay: this.transportDay, available: available });
+                            _e = _f;
+                            if (!_e) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.districtAvailabilityCheck(planOrder)];
+                        case 3:
+                            _e = (_g.sent());
+                            _g.label = 4;
+                        case 4:
+                            _c.apply(_b, [(_d.available = _e, _d)]);
                             return [2 /*return*/];
                     }
                 });
@@ -42138,12 +42150,14 @@
                 });
             });
         };
-        DeliveryPlanningOverviewTileComponent.prototype.deliveryMethodAvailabilityCheck = function (planOrder, available) {
+        DeliveryPlanningOverviewTileComponent.prototype.deliveryMethodAvailabilityCheck = function (planOrder) {
             return __awaiter(this, void 0, void 0, function () {
+                var available;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            available = true;
                             if (!available) return [3 /*break*/, 4];
                             if (!!planOrder.partDelivery) return [3 /*break*/, 1];
                             if (!this.transportDay.deliveryMethods.find(function (method) { return method === planOrder.deliveryMethod.toString(); })) {
@@ -42165,11 +42179,11 @@
                 });
             });
         };
-        DeliveryPlanningOverviewTileComponent.prototype.districtAvailabilityCheck = function (planOrder, available) {
+        DeliveryPlanningOverviewTileComponent.prototype.districtAvailabilityCheck = function (planOrder) {
             return __awaiter(this, void 0, void 0, function () {
+                var available;
                 return __generator(this, function (_b) {
-                    //If true: you can plan without rayons/districts. Orders without districts can go everywhere in this case. Does it have districts that it needs to match a district in the plan resource.
-                    //If false: orders without district can not be planned. On a plan resource without districts you can't plan. Other than that same rules apply.
+                    available = true;
                     if (available) {
                         if (!this._deliveryPlanningService.planRayon) {
                             if (!planOrder.districts || planOrder.districts.length) {
@@ -42890,6 +42904,9 @@
                 //fire event selected outwards
                 this.transactionEventService.selectedTransportDay.next(transportDay);
             }
+            else {
+                this.transactionEventService.resetTransportDayFilteredOrders.next();
+            }
         };
         return DeliveryPlanningOverviewComponent;
     }());
@@ -46033,28 +46050,43 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, Promise.all(this.searchService.transactions.map(function (order) { return __awaiter(_this, void 0, void 0, function () {
-                                var available, planOrder;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            available = true;
-                                            return [4 /*yield*/, this.transactionService.getPlanOrder(order.transId)];
-                                        case 1:
-                                            planOrder = _a.sent();
-                                            return [4 /*yield*/, this._deliveryPlanningService.deliveryMethodAvailabilityCheck(planOrder, available, transportDay)];
-                                        case 2:
-                                            _a.sent();
-                                            return [4 /*yield*/, this._deliveryPlanningService.districtAvailabilityCheck(planOrder, available, transportDay)];
-                                        case 3:
-                                            _a.sent();
-                                            return [2 /*return*/, available ? order : null];
-                                    }
-                                });
-                            }); }))];
+                        case 0:
+                            console.log(this.searchService.transactions.length);
+                            return [4 /*yield*/, Promise.all(this.searchService.transactions.map(function (order) { return __awaiter(_this, void 0, void 0, function () {
+                                    var planOrder, isAvailable, _a;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0: return [4 /*yield*/, this.transactionService.getPlanOrder(order.transId)];
+                                            case 1:
+                                                planOrder = _b.sent();
+                                                return [4 /*yield*/, this._deliveryPlanningService.deliveryMethodAvailabilityCheck(planOrder, transportDay)];
+                                            case 2:
+                                                _a = (_b.sent());
+                                                if (!_a) return [3 /*break*/, 4];
+                                                return [4 /*yield*/, this._deliveryPlanningService.districtAvailabilityCheck(planOrder, transportDay)];
+                                            case 3:
+                                                _a = (_b.sent());
+                                                _b.label = 4;
+                                            case 4:
+                                                isAvailable = _a &&
+                                                    transportDay.availableOnDate;
+                                                return [2 /*return*/, isAvailable ? order : null];
+                                        }
+                                    });
+                                }); }))];
                         case 1:
                             filteredTransactions = _a.sent();
                             this.searchService.transactions = filteredTransactions.filter(function (order) { return order !== null; });
+                            console.log(this.searchService.transactions.length);
+                            return [2 /*return*/];
+                    }
+                });
+            }); }), this.transactionEventService.resetTransportDayFilteredOrders.subscribe(function (event) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.searchService.searchTransactions()];
+                        case 1:
+                            _a.sent();
                             return [2 /*return*/];
                     }
                 });