@colijnit/transaction 12.1.35 → 12.1.36

package/lib/component/core/base/dynamic-base-component.d.ts

@@ -0,0 +1,3 @@
+export declare abstract class DynamicBaseComponent {
+    onClose(): void;
+}

package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.component.d.ts

@@ -0,0 +1,4 @@
+import { DialogTransactionLineBaseComponent } from "../../../core/base/dialog-transaction-line-base.component";
+export declare class DialogTransactionLineWarehouseLocationComponent extends DialogTransactionLineBaseComponent {
+    showClass(): boolean;
+}

package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.module.d.ts

@@ -0,0 +1,2 @@
+export declare class DialogTransactionLineWarehouseLocationModule {
+}

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

@@ -8,9 +8,11 @@ import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/mo
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionBarButton } from "../../model/transaction-bar-button";
 import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
+import { DynamicComponentService } from "../../service/dynamic-component.service";
 export declare class TransactionComponent implements OnDestroy {
     iconCacheService: IconCacheService;
     private _service;
+    private dynamicComponentService;
     readonly viewModes: typeof ContentViewMode;
     readonly icons: typeof Icon;
     set transaction(value: TransactionInfoResponse);
@@ -24,16 +26,14 @@ export declare class TransactionComponent implements OnDestroy {
     activeViewMode: ContentViewMode;
     activeCategory: TransactionTypeCategory;
     showDiscountsSidebar: boolean;
-    showSidePanel: boolean;
     sidePanelTransactionLine: TransactionLineInfo;
     private _subs;
     private _transaction;
     private _transactionId;
-    constructor(iconCacheService: IconCacheService, _service: TransactionService);
+    constructor(iconCacheService: IconCacheService, _service: TransactionService, dynamicComponentService: DynamicComponentService);
     ngOnDestroy(): void;
     addDiscount(): void;
     saveTransactionLine(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
     handleButtonBarButtonClicked(button: TransactionBarButton): void;
     handleShowSidePanel(line: TransactionLineInfo): void;
-    handleCloseSidePanel(event: MouseEvent): void;
 }

package/lib/component/transaction-grid/transaction-received-goods-grid/style/_layout.scss

@@ -2,5 +2,16 @@
 
 @include export-module('cc-transaction-received-goods-grid-layout') {
   .co-transaction-received-goods-grid {
+
+    .location-wrapper {
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid $tp-transaction-line-border-color;
+      border-radius: 10px;
+      height: 30px;
+      background-color: $tp-transaction-line-discount-background-color;
+    }
   }
 }

package/lib/component/transaction-grid/transaction-received-goods-grid/transaction-received-goods-grid.component.d.ts

@@ -7,20 +7,24 @@ import { TransactionService } from "../../../service/transaction.service";
 import { ArticleService } from "../../../service/article.service";
 import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 import { TransactionEventService } from "../../../service/transaction-event.service";
+import { DialogService } from "../../../service/dialog.service";
+import { ColumnAlign } from "@colijnit/corecomponents_v12";
 export declare class TransactionReceivedGoodsGridComponent extends TransactionGridBaseComponent implements OnInit, OnDestroy {
     private _imageService;
     private _transactionService;
     private _transactionEventService;
     private _articleService;
+    private _dialogService;
+    readonly columnAlign: typeof ColumnAlign;
     showClass(): boolean;
     locations: string[];
     locationDropdownFields: {};
     rowViewModels: Map<TransactionLineInfo, ReceiveGoodsViewModel>;
     private _subscriptions;
-    constructor(_imageService: TransactionImageService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService);
+    constructor(_imageService: TransactionImageService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService, _dialogService: DialogService);
     ngOnInit(): void;
     ngOnDestroy(): void;
-    handleRowVisible(row: any): Promise<void>;
+    handleRowVisible(row: TransactionLineInfo): Promise<void>;
     locationRequired(row: TransactionLineInfo): boolean;
     handleDropDownSelected(warehouseNr: number): Promise<void>;
     getRowViewModel(row: TransactionLineInfo): ReceiveGoodsViewModel;
@@ -34,4 +38,5 @@ export declare class TransactionReceivedGoodsGridComponent extends TransactionGr
         transactionLine: TransactionLineInfo;
         goodsReceiptStatus: GoodsReceiptStatusWithHistory;
     }): void;
+    openWarehouseLocationDialog(line: TransactionLineInfo): Promise<any>;
 }

package/lib/component/transaction-line/style/material.scss

@@ -1,13 +1,13 @@
 @import "./material-definition";
 @import "./layout";
 @import "./theme";
-@import "lib/components/input-number-picker/style/material";
 @import "../../core/image-display/style/material";
 @import "../../shared/transaction-article-text/style/material";
 @import "../../shared/transaction-article-text-overview/style/material";
 @import "../../transaction-line-side-panel/style/material";
 @import "../../dialog/transaction-line/dialog-transaction-line-commission-code/style/material";
 @import "../../dialog/transaction-line/dialog-transaction-line-warehouse/style/material";
+@import "../../dialog/transaction-line/dialog-transaction-line-warehouse-location/style/material";
 @import "../../dialog/transaction-line/dialog-transaction-line-delivery-method/style/material";
 @import "../../dialog/transaction-line/dialog-transaction-line-vat/style/material";
 @import "../../dialog/transaction-line/dialog-transaction-line-discount/style/material";

package/lib/component/transaction-line-checkbox-list/style/_layout.scss

@@ -2,6 +2,15 @@
   .co-transaction-line-checkbox-list {
     display: block;
     height: 100%;
+
+    .test {
+      height: 400px;
+    }
+
+    .test2 {
+      height: 50px;
+    }
+
     .highlight {
       font-weight: $tp-transaction-line-checkbox-list-item-hightlight-font-weight;
       font-style: $tp-transaction-line-checkbox-list-item-hightlight-font-style;
@@ -13,6 +22,10 @@
       overflow: hidden;
       tr {
         height: $tp-transaction-line-checkbox-list-item-height;
+        visibility: hidden;
+        &.visible {
+          visibility: visible;
+        }
       }
       td {
         border-width: $tp-transaction-line-checkbox-list-item-border-width;

package/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.d.ts

@@ -0,0 +1,13 @@
+import { OnInit } from "@angular/core";
+import { TransactionLineBaseComponent } from "../core/base/transaction-line-base.component";
+import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
+import { ArticleService } from "../../service/article.service";
+export declare class TransactionLineWarehouseLocationComponent extends TransactionLineBaseComponent<StockLocation> implements OnInit {
+    private _articleService;
+    warehouseNr: number;
+    protected codeField: string;
+    protected propsForLabel: string[];
+    constructor(_articleService: ArticleService);
+    ngOnInit(): void;
+    commit(locationNr: number): Promise<boolean>;
+}

package/lib/component/transaction-line-fields/transaction-line-warehouse-location.module.d.ts

@@ -0,0 +1,2 @@
+export declare class TransactionLineWarehouseLocationModule {
+}

package/lib/component/transaction-line-side-panel/style/_layout.scss

@@ -2,19 +2,22 @@
 
 @include export-module('co-transaction-line-side-panel-layout') {
   .co-transaction-line-side-panel {
-    display: flex;
-    flex-direction: column;
-    font-family: $tp-transaction-line-side-panel-font-family;
-    font-size: $tp-transaction-line-side-panel-font-size;
-    position: fixed;
-    right: 0;
-    top: $tp-transaction-line-side-panel-top;
-    width: $tp-transaction-line-side-panel-width;
-    height: $tp-transaction-line-side-panel-height;
-    z-index: 10;
-    box-shadow: $tp-transaction-line-side-panel-box-shadow;
-    padding: $tp-transaction-line-side-panel-padding;
-    background: white;
+
+    .transaction-line-side-panel-wrapper {
+      display: flex;
+      flex-direction: column;
+      font-family: $tp-transaction-line-side-panel-font-family;
+      font-size: $tp-transaction-line-side-panel-font-size;
+      position: fixed;
+      right: 0;
+      top: $tp-transaction-line-side-panel-top;
+      width: $tp-transaction-line-side-panel-width;
+      height: $tp-transaction-line-side-panel-height;
+      z-index: 30;
+      box-shadow: $tp-transaction-line-side-panel-box-shadow;
+      padding: $tp-transaction-line-side-panel-padding;
+      background: white;
+    }
 
     .transaction-line-side-panel-header {
       display: flex;

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

@@ -7,7 +7,8 @@ import { TransactionTypeCategory } from "../../enum/transaction-type-category.en
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionEventService } from "../../service/transaction-event.service";
 import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
-export declare class TransactionLineSidePanelComponent {
+import { DynamicBaseComponent } from "../core/base/dynamic-base-component";
+export declare class TransactionLineSidePanelComponent extends DynamicBaseComponent {
     iconService: IconCacheService;
     private _service;
     private _transactionEventService;
@@ -19,7 +20,8 @@ export declare class TransactionLineSidePanelComponent {
     activeCategory: TransactionTypeCategory;
     cancelClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
+    show: boolean;
     quantityToReceive: number;
     constructor(iconService: IconCacheService, _service: TransactionService, _transactionEventService: TransactionEventService);
-    handleCancelClick(event: MouseEvent): void;
+    handleCancelClick(): void;
 }

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

@@ -9,9 +9,9 @@ export declare class TransactionLineSidePanelPurchaseComponent implements AfterV
     private _service;
     private _transactionEventService;
     readonly categories: typeof TransactionTypeCategory;
+    transactionLine: TransactionLineInfo;
     set transactionInfo(value: TransactionInfo);
     get transactionInfo(): TransactionInfo;
-    transactionLine: TransactionLineInfo;
     category: TransactionTypeCategory;
     quantityToReceiveChange: EventEmitter<number>;
     showClass(): boolean;

package/lib/component/transaction-receiving-goods-details/style/_layout.scss

@@ -34,5 +34,21 @@
     .details-input {
       margin: $tp-co-transaction-receiving-goods-details-input-margin;
     }
+
+    .location-wrapper {
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      border: 1px solid $tp-transaction-line-border-color;
+      border-radius: 10px;
+      height: 40px;
+      background-color: $tp-transaction-line-discount-background-color;
+      padding-left: 6px;
+      margin-bottom: 20px;
+    }
+  }
+
+  .clickable {
+    cursor: pointer;
   }
 }

package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.d.ts

@@ -5,10 +5,12 @@ import { FormMasterService } from "@colijnit/corecomponents_v12";
 import { ReceiveGoodsForPurchaseOrderRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo";
 import { TransactionService } from "../../service/transaction.service";
 import { ArticleService } from "../../service/article.service";
+import { DialogService } from "../../service/dialog.service";
 export declare class TransactionReceivingGoodsDetailsComponent {
     private _formMaster;
     private _service;
     private _articleService;
+    private _dialogService;
     set amountLeftToReceive(value: number);
     transactionId: number;
     set transactionLine(value: TransactionLineInfo);
@@ -24,10 +26,11 @@ export declare class TransactionReceivingGoodsDetailsComponent {
     readonly: boolean;
     private _transactionLine;
     private _amountLeftToReceive;
-    constructor(_formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService);
+    constructor(_formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService, _dialogService: DialogService);
     submit(): boolean;
     locationRequired(): boolean;
     handleSaveDetailsEdit(): Promise<void>;
     handleCancelDetailsEdit(): void;
     handleDropDownSelected(warehouseNr: number): Promise<void>;
+    openWarehouseLocationDialog(): Promise<any>;
 }

package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts

@@ -1,18 +1,16 @@
 import { EventEmitter } from "@angular/core";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionService } from "../../service/transaction.service";
-import { GoodsReceiptHistory } from "@colijnit/transactionapi/build/model/goods-receipt-history.bo";
-import { DatePipe } from "@angular/common";
+import { LogisticalStateDetail } from "@colijnit/transactionapi/build/model/logistical-state-detail.bo";
 export declare class TransactionReceivingGoodsHistoryComponent {
     private _service;
-    private _datePipe;
-    set goodsReceiptHistory(value: GoodsReceiptHistory[]);
+    set goodsReceiptHistory(value: LogisticalStateDetail[]);
     transactionLine: TransactionLineInfo;
     transactionId: number;
     reloadReceivingGoodsHistory: EventEmitter<void>;
-    get goodsReceiptHistory(): GoodsReceiptHistory[];
+    get goodsReceiptHistory(): LogisticalStateDetail[];
     private _goodsReceiptHistory;
-    constructor(_service: TransactionService, _datePipe: DatePipe);
+    constructor(_service: TransactionService);
     showClass(): boolean;
-    handleDeleteSelectedRow(row: GoodsReceiptHistory): Promise<void>;
+    handleDeleteSelectedRow(row: LogisticalStateDetail): Promise<void>;
 }

package/lib/component/transaction-search/style/material.scss

@@ -4,5 +4,5 @@
 @import "../transaction-search-header/style/material";
 @import "../transaction-filter/transaction-filter/style/material";
 @import "../transaction-search-result/style/material";
-@import "~@colijnit/corecomponents_v12/lib/components/pagination/style/material";
+@import "~@colijnit/corecomponents_v12/lib/modules/pagination/style/material";
 

package/lib/service/dialog.service.d.ts

@@ -1,16 +1,23 @@
-import { ApplicationRef, ComponentFactoryResolver, Injector } from "@angular/core";
+import { ApplicationRef, ComponentFactoryResolver, Injector, Type } from "@angular/core";
 import { TransactionLineCharacteristicChoice } from "@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo";
+import { DynamicComponentService } from "./dynamic-component.service";
+import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
+import { DialogBaseComponent } from "../component/core/base/dialog-base.component";
+import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 export declare class DialogService {
     private _compFactoryResolver;
     private appRef;
     private injector;
+    private dynamicComponentService;
     private _componentRefs;
-    constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
+    constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector, dynamicComponentService: DynamicComponentService);
     showYesNo(title: string, text: string): Promise<any>;
     showError(message: string, details?: string): Promise<any>;
     showInformation(message: string): Promise<any>;
+    showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<any>;
+    showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<any>;
     showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
     showWarehouse(): Promise<number>;
     showCommissionCode(): Promise<string>;
-    private _createComponent;
+    showWarehouseLocation(): Promise<string>;
 }

package/lib/service/dynamic-component.service.d.ts

@@ -0,0 +1,9 @@
+import { ApplicationRef, ComponentFactoryResolver, Injector, StaticProvider } from "@angular/core";
+export declare class DynamicComponentService {
+    private _compFactoryResolver;
+    private appRef;
+    private injector;
+    private _componentRefs;
+    constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
+    createComponent(componentClass: any, inputs?: any, outputs?: any, providers?: StaticProvider[]): Promise<any>;
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.35",
+  "version": "12.1.36",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.0",
     "@angular/core": "^12.2.0",
-    "@colijnit/corecomponents_v12": ">=12.0.61",
-    "@colijnit/transactionapi": ">=1.1.32",
+    "@colijnit/corecomponents_v12": ">=12.0.68",
+    "@colijnit/transactionapi": ">=1.1.37",
     "@fortawesome/angular-fontawesome": "0.9.0",
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",