@colijnit/transaction 261.20.53 → 261.20.54

package/index.d.ts

@@ -305,7 +305,7 @@ import { BaseModuleScreenConfigService, BaseModuleService, FormMasterService, Sc
 import * as i5 from '@colijnit/relation';
 import { RelationService } from '@colijnit/relation';
 import * as i6 from '@colijnit/sharedcomponents';
-import { SharedService, AgendaEventPerDay, StatusbarData, CalendarView, SendMethod, FormBuilderUserFormComponent, ComponentActivityListComponent } from '@colijnit/sharedcomponents';
+import { SharedService, AgendaEventPerDay, StatusbarData, CalendarView, SendMethod, FormBuilderUserFormComponent, ComponentActivityListComponent, ActivityTimelineComponent } from '@colijnit/sharedcomponents';
 import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
 import { TransactionDeliveryCostLineInfo } from '@colijnit/transactionapi/build/model/transaction-delivery-cost-line-info.bo';
 import { UserRoleType } from '@colijnit/ioneconnector/build/enum/user-role-type.enum';
@@ -2142,6 +2142,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",
@@ -9852,7 +9853,7 @@ declare class TransactionSalesOverviewButtonBarButtonComponent extends Transacti
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -9878,7 +9879,7 @@ declare class TransactionPurchaseOverviewButtonBarButtonComponent extends Transa
     constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, changeDetector: ChangeDetectorRef, _mappingService: TransactionMappingService, _transactionService: TransactionService, _elementRef: ElementRef);
     ngOnDestroy(): void;
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): Promise<void>;
     private handleDocumentClick;
@@ -9930,7 +9931,7 @@ declare class TransactionSalesQuotationButtonBarButtonComponent extends Transact
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -13865,6 +13866,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     lineUUID: string;
     lineDraggedOver: number;
     headerReadOnly: boolean;
+    kassaPersnr: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     private _subs;
     private _transaction;
@@ -13874,7 +13876,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     private _salesPersonAvatarComponentRef;
     private _containerForFillMode;
     constructor(iconCacheService: IconCacheService, service: TransactionService, deliveryPlanningService: DeliveryPlanningService, _transactionConnectorService: TransactionConnectorService, _transactionEventService: TransactionEventService, _screenConfigurationService: TransactionScreenConfigurationService, _dialogService: TransactionDialogService, _purchaseConfirmationService: PurchaseConfirmationService, _transactionBaseService: TransactionBaseService, _changeDetector: ChangeDetectorRef, transactionHeaderService: TransactionHeaderService, _overlayService: OverlayService, _lineSelection: LineSelectionService);
-    ngOnInit(): void;
+    ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     handleButtonBarButtonClicked(button: TransactionBarButton): Promise<void>;
     checkPreferredPlanning(): Promise<void>;
@@ -13918,6 +13920,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     private _hideArticleTextOverviewDialog;
     private updateTransactionLine;
     handleViewModeChange(mode: ContentViewMode): void;
+    getPlanOrderForTransaction(transaction: TransactionInfoResponse): Promise<void>;
     handleShowSalesPersonInput(event: MouseEvent): Promise<void>;
     handleCancelUserForm(): void;
     handleUserFormError(error: string): Promise<void>;
@@ -15938,6 +15941,7 @@ declare class TransactionLinesSidePanelServiceOrderComponent extends Transaction
     transactionSet(): Promise<void>;
     handlePurchaseNavigation(): void;
     handleTransactionNavigation(): void;
+    handleRelationNavigation(): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLinesSidePanelServiceOrderComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLinesSidePanelServiceOrderComponent, "co-transaction-lines-side-panel-service-order", never, {}, {}, never, never, false, never>;
 }
@@ -15968,6 +15972,7 @@ declare class TransactionServiceOverviewComponent extends TransactionHeaderBaseC
     readonly WorkflowCategoryType: typeof WorkflowCategoryType;
     readonly cfgNames: typeof TransactionCfgName;
     openActivities: ComponentActivityListComponent;
+    activityTimeline: ActivityTimelineComponent;
     activityList: ElementRef<HTMLDivElement>;
     showClass(): boolean;
     posOrderData: PosOrderData;
@@ -16008,9 +16013,9 @@ declare class TransactionServiceOverviewComponent extends TransactionHeaderBaseC
     sortDocumentList(): void;
     openCreatedTask(taskId: number): Promise<void>;
     getWizardQuestionPairs(text?: string): string[][];
+    scrollActivitiesToBottom(): void;
     protected transactionInfoSet(): void;
-    private scrollActivitiesToBottom;
-    private setWizardQuestionPairs;
+    private _setWizardQuestionPairs;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionServiceOverviewComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionServiceOverviewComponent, "co-transaction-service-overview", never, { "posOrderData": { "alias": "posOrderData"; "required": false; }; "customerPortal": { "alias": "customerPortal"; "required": false; }; }, {}, never, never, false, never>;
 }
@@ -16031,7 +16036,7 @@ declare class TransactionServiceMessageModule {
 
 declare class TransactionServiceOverviewModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionServiceOverviewModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionServiceOverviewModule, [typeof TransactionServiceOverviewComponent], [typeof i3.InputTextareaModule, typeof i3.InputTextModule, typeof PipeModule, typeof CoreModule, typeof i3.ListOfValuesModule, typeof i3.ButtonModule, typeof i3.CollapsibleModule, typeof i2.CommonModule, typeof i6.FilesUploadModule, typeof i6.ActivityListModule, typeof i6.ComponentActivityListModule, typeof i6.TaskCreatorModule, typeof TransactionLinesSidePanelModule, typeof TransactionServiceMessageModule, typeof i3.ScreenConfigurationModule], [typeof TransactionServiceOverviewComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionServiceOverviewModule, [typeof TransactionServiceOverviewComponent], [typeof i3.InputTextareaModule, typeof i3.InputTextModule, typeof PipeModule, typeof CoreModule, typeof i3.ListOfValuesModule, typeof i3.ButtonModule, typeof i3.CollapsibleModule, typeof i2.CommonModule, typeof i6.FilesUploadModule, typeof i6.ActivityListModule, typeof i6.ComponentActivityListModule, typeof i6.TaskCreatorModule, typeof TransactionLinesSidePanelModule, typeof TransactionServiceMessageModule, typeof i3.ScreenConfigurationModule, typeof i6.ActivityTimelineModule], [typeof TransactionServiceOverviewComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionServiceOverviewModule>;
 }
 
@@ -16400,13 +16405,25 @@ 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[];
-    creatingTask: boolean;
-    transactionId: number;
-    constructor(transactionService: TransactionService);
+    user: RelationSmallObject$1;
+    transactionInfo: TransactionInfo;
+    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>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineActivitiesComponent, "co-transaction-line-activities", never, { "transactionId": { "alias": "transactionId"; "required": false; }; }, {}, never, never, false, never>;
 }
@@ -16432,7 +16449,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-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;
               }
             }
           }
@@ -194,6 +195,7 @@
           height: auto;
           .activity-tab-content {
             overflow: visible;
+            flex-direction: column-reverse;
             .activity-wrapper-inner {
               order: 1;
               &.bottom-task {
@@ -202,6 +204,8 @@
                 gap: 5px;
                 margin-top: 10px;
                 flex-wrap: wrap;
+                max-height: 300px;
+                overflow: auto;
                 co-component-activity-overview {
                   .activity-icon {
                     display: none;
@@ -253,35 +257,33 @@
         .activity-wrapper {
           max-height: 388px;
           overflow: auto;
-          max-width: 80%;
-          min-width: 50%;
+          width: 100%;
           padding: 10px 15px;
-          &.activity-status-change {
-            width: 40%;
-            min-width: 40%;
-            background: #f8f8fa;
-            padding: 10px 30px;
-            box-shadow: none;
-            .activity-display {
-              flex-direction: row-reverse;
-              justify-content: space-between;
-              .activity-icon, .activity-display-footer {
-                display: none !important;
-              }
-              .activity-display-title {
-                span {
-                  color: #6e6e6e;
-                  text-transform: uppercase;
+            &.activity-status-change {
+              width: 100%;
+              background: #ececec;
+              padding: 10px 30px;
+              box-shadow: none;
+              .activity-display {
+                flex-direction: row-reverse;
+                justify-content: space-between;
+                .activity-icon, .activity-display-footer {
+                  display: none !important;
                 }
-              }
-              .activity-display-body {
-                span {
-                  text-transform: uppercase;
-                  font-size: 11px;
+                .activity-display-title {
+                  span {
+                    color: #6e6e6e;
+                    text-transform: uppercase;
+                  }
+                }
+                .activity-display-body {
+                  span {
+                    text-transform: uppercase;
+                    font-size: 11px;
+                  }
                 }
               }
             }
-          }
         }
         .service-message-and-image-wrapper {
           display: flex;
@@ -496,9 +498,10 @@
                 border-radius: 15px;
                 .upload-add-wrapper {
                   flex-direction: row;
+                  gap: 0;
                   .co-tile-render {
-                    width: 40px;
-                    height: 40px;
+                    width: 26px;
+                    height: 26px;
                     border: none;
                     padding: 0;
                     .image, .info {
@@ -508,8 +511,8 @@
                       position: relative;
                       top: 0;
                       .add-button {
-                        width: 20px;
-                        height: 20px;
+                        width: 16px;
+                        height: 16px;
                         svg {
                           fill: #000;
                         }

package/package.json

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