@colijnit/transaction 258.1.6 → 258.1.8

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         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.8";
+        this.publishDate = "30-4-2025 17:18:56";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsU0FBUyxDQUFDO1FBQ25CLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU4LjEuNlwiO1xuICBwdWJsaWMgcHVibGlzaERhdGUgPSBcIjI4LTQtMjAyNSAxODoxNjo1NlwiO1xufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsU0FBUyxDQUFDO1FBQ25CLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU4LjEuOFwiO1xuICBwdWJsaWMgcHVibGlzaERhdGUgPSBcIjMwLTQtMjAyNSAxNzoxODo1NlwiO1xufSJdfQ==

package/fesm2015/colijnit-transaction.js

@@ -293,8 +293,8 @@ class Version {
     constructor() {
         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.8";
+        this.publishDate = "30-4-2025 17:18:56";
     }
 }
 
@@ -1286,6 +1286,7 @@ class TransactionEventService {
         this.selectAllSalesOrderLinesToBePicked = new Subject();
         this.togglePurchaseOrderMarginInfo = new Subject();
         this.selectedTransportDay = new Subject();
+        this.resetTransportDayFilteredOrders = new Subject();
         this.selectAllPurchaseOrderLinesForReceiveGoods = new Subject();
         this.updatingSalesOrderGeneratePurchaseOrders = new Subject();
         this.updatingSalesOrderConfirmation = new Subject();
@@ -27074,8 +27075,9 @@ class DeliveryPlanningService {
         // Swap positions in the array
         [array[index], array[newIndex]] = [array[newIndex], array[index]];
     }
-    deliveryMethodAvailabilityCheck(planOrder, available, transportDay) {
+    deliveryMethodAvailabilityCheck(planOrder, transportDay) {
         return __awaiter(this, void 0, void 0, function* () {
+            let available = true;
             if (available) {
                 if (!planOrder.partDelivery) {
                     if (!transportDay.deliveryMethods.find(method => method === planOrder.deliveryMethod.toString())) {
@@ -27097,10 +27099,11 @@ class DeliveryPlanningService {
             }
         });
     }
-    districtAvailabilityCheck(planOrder, available, transportDay) {
+    districtAvailabilityCheck(planOrder, transportDay) {
         return __awaiter(this, void 0, void 0, function* () {
             //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.
+            let available = true;
             if (available) {
                 if (!this.planRayon) {
                     if (!planOrder.districts || planOrder.districts.length) {
@@ -27231,28 +27234,32 @@ class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
     }
     changeLineValue(value) {
         this.transactionLine.selected = value;
+        if (!this.transactionLine.amountSelected) {
+            this.transactionLine.amountSelected = this.planOrderLine.amountToPlan;
+        }
         this.detectChanges();
     }
     dragStarted(ev) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.checkedAvailibility) {
                 this._deliveryPlanningService.availabilityCheckEvent.emit(this.transactionService.currentPlanOrder);
                 this.checkedAvailibility = true;
             }
-            if (this.transactionLine.amountSelected <= 0 || ((_a = this.planOrderLine) === null || _a === void 0 ? void 0 : _a.amountToPlan) === 0) {
+            console.log(this.transactionLine.amountSelected);
+            console.log((_a = this.planOrderLine) === null || _a === void 0 ? void 0 : _a.amountToPlan);
+            if (this.transactionLine.amountSelected <= 0 || ((_b = this.planOrderLine) === null || _b === void 0 ? void 0 : _b.amountToPlan) === 0) {
                 yield this._dialog.showError(this._dictionary.get('ORDER_CAN_NOT_BE_PLANNED_ON_RESOURCE'), true);
-                return;
             }
             else {
                 this._deliveryPlanningService.currentTransId = this.transactionInfo.id;
-                (_b = ev.dataTransfer) === null || _b === void 0 ? void 0 : _b.setData('text', 'lines');
+                (_c = ev.dataTransfer) === null || _c === void 0 ? void 0 : _c.setData('text', 'lines');
             }
             ev.target.classList.add('dragging');
             const lineElement = ev.target.closest('co-transaction-base-line');
             if (!lineElement)
                 return;
-            const dragBox = (_c = lineElement.querySelector('.co-transaction-line-image-and-description')) === null || _c === void 0 ? void 0 : _c.cloneNode(true);
+            const dragBox = (_d = lineElement.querySelector('.co-transaction-line-image-and-description')) === null || _d === void 0 ? void 0 : _d.cloneNode(true);
             const dragImage = document.createElement('div');
             dragImage.style.display = 'flex';
             dragImage.style.flexDirection = 'row';
@@ -27275,7 +27282,7 @@ class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
             dragImage.style.top = '-1000px';
             dragImage.style.left = '-1000px';
             // Set the custom drag image
-            (_d = ev.dataTransfer) === null || _d === void 0 ? void 0 : _d.setDragImage(dragImage, 50, 25);
+            (_e = ev.dataTransfer) === null || _e === void 0 ? void 0 : _e.setDragImage(dragImage, 50, 25);
             // Cleanup: Remove the drag image after it's set
             setTimeout(() => document.body.removeChild(dragImage), 0);
         });
@@ -27296,6 +27303,14 @@ class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
         }
         return !((_b = (_a = this._deliveryPlanningService.linesPlanOrder) === null || _a === void 0 ? void 0 : _a.lines) === null || _b === void 0 ? void 0 : _b.find(line => line.originalLineNr === this.transactionLine.lineNr));
     }
+    get lineFullyPlanned() {
+        if (this.planOrderLine) {
+            return this.planOrderLine.amountToPlan === 0;
+        }
+        else {
+            return false;
+        }
+    }
     handleQuantityToPlanChange(amount) {
         this.transactionLine.amountSelected = amount;
     }
@@ -27318,9 +27333,9 @@ TransactionPlanningLineComponent.decorators = [
               [transactionLine]="transactionLine"
               [preview]="preview"
               [isFirst]="isFirst"
-              [draggable]="!linePlanned"
+              [draggable]="!lineFullyPlanned"
               (dragstart)="dragStarted($event)"
-              [checkbox]="true"
+              [checkbox]="!lineFullyPlanned"
               [checkboxValue]="transactionLine.selected || !transactionInfo?.allowPartialDelivery"
               [checkboxReadonly]="!transactionInfo?.allowPartialDelivery"
               (checkboxValueChanged)="handleCheckBoxValueChanged($event, transactionLine)"
@@ -27377,16 +27392,17 @@ TransactionPlanningLineComponent.decorators = [
                           <div class="transaction-field-wrapper small">
                               <div class="inside-field">
                                   <co-transaction-line-label [insideLabel]="'QUANTITY'"></co-transaction-line-label>
-                                  <co-input-number-picker class="amount-number-picker"
+                                  <co-input-number-picker *ngIf="planOrderLine?.amountToPlan && planOrderLine.amountToPlan !== 0" class="amount-number-picker"
                                                           [min]="0"
                                                           [max]="planOrderLine?.amountToPlan"
-                                                          [model]="planOrderLine?.amountToPlan"
+                                                          [model]="planOrderLine?.amountToPlan ? planOrderLine?.amountToPlan : 0"
                                                           (modelChange)="handleQuantityToPlanChange($event)"></co-input-number-picker>
                               </div>
                           </div>
                           <div class="transaction-field-wrapper small" *ngIf="this.plannedResourceForTransactionLine?.length > 0">
                               <div class="inside-field">
-                                  <div class="row">
+                                  <co-transaction-line-label [insideLabel]="'PLANNED'"></co-transaction-line-label>
+                                  <div class="column">
                                       <co-transaction-planning-line-planned-resource
                                         *ngFor="let plannedResource of this.plannedResourceForTransactionLine"
                                         [plannedResource]="plannedResource"
@@ -32378,7 +32394,6 @@ TransactionPlanningLinePlannedResourceComponent.decorators = [
                 selector: "co-transaction-planning-line-planned-resource",
                 template: `
         <div class="row" (click)="handlePlannedResourceClicked()">
-            <co-icon [iconData]="iconCacheService.getIcon(icons.TruckContainerDuo)"></co-icon>
             <span class="bold" [textContent]="plannedResource.planningStartTime | date: 'dd-MM-YYYY'"></span>
         </div>
     `,
@@ -39268,11 +39283,7 @@ class DeliveryPlanningOverviewTileComponent {
     }
     handleAvailabilityChecked(planOrder) {
         return __awaiter(this, void 0, void 0, function* () {
-            let available;
-            available = this.transportDay.availableOnDate;
-            available = yield this.deliveryMethodAvailabilityCheck(planOrder, available);
-            available = yield this.districtAvailabilityCheck(planOrder, available);
-            this.availabilityChecked.emit({ transportDay: this.transportDay, available: available });
+            this.availabilityChecked.emit({ transportDay: this.transportDay, available: this.transportDay.availableOnDate && (yield this.deliveryMethodAvailabilityCheck(planOrder)) && (yield this.districtAvailabilityCheck(planOrder)) });
         });
     }
     getOrderLinesPlanned(planOrder) {
@@ -39290,8 +39301,9 @@ class DeliveryPlanningOverviewTileComponent {
             planOrder.lines.push(...yield this._transaction.getOrderLinesPlanned(request));
         });
     }
-    deliveryMethodAvailabilityCheck(planOrder, available) {
+    deliveryMethodAvailabilityCheck(planOrder) {
         return __awaiter(this, void 0, void 0, function* () {
+            let available = true;
             if (available) {
                 if (!planOrder.partDelivery) {
                     if (!this.transportDay.deliveryMethods.find(method => method === planOrder.deliveryMethod.toString())) {
@@ -39313,10 +39325,11 @@ class DeliveryPlanningOverviewTileComponent {
             }
         });
     }
-    districtAvailabilityCheck(planOrder, available) {
+    districtAvailabilityCheck(planOrder) {
         return __awaiter(this, void 0, void 0, function* () {
             //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.
+            let available = true;
             if (available) {
                 if (!this._deliveryPlanningService.planRayon) {
                     if (!planOrder.districts || planOrder.districts.length) {
@@ -39676,7 +39689,7 @@ class DeliveryPlanningOverviewComponent {
                 order.tasksLoaded = true;
                 order.lines.forEach(line => {
                     line.selected = true;
-                    if (line.amountToPlan === 0) {
+                    if (!line.amountToPlan || line.amountToPlan === 0) {
                         line.amountToPlan = (line.amountInOrder - line.amountPlanned);
                     }
                 });
@@ -39952,6 +39965,9 @@ class DeliveryPlanningOverviewComponent {
             //fire event selected outwards
             this.transactionEventService.selectedTransportDay.next(transportDay);
         }
+        else {
+            this.transactionEventService.resetTransportDayFilteredOrders.next();
+        }
     }
 }
 DeliveryPlanningOverviewComponent.decorators = [
@@ -43963,13 +43979,15 @@ class TransactionSearchResultComponent {
             }
         }), this.transactionEventService.selectedTransportDay.subscribe((transportDay) => __awaiter(this, void 0, void 0, function* () {
             const filteredTransactions = yield Promise.all(this.searchService.transactions.map((order) => __awaiter(this, void 0, void 0, function* () {
-                let available = true;
                 const planOrder = yield this.transactionService.getPlanOrder(order.transId);
-                yield this._deliveryPlanningService.deliveryMethodAvailabilityCheck(planOrder, available, transportDay);
-                yield this._deliveryPlanningService.districtAvailabilityCheck(planOrder, available, transportDay);
-                return available ? order : null;
+                const isAvailable = (yield this._deliveryPlanningService.deliveryMethodAvailabilityCheck(planOrder, transportDay)) &&
+                    (yield this._deliveryPlanningService.districtAvailabilityCheck(planOrder, transportDay)) &&
+                    transportDay.availableOnDate;
+                return isAvailable ? order : null;
             })));
             this.searchService.transactions = filteredTransactions.filter((order) => order !== null);
+        })), this.transactionEventService.resetTransportDayFilteredOrders.subscribe((event) => __awaiter(this, void 0, void 0, function* () {
+            yield this.searchService.searchTransactions();
         })));
     }
     ngOnChanges(changes) {