@colijnit/transaction 257.1.1 → 257.1.2

package/lib/component/core/base/transaction-lines-base.component.d.ts

@@ -1,25 +1,46 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { OrderLineSetInfo } from '@colijnit/transactionapi/build/model/order-line-set-info.bo';
 import { CdkDrag, CdkDragDrop, CdkDragEnter, CdkDropList } from '@angular/cdk/drag-drop';
 import { TransactionTypeCategory } from '../../../enum/transaction-type-category.enum';
+import { TransactionEventService } from '../../../service/transaction-event.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { IconCacheService } from '../../../service/icon-cache.service';
 import { Icon } from '../../../enum/icon.enum';
+import { TransactionHeaderService } from './service/transaction-header.service';
 import { TransactionHeaderBaseComponent } from './transaction-header-base.component';
+import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
+import { DictionaryService } from '../../../service/dictionary.service';
+import { TransactionImageService } from '../../../service/transaction-image.service';
+import { PurchaseConfirmationService } from '../../../service/purchase-confirmation.service';
+import { LineSelectionService } from '../../../service/line-selection.service';
 export declare abstract class TransactionLinesBaseComponent extends TransactionHeaderBaseComponent implements OnInit, OnDestroy {
+    transactionHeaderService: TransactionHeaderService;
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    transactionScreenConfigurationService: TransactionScreenConfigurationService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    protected purchaseConfirmationService: PurchaseConfirmationService;
+    protected lineSelectionService: LineSelectionService;
     readonly icons: typeof Icon;
     readonly category: typeof TransactionTypeCategory;
     set activeCategory(value: TransactionTypeCategory);
     get activeCategory(): TransactionTypeCategory;
     saveTransactionLine: EventEmitter<TransactionAddTextLineRequest>;
     userActionRequired: boolean;
-    selectedTransactionLine: TransactionLineInfo;
+    set selectedTransactionLine(value: TransactionLineInfo);
+    get selectedTransactionLine(): TransactionLineInfo;
     hasComponent: boolean;
     historicTransactionLines: TransactionLineInfo[] | null;
     selectedOrderLineSet: OrderLineSetInfo;
     lineDraggedOver: number;
     private _activeCategory;
     private _subscriptions;
+    constructor(transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, purchaseConfirmationService: PurchaseConfirmationService, lineSelectionService: LineSelectionService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     trackByFn(index: number, line: TransactionLineInfo): any;

package/lib/component/transaction-line-purchase-confirmation/transaction-line-purchase-confirmation.component.d.ts

@@ -1,24 +1,30 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { DocDeliveryBatch } from '@colijnit/transactionapi/build/model/doc-delivery-batch.bo';
 import { TransactionTypeCategory } from '../../enum/transaction-type-category.enum';
-import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { TransactionEventService } from '../../service/transaction-event.service';
 import { TransactionService } from '../../service/transaction.service';
 import { IconCacheService } from '../../service/icon-cache.service';
+import { TransactionScreenConfigurationService } from '../../service/transaction-screen-configuration.service';
+import { DictionaryService } from '../../service/dictionary.service';
+import { TransactionImageService } from '../../service/transaction-image.service';
 import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
+import { TransactionLineBaseComponent } from '../core/base/transaction-line-base.component';
 import { TransactionHeaderService } from '../core/base/service/transaction-header.service';
-import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
+import { TransactionLineService } from '../core/base/service/transaction-line.service';
 import { Icon } from '../../enum/icon.enum';
-export declare class TransactionLinePurchaseConfirmationComponent implements OnInit, OnDestroy {
+export declare class TransactionLinePurchaseConfirmationComponent extends TransactionLineBaseComponent implements OnInit, OnDestroy {
     transactionHeaderService: TransactionHeaderService;
+    transactionLineService: TransactionLineService;
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
     iconCacheService: IconCacheService;
+    transactionScreenConfigurationService: TransactionScreenConfigurationService;
     purchaseConfirmationService: PurchaseConfirmationService;
-    private _transactionEventService;
-    private _transactionService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
     readonly icons: typeof Icon;
     readonly transactionTypeCategory: typeof TransactionTypeCategory;
-    transactionInfo: TransactionInfo;
-    transactionLine: TransactionLineInfo;
     showClass(): boolean;
     docDeliveryBatch: DocDeliveryBatch;
     filteredDocBatchArray: DocDeliveryBatch[];
@@ -26,7 +32,7 @@ export declare class TransactionLinePurchaseConfirmationComponent implements OnI
     showPurchaseConfirmationAI: boolean;
     confirmingOrder: boolean;
     private _subs;
-    constructor(transactionHeaderService: TransactionHeaderService, iconCacheService: IconCacheService, purchaseConfirmationService: PurchaseConfirmationService, _transactionEventService: TransactionEventService, _transactionService: TransactionService);
+    constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, purchaseConfirmationService: PurchaseConfirmationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleSaveDetailsEdit(): Promise<void>;
@@ -34,6 +40,7 @@ export declare class TransactionLinePurchaseConfirmationComponent implements OnI
     handleSelectHistoryRow(row: DocDeliveryBatch): void;
     handleCancelClick(): void;
     handleDeliveryBatchChange(): void;
+    protected transactionLineSet(): void;
     private _updateBatchArray;
     private _setMaxDocAmount;
     private _initNewDocDeliveryBatch;

package/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.d.ts

@@ -1,5 +1,4 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
-import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { Icon } from '../../enum/icon.enum';
 import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
 import { TransactionTypeCategory } from '../../enum/transaction-type-category.enum';
@@ -12,6 +11,7 @@ import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/tr
 import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
 import { TransactionLineService } from '../core/base/service/transaction-line.service';
 import { TransactionHeaderService } from '../core/base/service/transaction-header.service';
+import { LineSelectionService } from '../../service/line-selection.service';
 export declare class TransactionLineSidePanelComponent implements OnInit, OnDestroy {
     private _service;
     private _transactionHeaderService;
@@ -19,13 +19,14 @@ export declare class TransactionLineSidePanelComponent implements OnInit, OnDest
     private _transactionEventService;
     private _transactionMappingService;
     private _purchaseConfirmationService;
+    private _lineSelectionService;
+    private _changeDetector;
     readonly icons: typeof Icon;
     readonly categories: typeof TransactionTypeCategory;
     readonly transactionTypes: typeof TransactionKind;
     readonly TransactionTypeCategory: typeof TransactionTypeCategory;
     wide: boolean;
     activeCategory: TransactionTypeCategory;
-    transactionLine: TransactionLineInfo;
     cancelClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
     get transaction(): TransactionInfoResponse;
@@ -33,7 +34,7 @@ export declare class TransactionLineSidePanelComponent implements OnInit, OnDest
     activeCategoryButton: TransactionBarButton;
     ordersTotal: number;
     private _subs;
-    constructor(_service: TransactionService, _transactionHeaderService: TransactionHeaderService, _transactionLineService: TransactionLineService, _transactionEventService: TransactionEventService, _transactionMappingService: TransactionMappingService, _purchaseConfirmationService: PurchaseConfirmationService);
+    constructor(_service: TransactionService, _transactionHeaderService: TransactionHeaderService, _transactionLineService: TransactionLineService, _transactionEventService: TransactionEventService, _transactionMappingService: TransactionMappingService, _purchaseConfirmationService: PurchaseConfirmationService, _lineSelectionService: LineSelectionService, _changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnDestroy(): void;
     updateActiveCategory(button: TransactionBarButton): void;

package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts

@@ -1,25 +1,6 @@
-import { EventEmitter } from '@angular/core';
 import { TransactionTypeCategory } from '../../enum/transaction-type-category.enum';
-import { TransactionService } from '../../service/transaction.service';
-import { TransactionEventService } from '../../service/transaction-event.service';
-import { DocDeliveryBatch } from '@colijnit/transactionapi/build/model/doc-delivery-batch.bo';
-import { GoodsReceiptHistory } from '@colijnit/transactionapi/build/model/goods-receipt-history.bo';
-import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
-import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
 export declare class TransactionLineSidePanelPurchaseComponent {
-    private _service;
-    private _transactionEventService;
     readonly categories: typeof TransactionTypeCategory;
-    transactionInfo: TransactionInfo;
-    transactionLine: TransactionLineInfo;
     categoryType: TransactionTypeCategory;
-    quantityToReceiveChange: EventEmitter<number>;
     showClass(): boolean;
-    goodsReceiptStatus: GoodsReceiptHistory;
-    selectedLineDocBatchArray: DocDeliveryBatch;
-    isDocBatchSaved: boolean;
-    editingMode: boolean;
-    constructor(_service: TransactionService, _transactionEventService: TransactionEventService);
-    fillInputOnClick(data: any): void;
-    docBatchSaved(data: any): void;
 }

package/lib/component/transaction-lines/transaction-lines.component.d.ts

@@ -1,31 +1,13 @@
-import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
+import { OnDestroy, OnInit } from '@angular/core';
 import { TransactionLinesBaseComponent } from '../core/base/transaction-lines-base.component';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
-import { TransactionHeaderService } from '../core/base/service/transaction-header.service';
-import { TransactionEventService } from '../../service/transaction-event.service';
-import { TransactionService } from '../../service/transaction.service';
-import { IconCacheService } from '../../service/icon-cache.service';
-import { TransactionScreenConfigurationService } from '../../service/transaction-screen-configuration.service';
-import { DictionaryService } from '../../service/dictionary.service';
-import { TransactionImageService } from '../../service/transaction-image.service';
-import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
 export declare class TransactionLinesComponent extends TransactionLinesBaseComponent implements OnInit, OnDestroy {
-    transactionHeaderService: TransactionHeaderService;
-    transactionEventService: TransactionEventService;
-    service: TransactionService;
-    iconCacheService: IconCacheService;
-    transactionScreenConfigurationService: TransactionScreenConfigurationService;
-    protected dictionaryService: DictionaryService;
-    protected imageService: TransactionImageService;
-    protected changeDetector: ChangeDetectorRef;
-    private _purchaseConfirmationService;
     showClass(): boolean;
     customerPortal: boolean;
     showSidePanel: boolean;
     showSidePanelForConfirmationAI: boolean;
     activeTransactionLine: TransactionLineInfo;
     private _subs;
-    constructor(transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _purchaseConfirmationService: PurchaseConfirmationService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     protected transactionSet(): void;

package/lib/component/transaction-lines-popup/style/_layout.scss

@@ -20,6 +20,10 @@
           text-align: end;
         }
       }
+      .color {
+        width: 5px;
+        padding: 0;
+      }
     }
 
   }

package/lib/component/transaction-lines-popup/transaction-lines-popup.component.d.ts

@@ -1,10 +1,12 @@
 import { EventEmitter } from '@angular/core';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { OverlayParentDirective } from '@colijnit/corecomponents_v12/lib/directives/overlay/overlay-parent.directive';
+import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
 export declare class TransactionLinesPopupComponent {
-    transactionLines: TransactionLineInfo[];
+    purchaseConfirmationService: PurchaseConfirmationService;
     parentForOverlay: OverlayParentDirective;
     clickOutside: EventEmitter<void>;
     transactionLineClick: EventEmitter<TransactionLineInfo>;
     showClass(): boolean;
+    constructor(purchaseConfirmationService: PurchaseConfirmationService);
 }

package/lib/model/transaction-line-view-model.d.ts

@@ -0,0 +1,7 @@
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+export declare class TransactionLineViewModel {
+    color: string;
+    showColor: boolean;
+    line: TransactionLineInfo;
+    constructor(l: TransactionLineInfo);
+}

package/lib/service/line-selection.service.d.ts

@@ -1,12 +1,18 @@
 import { OnDestroy } from '@angular/core';
 import { TransactionEventService } from './transaction-event.service';
+import { BehaviorSubject } from 'rxjs';
 import { TransactionService } from './transaction.service';
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 export declare class LineSelectionService implements OnDestroy {
     private _transactionEventService;
     private _transactionService;
+    set selectedTransactionLine(value: TransactionLineInfo);
+    get selectedTransactionLine(): TransactionLineInfo;
+    selectedTransactionLineChanged: BehaviorSubject<TransactionLineInfo>;
     private _subs;
     private _selectedLineUuidsForDelivery;
     private _selectedLineUuidsForInvoice;
+    private _selectedTransactionLine;
     constructor(_transactionEventService: TransactionEventService, _transactionService: TransactionService);
     ngOnDestroy(): void;
     private _checkAllLinesSelectedForDelivery;

package/lib/service/purchase-confirmation.service.d.ts

@@ -1,26 +1,36 @@
+import { OnDestroy } from '@angular/core';
 import { TransactionConnectorService } from './transaction-connector.service';
 import { OrderConfirmationAnalysisResult } from '@colijnit/transactionapi/build/model/order-confirmation-analysis-result.bo';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { TransactionEventService } from './transaction-event.service';
 import { AnalyzedOrderConfirmation } from '@colijnit/transactionapi/build/model/analyzed-order-confirmation.bo';
-export declare class PurchaseConfirmationService {
+import { TransactionLineViewModel } from '../model/transaction-line-view-model';
+export declare class PurchaseConfirmationService implements OnDestroy {
     private _transactionConnectorService;
     private _transactionEventService;
     confirmationNeeded: BehaviorSubject<boolean>;
     confirmationFinished: Subject<void>;
+    set transactionLines(value: TransactionLineInfo[]);
+    get transactionLines(): TransactionLineInfo[];
     set confirmationAnalysisId(value: number);
     get confirmationAnalysisId(): number;
     setOrdersTotal(value: number): void;
     confirmationAnalysisResult: OrderConfirmationAnalysisResult[];
     analyzedConfirmation: AnalyzedOrderConfirmation;
+    ordersTotal: BehaviorSubject<number>;
+    ordersTotalObservable: Observable<number>;
+    transactionLinesViewModels: TransactionLineViewModel[];
     private _confirmationAnalysisId;
-    private ordersTotal;
-    ordersTotalObservable: import("rxjs").Observable<number>;
+    private _transactionLines;
+    private _subs;
     constructor(_transactionConnectorService: TransactionConnectorService, _transactionEventService: TransactionEventService);
+    ngOnDestroy(): void;
     reset(): void;
     linkAnalysisToTransactionLine(transactionLine: TransactionLineInfo, analysis: OrderConfirmationAnalysisResult): void;
     private _handleSetAnalysisId;
     private _getConfirmationAnalysisById;
     private _getAnalyzedOrderConfirmationById;
+    private _updateViewModels;
+    private _prepareViewModels;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "257.1.1",
+  "version": "257.1.2",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",