@colijnit/transaction 12.1.18 → 12.1.21

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

@@ -29,7 +29,7 @@
     }
     &:not(.preview) {
       .transaction-line-wrapper {
-        min-height: $tp-transaction-line-min-height;
+        //min-height: $tp-transaction-line-min-height;
       }
     }
     .transaction-line-image {
@@ -53,15 +53,20 @@
         flex-direction: row;
         align-items: center;
       }
-      .delete-icon {
-        height: 20px;
-        width: 20px;
-      }
+    }
+    .transaction-line-stock-wrapper {
+      display: flex;
+      column-gap: 5px;
+    }
+    .delete-icon {
+      cursor: pointer;
+      height: $tp-transaction-line-delete-icon-size;
+      width: $tp-transaction-line-delete-icon-size;
     }
     .transaction-line-description {
       display: flex;
       flex-direction: column;
-      row-gap: 10px;
+      row-gap: $tp-transaction-line-row-gap;
       flex-basis: 100%;
       padding: $tp-transaction-line-inner-padding;
     }
@@ -69,93 +74,105 @@
       display: flex;
       flex-direction: column;
       flex-shrink: 0;
+      row-gap: $tp-transaction-line-row-gap;
       padding: $tp-transaction-line-inner-padding;
     }
-    .transaction-line-amount {
-      display: flex;
-      height: $tp-transaction-line-amount-height;
-      flex-shrink: 0;
-      padding: $tp-transaction-line-inner-padding;
-      .amount-number-picker {
-        border-color: $tp-transaction-line-amount-input-border-color;
-        input {
-          width: $tp-transaction-line-amount-input-width;
-        }
-      }
-    }
     &:not(.preview) {
       .transaction-line-amount {
-        height: $tp-transaction-line-amount-height;
+        //height: $tp-transaction-line-amount-height;
       }
     }
     .transaction-line-totals {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      height: $tp-transaction-line-amount-height;
-      padding: $tp-transaction-line-inner-padding;
-      width: 100px;
-      justify-content: flex-end;
+      //display: flex;
+      //align-items: flex-start;
+      //flex-shrink: 0;
+      //height: $tp-transaction-line-amount-height;
+      //padding: $tp-transaction-line-inner-padding;
+      //width: 600px;
+      //justify-content: flex-end;
+      //font-weight: $tp-transaction-line-totals-font-weight;
+      //span { // todo fix
+      //  border: 1px solid #d3d3d3;
+      //  padding: 5px 22px;
+      //  border-radius: 10px;
+      //}
+      display: grid;
+      grid-template-columns: 100px 100px 100px;
+      grid-template-rows: 30px 30px;
+      grid-column-gap: $tp-transaction-line-column-gap;
+      grid-row-gap: $tp-transaction-line-row-gap;
+
+      .transaction-line-totals-price {
+        grid-column: 1 / 1;
+        grid-row: 1 / 1;
+      }
+
+      .transaction-line-totals-discount {
+        grid-column: 1 / 1;
+        grid-row: 2 / 2;
+      }
+
+      .transaction-line-totals-amount {
+        grid-column: 2 / 2;
+        grid-row: 1 / 1;
+
+        .amount-number-picker {
+          border: none;
+          //border-color: $tp-transaction-line-amount-input-border-color;
+          //border-radius: 10px;
+
+          //input {
+          //  width: $tp-transaction-line-amount-input-width;
+          //}
+          .co-button {
+            height: 18px;
+            width: 20px;
+          }
+        }
+      }
+
+      .transaction-line-totals-total {
+        grid-column: 3 / 3;
+        grid-row: 1 / 1;
+      }
+
+      .transaction-line-totals-price, .transaction-line-totals-discount, .transaction-line-totals-amount, .transaction-line-totals-total {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid $tp-transaction-line-border-color;
+        border-radius: 10px;
+        .co-input-text {
+          width: 80%;
+          height: 95%;
+          input {
+            margin: 6px 0 0;
+          }
+        }
+      }
     }
+    //.transaction-line-totals-price-discount {
+    //  display: flex;
+    //  flex-direction: column;
+    //  row-gap: 5px;
+    //}
     .transaction-line-buttons {
       display: flex;
-      flex-direction: column;
       align-items: center;
       flex-shrink: 0;
-      row-gap: 5px;
       height: $tp-transaction-line-amount-height;
-      padding: $tp-transaction-line-inner-padding;
-      .circle {
-        opacity: 0;
-        height: 25px;
-        width: 25px;
-        co-icon {
-          height: 25px;
-          width: 25px;
-        }
-        &.show {
-          opacity: 1;
-        }
-      }
-      .circle:nth-child(1) {
-        //animation-delay: .4s;
-        transition: all .2s .4s;
-      }
-      .circle:nth-child(2) {
-        //animation-delay: .4s;
-        transition: all .2s .3s;
-      }
-      .circle:nth-child(3) {
-        //animation-delay: .6s;
-        transition: all .2s .2s;
-      }
-      .circle:nth-child(4) {
-        //animation-delay: .8s;
-        transition: all .2s .1s;
-      }
-      .circle.show:nth-child(1) {
-        //animation-delay: .4s;
-        transition: all .2s;
-      }
-      .circle.show:nth-child(2) {
-        //animation-delay: .4s;
-        transition: all .2s .1s;
-      }
-      .circle.show:nth-child(3) {
-        //animation-delay: .6s;
-        transition: all .2s .2s;
-      }
-      .circle.show:nth-child(4) {
-        //animation-delay: .8s;
-        transition: all .2s .3s;
+    }
+    .transaction-line-description {
+      .description-wrapper {
+        display: flex;
+        flex-direction: row;
+        column-gap: $tp-transaction-line-column-gap;
+        align-items: center;
       }
     }
     .transaction-line-description-description {
       font-weight: bold;
     }
-    .transaction-line-description-divider {
-      margin: 0 10px;
-    }
     .transaction-line-description-sku {
     }
     .article-text-wrapper {
@@ -167,6 +184,9 @@
         min-height: $tp-transaction-line-article-text-min-height;
       }
     }
+    .price {
+      font-weight: $tp-transaction-line-price-font-weight;
+    }
   }
   .article-text {
     font-family: $tp-transaction-line-font-family;

package/lib/component/transaction-line/style/_material-definition.scss

@@ -7,17 +7,19 @@ $tp-transaction-line-padding: 10px !default;
 $tp-transaction-line-inner-padding: 10px !default;
 $tp-transaction-line-border: 1px solid !default;
 $tp-transaction-line-border-width: 0 0 1px 0 !default;
-$tp-transaction-line-border-color: $tp-color-action !default;
-$tp-transaction-line-image-border: 1px solid $tp-color-border !default;
+$tp-transaction-line-border-color: $tp-color-border !default;
+$tp-transaction-line-image-border: none !default;
 $tp-transaction-line-column-gap: 15px !default;
-$tp-transaction-line-row-gap: 15px !default;
+$tp-transaction-line-row-gap: 5px !default;
 $tp-transaction-line-image-width: 67px !default;
+$tp-transaction-line-delete-icon-size: 15px !default;
 $tp-transaction-line-preview-image-width: 75px !default;
 $tp-transaction-line-image-height: 50px !default;
 $tp-transaction-line-preview-image-height: 50px !default;
 $tp-transaction-line-amount-height: 50px !default;
 $tp-transaction-line-amount-input-width: 50px !default;
 $tp-transaction-line-amount-input-border-color: $tp-color-border !default;
+$tp-transaction-line-totals-font-weight: bold !default;
 $tp-transaction-line-delete-color: $tp-color-action !default;
 $tp-transaction-line-article-text-background-color: $tp-color-light-accent !default;
 $tp-transaction-line-article-text-color: $tp-color-dark !default;
@@ -28,3 +30,5 @@ $tp-transaction-line-buttons-add-text-text-color: $tp-color-light !default;
 $tp-transaction-line-article-text-font-size: $tp-font-size !default;
 $tp-transaction-line-article-text-font-color: $tp-color-label !default;
 $tp-transaction-line-article-text-padding: 2px !default;
+$tp-transaction-line-price-font-weight: bold !default;
+$tp-transaction-line-discount-background-color: #F5F5FA !default;

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

@@ -21,26 +21,12 @@
       background-color: $tp-transaction-line-article-text-background-color;
       color: $tp-transaction-line-article-text-color;
     }
-    .transaction-line-overview-button {
-      background-color: $tp-transaction-line-buttons-overview-background-color;
-      co-icon [fill] {
-        fill: $tp-transaction-line-buttons-overview-text-color;
-      }
-    }
-    .transaction-line-add-text-button {
-      background-color: $tp-transaction-line-buttons-add-text-background-color;
-      co-icon [fill] {
-        fill: $tp-transaction-line-buttons-add-text-text-color;
-      }
-    }
-    .transaction-line-show-sidebar-button {
-      co-icon [fill] {
-        fill: $tp-transaction-line-buttons-add-text-text-color;
-      }
-    }
     .article-text {
       color: $tp-transaction-line-article-text-font-color;
       background-color: $tp-transaction-line-background-color;
     }
+    .discount {
+      background-color: $tp-transaction-line-discount-background-color;
+    }
   }
 }

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

@@ -5,10 +5,9 @@ import { TransactionService } from "../../service/transaction.service";
 import { DictionaryService } from "../../service/dictionary.service";
 import { Icon } from "../../enum/icon.enum";
 import { IconCacheService } from "../../service/icon-cache.service";
-import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
 import { DialogService } from "../../service/dialog.service";
-import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
 import { TransactionImageService } from "../../service/transaction-image.service";
+import { TransactionLineActionButtonsComponent } from "../transaction-line-action-buttons/transaction-line-action-buttons.component";
 export declare class TransactionLineComponent {
     service: TransactionService;
     iconCacheService: IconCacheService;
@@ -21,6 +20,7 @@ export declare class TransactionLineComponent {
     get line(): TransactionLineInfo;
     waitingForUserAction: EventEmitter<boolean>;
     sidePanelButtonClicked: EventEmitter<void>;
+    transactionLineActionButtons: TransactionLineActionButtonsComponent;
     isText: boolean;
     isArticle: boolean;
     isSelected: boolean;
@@ -30,26 +30,13 @@ export declare class TransactionLineComponent {
     localAmount: number;
     image: string;
     stock: StockStatus;
-    currentReason: ResolveLinePendingReasonRequest;
-    showTransactionArticleText: boolean;
-    showTransactionArticleTextOverview: boolean;
-    articleTextHeader: string;
-    textToEdit: string;
     mouseOver: boolean;
+    readonly: boolean;
     private _line;
     constructor(service: TransactionService, iconCacheService: IconCacheService, _dialogService: DialogService, _dictionaryService: DictionaryService, _imageService: TransactionImageService);
     changeLineAmount(amount: number): void;
     deleteTransactionLineClick(): Promise<void>;
-    handleTransactionArticleText(event: MouseEvent): void;
-    handleTransactionArticleTextOverview(event: MouseEvent): void;
-    saveTransactionArticleLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
-    closeTransactionArticleText(event: MouseEvent): void;
-    closeTransactionArticleTextOverview(event: MouseEvent): void;
     handleOpenArticleText(text: string): void;
+    handleShowSidePanel(): void;
     private _loadLineImage;
-    private _showArticleTextDialog;
-    private _hideArticleTextDialog;
-    private _showArticleTextOverviewDialog;
-    private _hideArticleTextOverviewDialog;
-    handleShowSidePanel(event: MouseEvent): void;
 }

package/lib/component/transaction-line-action-buttons/style/_layout.scss

@@ -0,0 +1,106 @@
+@import "../../../style/mixin";
+
+@include export-module('co-transaction-line-action-buttons-layout') {
+  .co-transaction-line-action-buttons {
+
+    .transaction-line-action-buttons-wrapper {
+      padding: $tp-transaction-line-show-hide-button-padding;
+      border-radius: 14px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .show-hide-button {
+        width: $tp-transaction-line-show-hide-button-size;
+        height: $tp-transaction-line-show-hide-button-size;
+        cursor: pointer;
+      }
+    }
+
+    .transaction-line-overview-button {
+      background-color: $tp-transaction-line-buttons-overview-background-color;
+      co-icon [fill] {
+        fill: $tp-transaction-line-buttons-overview-text-color;
+      }
+    }
+    .transaction-line-add-text-button {
+      background-color: $tp-transaction-line-buttons-add-text-background-color;
+      co-icon [fill] {
+        fill: $tp-transaction-line-buttons-add-text-text-color;
+      }
+    }
+    .transaction-line-show-sidebar-button {
+      co-icon [fill] {
+        fill: $tp-transaction-line-buttons-add-text-text-color;
+      }
+    }
+
+    .action-buttons-container {
+      display: flex;
+      flex-direction: column;
+      position: absolute;
+
+      .circle {
+        opacity: 0;
+        height: 25px;
+        width: 25px;
+        margin: 5px;
+        cursor: pointer;
+        co-icon {
+          height: 25px;
+          width: 25px;
+        }
+        &.show {
+          opacity: 1;
+        }
+      }
+      .circle:nth-child(1) {
+        transition: all .2s .4s;
+      }
+      .circle:nth-child(2) {
+        transition: all .2s .3s;
+      }
+      .circle:nth-child(3) {
+        transition: all .2s .2s;
+      }
+      .circle:nth-child(4) {
+        transition: all .2s .1s;
+      }
+      .circle.show:nth-child(1) {
+        transition: all .2s;
+      }
+      .circle.show:nth-child(2) {
+        transition: all .2s .1s;
+      }
+      .circle.show:nth-child(3) {
+        transition: all .2s .2s;
+      }
+      .circle.show:nth-child(4) {
+        transition: all .2s .3s;
+      }
+
+      &.bottom {
+        transform: translate(0, calc(50% + (#{$tp-transaction-line-show-hide-button-size} / 2) +
+        #{$tp-transaction-line-show-hide-button-padding}));
+      }
+
+      &.top {
+        transform: translate(0, calc(-50% - (#{$tp-transaction-line-show-hide-button-size} / 2) -
+        #{$tp-transaction-line-show-hide-button-padding}));
+        flex-direction: column-reverse;
+      }
+
+      &.left {
+        transform: translate(calc(-50% - (#{$tp-transaction-line-show-hide-button-size} / 2) -
+        #{$tp-transaction-line-show-hide-button-padding}));
+        flex-direction: row-reverse;
+      }
+
+      &.right {
+        transform: translate(calc(50% + (#{$tp-transaction-line-show-hide-button-size} / 2) +
+        #{$tp-transaction-line-show-hide-button-padding}));
+        flex-direction: row;
+      }
+    }
+  }
+}

package/lib/component/transaction-line-action-buttons/style/_material-definition.scss

@@ -0,0 +1,7 @@
+$tp-transaction-line-buttons-overview-background-color: $tp-color-active-light !default;
+$tp-transaction-line-buttons-overview-text-color: $tp-color-light !default;
+$tp-transaction-line-buttons-add-text-background-color: $tp-color-action !default;
+$tp-transaction-line-buttons-add-text-text-color: $tp-color-light !default;
+$tp-transaction-line-show-hide-button-size: 30px !default;
+$tp-transaction-line-show-hide-button-padding: 4px !default;
+

package/lib/component/transaction-line-action-buttons/style/_theme.scss

@@ -0,0 +1,7 @@
+@import "../../../style/mixin";
+
+@include export-module('co-transaction-line-action-buttons-theme') {
+  .co-transaction-line-action-buttons {
+
+  }
+}

package/lib/component/{transaction-search/transaction-filter-content-article → transaction-line-action-buttons}/style/material.scss

@@ -1,4 +1,3 @@
-@import "../../../../style/variables";
 @import "./material-definition";
 @import "./layout";
 @import "./theme";

package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.d.ts

@@ -0,0 +1,46 @@
+import { EventEmitter, OnInit } from "@angular/core";
+import { TransactionService } from "../../service/transaction.service";
+import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
+import { Icon } from "../../enum/icon.enum";
+import { DictionaryService } from "../../service/dictionary.service";
+import { IconCacheService } from "../../service/icon-cache.service";
+import { Direction } from "../../enum/direction.enum";
+import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
+import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
+export declare class TransactionLineActionButtonsComponent implements OnInit {
+    iconCacheService: IconCacheService;
+    private _transactionService;
+    private _dictionaryService;
+    readonly icons: typeof Icon;
+    set transactionLine(value: TransactionLineInfo);
+    get transactionLine(): TransactionLineInfo;
+    alignDirection: Direction;
+    waitingForUserAction: EventEmitter<boolean>;
+    sidePanelButtonClicked: EventEmitter<TransactionLineInfo>;
+    showClass(): boolean;
+    showActionButtons: boolean;
+    showActionButtonsDelayed: boolean;
+    transactionKind: TransactionKind;
+    showTransactionArticleText: boolean;
+    showTransactionArticleTextOverview: boolean;
+    articleTextHeader: string;
+    textToEdit: string;
+    readonly: boolean;
+    private _transactionLine;
+    constructor(iconCacheService: IconCacheService, _transactionService: TransactionService, _dictionaryService: DictionaryService);
+    ngOnInit(): void;
+    handleShowHideClick(): void;
+    handleTransactionArticleTextOverview(): void;
+    handleTransactionArticleText(): void;
+    handleShowSidePanel(): void;
+    showOverviewButton(): boolean;
+    showAddTextButton(): boolean;
+    showSidebarButton(): boolean;
+    saveTransactionArticleLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
+    closeTransactionArticleText(event: MouseEvent): void;
+    closeTransactionArticleTextOverview(event: MouseEvent): void;
+    showArticleTextDialog(): void;
+    private _hideArticleTextDialog;
+    private _showArticleTextOverviewDialog;
+    private _hideArticleTextOverviewDialog;
+}

package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.module.d.ts

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

package/lib/component/transaction-line-fields/transaction-line-fields-base.component.d.ts

@@ -2,5 +2,7 @@ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transa
 export declare abstract class TransactionLineFieldsBaseComponent {
     set transactionLine(value: TransactionLineInfo);
     get transactionLine(): TransactionLineInfo;
+    readonly: boolean;
     private _transactionLine;
+    protected transactionLineSet(): void;
 }

package/lib/component/transaction-line-fields/transaction-line-price.component.d.ts

@@ -4,7 +4,14 @@ import { TransactionService } from "../../service/transaction.service";
 export declare class TransactionLinePriceComponent extends TransactionLineFieldsBaseComponent {
     private _transactionService;
     set child(content: any);
+    showLabel: boolean;
+    defaultEditMode: boolean;
+    set editMode(value: boolean);
+    get editMode(): boolean;
+    handleClick(event: MouseEvent): void;
     input: InputTextComponent;
+    private _editMode;
     constructor(_transactionService: TransactionService);
     commitPrice(price: number): Promise<boolean>;
+    protected transactionLineSet(): void;
 }

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

@@ -18,6 +18,7 @@ export declare class TransactionLineSidePanelComponent {
     transactionId: number;
     activeCategory: TransactionTypeCategory;
     cancelClick: EventEmitter<MouseEvent>;
+    transactionInfoNr: number;
     showClass(): boolean;
     quantityToReceive: number;
     constructor(iconService: IconCacheService, _service: TransactionService, _transactionEventService: TransactionEventService);

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

@@ -7,10 +7,13 @@ export declare class TransactionLineSidePanelDefaultComponent {
     iconService: IconCacheService;
     private _transactionService;
     readonly icons: typeof Icon;
-    transactionLine: TransactionLineInfo;
+    set transactionLine(value: TransactionLineInfo);
+    get transactionLine(): TransactionLineInfo;
     cancelClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
     data: any[];
+    readonly: boolean;
+    private _transactionLine;
     constructor(iconService: IconCacheService, _transactionService: TransactionService);
     handleCancelClick(event: MouseEvent): void;
 }

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

@@ -12,6 +12,7 @@ export declare class TransactionLineSidePanelPurchaseComponent {
     set transactionId(value: number);
     get transactionId(): number;
     category: TransactionTypeCategory;
+    transactionInfoNr: number;
     quantityToReceiveChange: EventEmitter<number>;
     showClass(): boolean;
     goodsReceiptStatus: GoodsReceiptStatusWithHistory;

package/lib/component/transaction-quick-access/transaction-quick-access-overview/style/_layout.scss

@@ -1,7 +1,19 @@
+@use "sass:math";
 @import "../../../../style/mixin";
 
 @include export-module('cc-transaction-quick-access-overview-layout') {
   .co-transaction-quick-access-overview {
     width: 100%;
+    .co-input-search {
+      display: block;
+      width: $tp-transaction-quick-access-search-width;
+      height: $tp-transaction-quick-access-search-height;
+      .co-input-text {
+        height: $tp-transaction-quick-access-search-height;
+        label {
+          top: math.div($tp-transaction-quick-access-search-height, 2);
+        }
+      }
+    }
   }
 }

package/lib/component/transaction-quick-access/transaction-quick-access-overview/style/_material-definition.scss

@@ -0,0 +1,2 @@
+$tp-transaction-quick-access-search-width: 300px !default;
+$tp-transaction-quick-access-search-height: 35px !default;

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

@@ -1,4 +1,4 @@
-import { EventEmitter } from '@angular/core';
+import { EventEmitter } from "@angular/core";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { PurchaseOrderLineReceiptDetails } from "@colijnit/transactionapi/build/model/purchase-order-line-receipt-details.bo";
 import { FormMasterService } from "@colijnit/corecomponents_v12";
@@ -21,6 +21,7 @@ export declare class TransactionReceivingGoodsDetailsComponent {
     saveButtonDisabled: boolean;
     locations: string[];
     locationDropdownFields: {};
+    readonly: boolean;
     private _transactionLine;
     private _amountLeftToReceive;
     constructor(_formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService);