@colijnit/transaction 262.1.17 → 262.1.18

package/index.d.ts

@@ -2150,6 +2150,7 @@ declare enum Icon {
     RegularContainerStorageCircleCheck = "regular_container_storage_circle_check",
     RegularContainerStorageCircleInfo = "regular_container_storage_circle_info",
     RegularEuroSignMinus = "regular_euro_sign_minus",
+    RegularGearCircleUser = "regular_gear_circle_user",
     RegularIndustryClock = "regular_industry_clock",
     RegularIndustryTag = "regular_industry_tag",
     RegularReceiptSlash = "regular_receipt_slash",
@@ -6397,7 +6398,7 @@ declare class RelationAddressesComponent extends RelationBaseComponent implement
 
 declare class RelationAddressesModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<RelationAddressesModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<RelationAddressesModule, [typeof RelationAddressesComponent], [typeof i2.CommonModule, typeof i3.Carousel3dModule, typeof RelationAddressTileModule, typeof CoreModule, typeof PipeModule, typeof i3.CoDialogModule, typeof RelationAddressModule, typeof i3.FormModule, typeof i3.ButtonModule, typeof i3.CarouselModule, typeof i3.FilterPipeModule], [typeof RelationAddressesComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<RelationAddressesModule, [typeof RelationAddressesComponent], [typeof i2.CommonModule, typeof RelationAddressTileModule, typeof CoreModule, typeof PipeModule, typeof i3.CoDialogModule, typeof RelationAddressModule, typeof i3.FormModule, typeof i3.ButtonModule, typeof i3.CarouselModule, typeof i3.FilterPipeModule], [typeof RelationAddressesComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<RelationAddressesModule>;
 }
 
@@ -6856,7 +6857,7 @@ declare class DeliveryTypeTileModule {
 
 declare class TransactionHeaderDeliveryMethodModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionHeaderDeliveryMethodModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionHeaderDeliveryMethodModule, [typeof TransactionHeaderDeliveryMethodComponent], [typeof i2.CommonModule, typeof PipeModule, typeof i3.Carousel3dModule, typeof DeliveryTypeTileModule, typeof i3.InputCheckboxModule, typeof TransactionLineCheckboxModule, typeof i3.CarouselModule, typeof i3.TooltipDirectiveModule], [typeof TransactionHeaderDeliveryMethodComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionHeaderDeliveryMethodModule, [typeof TransactionHeaderDeliveryMethodComponent], [typeof i2.CommonModule, typeof PipeModule, typeof DeliveryTypeTileModule, typeof i3.InputCheckboxModule, typeof TransactionLineCheckboxModule, typeof i3.CarouselModule, typeof i3.TooltipDirectiveModule], [typeof TransactionHeaderDeliveryMethodComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionHeaderDeliveryMethodModule>;
 }
 
@@ -13796,7 +13797,7 @@ declare class StepperStepModule {
 
 declare class CheckoutModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<CheckoutModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CheckoutModule, [typeof CheckoutOverviewRelationEditComponent, typeof CheckoutOverviewDeliveryEditComponent, typeof CheckoutOverviewPaymentComponent, typeof CheckoutComponent], [typeof CoreModule, typeof i2.CommonModule, typeof i3.IconModule, typeof i3.InputTextModule, typeof i3.InputCheckboxModule, typeof i3.InputRadioButtonModule, typeof i3.FormModule, typeof i3.InputDatePickerModule, typeof i3.InputNumberPickerModule, typeof i3.CoDialogModule, typeof i3.ButtonModule, typeof i3.PopupModule, typeof i8.ReactiveFormsModule, typeof i8.FormsModule, typeof RelationAddressModule, typeof RelationAddressSelectModule, typeof RelationAddressTileModule, typeof i3.Carousel3dModule, typeof i3.InputTextareaModule, typeof PipeModule, typeof StepperModule, typeof ShoppingCartPreviewModule, typeof AvatarModule, typeof DeliveryTypeTileModule, typeof i3.CollapsibleModule, typeof PaymentModule, typeof RelationTypeModule, typeof RelationGeneralModule, typeof RelationAddressesModule, typeof RelationContactDetailsModule, typeof RelationPreferencesModule, typeof TransactionHeaderDeliveryModule, typeof TransactionHeaderPreferredDeliveryDateModule, typeof TransactionHeaderDeliveryDateModule, typeof TransactionHeaderDeliveryMethodModule, typeof TransactionHeaderPartialDeliveryModule, typeof TransactionHeaderDeliveryOptionsModule, typeof TransactionHeaderRemarksModule, typeof TransactionHeaderReferenceModule, typeof TransactionHeaderRelationReferenceModule, typeof TransactionHeaderDepositPercentageModule, typeof TransactionHeaderDepositAmountModule, typeof TransactionHeaderDefinitiveModule, typeof TransactionHeaderBranchModule, typeof TransactionHeaderAdministrativeRelationModule, typeof TransactionHeaderMarketingModule, typeof TransactionHeaderHoldCodesModule, typeof RelationSuggestionsListModule, typeof i3.ScreenConfigurationModule, typeof SuggestionsSidebarModule, typeof i3.ListOfValuesModule, typeof StepperStepModule, typeof TransactionHeaderSalesPersonModule, typeof TransactionHeaderPaymentConditionModule, typeof i3.InputSearchModule], [typeof CheckoutComponent, typeof CheckoutOverviewRelationEditComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CheckoutModule, [typeof CheckoutOverviewRelationEditComponent, typeof CheckoutOverviewDeliveryEditComponent, typeof CheckoutOverviewPaymentComponent, typeof CheckoutComponent], [typeof CoreModule, typeof i2.CommonModule, typeof i3.IconModule, typeof i3.InputTextModule, typeof i3.InputCheckboxModule, typeof i3.InputRadioButtonModule, typeof i3.FormModule, typeof i3.InputDatePickerModule, typeof i3.InputNumberPickerModule, typeof i3.CoDialogModule, typeof i3.ButtonModule, typeof i3.PopupModule, typeof i8.ReactiveFormsModule, typeof i8.FormsModule, typeof RelationAddressModule, typeof RelationAddressSelectModule, typeof RelationAddressTileModule, typeof i3.InputTextareaModule, typeof PipeModule, typeof StepperModule, typeof ShoppingCartPreviewModule, typeof AvatarModule, typeof DeliveryTypeTileModule, typeof i3.CollapsibleModule, typeof PaymentModule, typeof RelationTypeModule, typeof RelationGeneralModule, typeof RelationAddressesModule, typeof RelationContactDetailsModule, typeof RelationPreferencesModule, typeof TransactionHeaderDeliveryModule, typeof TransactionHeaderPreferredDeliveryDateModule, typeof TransactionHeaderDeliveryDateModule, typeof TransactionHeaderDeliveryMethodModule, typeof TransactionHeaderPartialDeliveryModule, typeof TransactionHeaderDeliveryOptionsModule, typeof TransactionHeaderRemarksModule, typeof TransactionHeaderReferenceModule, typeof TransactionHeaderRelationReferenceModule, typeof TransactionHeaderDepositPercentageModule, typeof TransactionHeaderDepositAmountModule, typeof TransactionHeaderDefinitiveModule, typeof TransactionHeaderBranchModule, typeof TransactionHeaderAdministrativeRelationModule, typeof TransactionHeaderMarketingModule, typeof TransactionHeaderHoldCodesModule, typeof RelationSuggestionsListModule, typeof i3.ScreenConfigurationModule, typeof SuggestionsSidebarModule, typeof i3.ListOfValuesModule, typeof StepperStepModule, typeof TransactionHeaderSalesPersonModule, typeof TransactionHeaderPaymentConditionModule, typeof i3.InputSearchModule], [typeof CheckoutComponent, typeof CheckoutOverviewRelationEditComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<CheckoutModule>;
 }
 
@@ -16230,6 +16231,7 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     iconCacheService: IconCacheService;
     transactionHeaderService: TransactionHeaderService;
     transactionLineService: TransactionLineService;
+    transactionService: TransactionService;
     protected articleService: ArticleService;
     readonly icons: typeof Icon;
     readonly tab: typeof WarehouseCCTab;
@@ -16250,6 +16252,7 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     transactionInfo: TransactionInfo;
     transactionLine: TransactionLineInfo;
     reason: string;
+    articleName: string;
     showDirectSell: boolean;
     directSellSupplier: SupplierLightObject;
     directSellPurchaseOrderNumber: number;
@@ -16259,7 +16262,7 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     chosenConversionUnit: Unit;
     conversionAmount: string;
     readonly TransactionKind: typeof TransactionKind;
-    constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, articleService: ArticleService);
+    constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionService: TransactionService, articleService: ArticleService);
     ngOnInit(): Promise<void>;
     handleQuantityChange(value: any): void;
     handleCommissionCodeChange(value: any): void;
@@ -16273,6 +16276,7 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     handleCloseDialog(event: MouseEvent, type: AppPopupButtonType): void;
     private _activeTabValid;
     private _scrollIntoView;
+    private setArticleName;
     protected readonly model: i0.ModelFunction;
     static ɵfac: i0.ɵɵFactoryDeclaration<DialogTransactionLineWarehouseCcComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<DialogTransactionLineWarehouseCcComponent, "co-dialog-transaction-line-warehouse-cc", never, { "transactionKind": { "alias": "transactionKind"; "required": false; }; }, { "close": "close"; }, never, never, false, never>;
@@ -16448,19 +16452,22 @@ declare class TransactionHeaderHandledByModule {
 declare class TransactionLineActivitiesComponent implements OnInit {
     transactionService: TransactionService;
     private _changeDetector;
+    activityList: ElementRef<HTMLDivElement>;
+    openActivities: ComponentActivityListComponent;
+    transactionId: number;
     readonly tableNames: typeof TableName;
     readonly cfgNames: typeof TransactionCfgName;
     readonly WorkflowCategoryType: typeof WorkflowCategoryType;
     activities: Activity[];
     user: RelationSmallObject$1;
     transactionInfo: TransactionInfo;
-    transactionId: number;
-    openActivities: ComponentActivityListComponent;
+    showActivityHeader: boolean;
     constructor(transactionService: TransactionService, _changeDetector: ChangeDetectorRef);
     showClass(): boolean;
     ngOnInit(): void;
     finishedActivitiesRefreshRequested(): Promise<void>;
     fullActivitiesRefreshRequested(): void;
+    scrollActivitiesToBottom(): void;
     getActivities(): Promise<void>;
     openCreatedTask(taskId: number): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineActivitiesComponent, never>;
@@ -16492,7 +16499,7 @@ declare class TransactionLineActivitiesContactMomentsComponent implements OnInit
 
 declare class TransactionLineActivitiesModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineActivitiesModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionLineActivitiesModule, [typeof TransactionLineActivitiesComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i6.ActivityListModule, typeof i6.TaskCreatorModule, typeof i6.ComponentActivityListModule, typeof TransactionLineActivitiesContactMomentsComponent, typeof PipeModule], [typeof TransactionLineActivitiesComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionLineActivitiesModule, [typeof TransactionLineActivitiesComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i6.ActivityListModule, typeof i6.TaskCreatorModule, typeof i6.ComponentActivityListModule, typeof TransactionLineActivitiesContactMomentsComponent, typeof PipeModule, typeof i6.ActivityTimelineModule], [typeof TransactionLineActivitiesComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionLineActivitiesModule>;
 }
 

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

@@ -2,24 +2,164 @@
 
 @include export-module('co-transaction-line-activities-layout') {
   .co-transaction-line-activities {
-    .activities-grid {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      gap: 20px;
-      align-items: start;
+    .service-overview-wrapper {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      width: 100%;
     }
-
-    // Right column
-    .historic-activities-wrapper {
-      grid-column: 2;
-      grid-row: 1 / span 10; // keeps it stacked on the right
+    .message-and-task-wrapper {
+      display: flex;
+      gap: 15px;
+      width: 100%;
+      align-items: flex-start;
+      flex-wrap: wrap;
     }
-
-    // Left column
-    .contact-moments-wrapper,
-    .component-activity-list-wrapper,
-    .task-creator-wrapper {
-      grid-column: 1;
+    .timeline-and-message-wrapper {
+      display: flex;
+      flex-direction: column;
+      gap: 30px;
+      padding: 0 0 15px;
+      margin-bottom: 15px;
+      flex: 1;
+      align-self: flex-start;
+    }
+    .activity-list-component-wrapper {
+      padding: 0;
+      margin: 0;
+      display: flex;
+      flex-direction: column;
+      gap: 30px;
+      flex: 1;
+      align-self: flex-start;
+      width: 100%;
+      .activity-list-conv-wrapper {
+        flex: 1;
+        padding-left: 0;
+        max-height: 300px;
+        overflow: auto;
+      }
+      .co-task-creator {
+        position: sticky;
+        bottom: 0;
+      }
+    }
+    .activity-task-creator-wrapper {
+      display: flex;
+      gap: 15px;
+      flex-direction: column;
+      width: 400px;
+      max-width: 100%;
+    }
+    .activity-task-overview-wrapper {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+      padding: 15px;
+      border-radius: 5px;
+      box-shadow: 0 2px 5px 1px #0000001a;
+      background: #FFF;
+      .activity-header {
+        font-size: 14px;
+        font-weight: 700;
+        color: #171721;
+        position: relative;
+      }
+      .activity-wrapper-inner {
+        order: 2;
+        display: flex;
+        gap: 5px;
+        margin-top: 0;
+        flex-wrap: wrap;
+        max-height: 300px;
+        overflow: auto;
+        &.bottom-task {
+          .task-box {
+            .co-button {
+              border: 1px solid #1b2874;
+              background: #1b28741a;
+              color: #1b2874;
+              justify-content: center;
+              align-items: center;
+              height: 32px;
+              min-width: 150px;
+              width: 100%;
+              span {
+                text-align: center;
+                font-size: 11px;
+              }
+            }
+          }
+        }
+      }
+      .co-component-activity-overview {
+        order: 1;
+        width: 100%;
+        &.bottom-task {
+          order: 2;
+          width: calc(50% - 3px);
+        }
+        .overview-main {
+          max-width: 100%;
+          .label-date-activity {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          }
+          .activity-buttons {
+            .co-button {
+              width: 50%;
+              border: 1px solid #1a73e8 !important;
+              color: #1a73e8 !important;
+              background: #fff !important;
+              text-align: center;
+              padding: 5px 10px;
+              justify-content: center;
+              height: 32px;
+              max-width: calc(50% - 3px);
+            }
+          }
+        }
+        .overview-current {
+          .activity-title {
+            background: #d1e3fa;
+            border: 1px solid #1a73e8;
+            color: #1a73e8;
+            padding: 7px 15px;
+            text-transform: uppercase;
+            height: 32px;
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            font-size: 11px;
+          }
+        }
+      }
+    }
+    .overview-task-wrapper {
+      .task-box {
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+        position: relative;
+        cursor: pointer;
+        width: 100%;
+      }
+    }
+    .message-and-task-wrapper {
+      .co-component-activity-list {
+        margin: 0;
+        height: auto;
+        padding: 0;
+        .activity-wrapper {
+          max-width: 100%;
+          max-height: 100%;
+          padding: 0;
+        }
+      }
+      .activity-list-content {
+        height: auto;
+      }
     }
   }
 }

package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/style/_material-definition.scss

@@ -1,6 +1,6 @@
 $tp-transaction-lines-side-panel-service-order-background: transparent !default;
 $tp-transaction-lines-side-panel-service-order-font-family: $tp-font-family !default;
-$tp-transaction-lines-side-panel-service-order-font-size: $tp-font-size !default;
+$tp-transaction-lines-side-panel-service-order-font-size: $tp-font-size-big !default;
 $tp-transaction-lines-side-panel-service-order-font-weight: bold !default;
 $tp-transaction-lines-side-panel-service-order-font-color: $tp-color-dark !default;
 $tp-transaction-lines-side-panel-service-order-label-icon-size: 14px;

package/lib/component/transaction-navigation-button-list/style/_layout.scss

@@ -4,7 +4,7 @@
       display: flex;
       flex-direction: column;
       position: fixed;
-      z-index: 1;
+      z-index: 2;
       row-gap: $tp-co-transaction-navigation-button-list-row-gap;
       padding: $tp-co-transaction-navigation-button-list-overlay-padding;
       overflow: hidden;

package/lib/component/transaction-service-overview/style/_layout.scss

@@ -146,7 +146,7 @@
           .activity-task-overview-wrapper {
             display: flex;
             flex-direction: column;
-            gap: 15px;
+            gap: 5px;
             padding: 15px;
             border-radius: 5px;
             box-shadow: 0px 2px 5px 1px rgba(0, 0, 0, 0.1);
@@ -154,6 +154,7 @@
               .activity-wrapper {
                 max-width: 100%;
                 max-height: 100%;
+                padding: 0;
               }
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "262.1.17",
+  "version": "262.1.18",
   "description": "Colijn IT transaction module for Angular 20",
   "repository": "npm/npm",
   "author": "Colijn IT",