@colijnit/sharedcomponents 1.0.50 → 1.0.51

package/lib/components/stock/components/stock-location/stock-location.component.d.ts

@@ -4,11 +4,11 @@ import { IconCacheService } from "../../../../service/icon-cache.service";
 import { Icon } from "../../../../enum/icon.enum";
 import { StockService } from "../../../../service/stock.service";
 import { StockManagementWarehouses } from "@colijnit/articleapi/build/model/stock-management-warehouses.bo";
-import { CoDropDownListFields } from "../../stock-transfer/co-drop-down-list-fields.interface";
 import { ArticleStockManagement } from "@colijnit/articleapi/build/model/article-stock-management";
 import { ArticleDetailsBo } from "@colijnit/articleapi/build/model/article-details.bo";
 import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
 import { PrintPriceStickers } from "@colijnit/sharedapi/build/model/print-price-stickers.bo";
+import { StockStatus } from "@colijnit/articleapi/build/model/stock-status.bo";
 export declare class StockLocationComponent implements OnInit {
     iconCacheService: IconCacheService;
     private _stockService;
@@ -17,30 +17,32 @@ export declare class StockLocationComponent implements OnInit {
     articleStockInfo: ArticleDetailsBo[];
     articleStockInformation: ArticleStockBo[];
     article: any;
-    clickedLocation: string;
     dataWareHouseCode: StockManagementWarehouses[];
     readonly transferIconClicked: EventEmitter<ArticleStockBo>;
     readonly sendMethodDialogClicked: EventEmitter<PrintPriceStickers>;
+    readonly locationAddedOrUpdated: EventEmitter<ArticleDetailsBo[]>;
+    selectedWarehouse: StockManagementWarehouses;
     articleDetails: ArticleDetailsBo[];
-    selectedWarehouse: any;
-    selectedWarehouseModel: {
-        value: 1;
-        label: 'danny & dane';
-    };
-    dataWareHouseFields: CoDropDownListFields;
-    dataLocationFields: CoDropDownListFields;
+    showConfirmationDialog: boolean;
     articleDetailsInformation: ArticleStockManagement;
     stockLocations: StockLocation[];
+    stockStatus: StockStatus[];
     selectedArticleDetailsData: ArticleDetailsBo;
-    selectedLocation: any;
+    selectedLocationNo: string;
+    private _subs;
     constructor(iconCacheService: IconCacheService, _stockService: StockService, _changeDetector: ChangeDetectorRef);
-    ngOnInit(): void;
-    onSelectWarehouse(event: any): void;
-    lockSelectedRow(row: any): void;
+    ngOnInit(): Promise<void>;
+    lockSelectedRow(row: any): Promise<void>;
     onLocationDropdownClick(): void;
-    locationChanged(event: any): void;
+    locationChanged(row: ArticleDetailsBo, event: StockLocation): void;
     amountInStockChanged(data: any): void;
     openSendMethodDialog(data: any): void;
     handleStockTransferClick(event: any): void;
     onOkClickSendLocations(): Promise<void>;
+    handleOkClick(): Promise<void>;
+    handleStockStatusChange(status: StockStatus): void;
+    handleStockStatusRemarkChange(remark: string): void;
+    disabled(): boolean;
+    statusForId(id: number): StockStatus;
+    locationForNumber(number: number): StockLocation;
 }

package/lib/components/stock/stock-tabs/stock-tabs.component.d.ts

@@ -20,7 +20,7 @@ export declare class StockTabsComponent implements OnInit {
     warehouses: StockManagementWarehouses[];
     readonly transferIconClicked: EventEmitter<ArticleStockBo>;
     readonly sendMethodDialogClicked: EventEmitter<PrintPriceStickers>;
-    selectedLocation: number;
+    selectedLocationNo: string;
     stockHistory: StockHistoryBo[];
     orderSupplyStockHistory: StockHistoryBo[];
     orderCommissionStockHistory: StockHistoryBo[];
@@ -47,4 +47,5 @@ export declare class StockTabsComponent implements OnInit {
     getOrderData(): Promise<void>;
     getStockPrognose(warehouseNo: number): Promise<void>;
     handleWarehouseSelected(event: StockManagementWarehouses): void;
+    wareHouseForCode(code: number): StockManagementWarehouses;
 }

package/lib/components/stock/stock-transfer/stock-transfer.component.d.ts

@@ -7,8 +7,11 @@ import { ArticleDetailsBo } from "@colijnit/articleapi/build/model/article-detai
 import { StockManagementWarehouses } from "@colijnit/articleapi/build/model/stock-management-warehouses.bo";
 import { StockStatus } from "@colijnit/articleapi/build/model/stock-status.bo";
 import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { Icon } from "../../../enum/icon.enum";
 export declare class StockTransferComponent implements AfterViewInit {
     private _stockService;
+    iconCacheService: IconCacheService;
     stockSticker: PrintStockStickers;
     article: ArticleStockBo;
     articleToTransfer: ArticleDetailsBo;
@@ -23,12 +26,15 @@ export declare class StockTransferComponent implements AfterViewInit {
     stockState: StockStatus[];
     stockStateDropdownField: CoDropDownListFields;
     locations: StockLocation[];
-    selectedWarehouse: any;
-    constructor(_stockService: StockService);
+    selectedWarehouse: StockManagementWarehouses;
+    readonly icons: typeof Icon;
+    constructor(_stockService: StockService, iconCacheService: IconCacheService);
     ngAfterViewInit(): void;
     handleOkClick(data: ArticleDetailsBo): Promise<void>;
     handleCancelClick(): void;
-    handleSelectedWarehouse(event: any): void;
+    handleSelectedWarehouse(event: StockManagementWarehouses): void;
+    handleSelectedLocation(event: StockLocation): void;
+    handleSelectedStockState(event: StockStatus): void;
     handleStickerClick(): Promise<void>;
     getStockManagementWarehouses(): void;
     getStockManagementLocations(data: any): void;

package/lib/components/stock/style/_layout.scss

@@ -1,6 +1,55 @@
 @include export-module('co-stock-layout') {
   .co-stock {
 
+    .stock-grid {
+      co-dialog {
+
+        .co-dialog-wrapper{
+          width: 500px;
+          height: 350px;
+          display: flex;
+
+        }
+
+
+        .header-wrapper {
+          span {
+            font-weight: bold;
+          }
+          padding: 1em;
+        }
+
+
+
+        .dialog-wrapper {
+          display: flex;
+          gap: 1em;
+          padding: 1em;
+          flex-direction: column;
+        }
+        .button-wrapper {
+          width: 100%;
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          align-items: center;
+          gap: 2em;
+
+          co-button {
+            width: 125px;
+            display: flex;
+            text-align: center;
+            align-items: center;
+            justify-content: center;
+          }
+          .cancel-button {
+            background: none;
+            text-decoration: underline;
+            color: $cc-color-font;
+          }
+        }
+      }
+    }
     .stock-info-container {
       max-width: $sc-stock-info-container-width;
       padding: $sc-stock-info-container-padding;
@@ -8,11 +57,11 @@
     }
 
     .stock-info {
-      margin-top: $sc-stock-info-margin;
+      margin: $sc-stock-info-margin;
       padding: $sc-stock-info-padding;
       display: inline-flex;
       width: $sc-stock-info-width;
-      justify-content: space-between;
+      gap: $sc-stock-info-gap;
     }
 
     .stock-info-row {
@@ -27,6 +76,9 @@
     .stock-image {
       height: $sc-stock-image-height;
       margin-right: $sc-stock-image-width;
+      .no-image-wrapper {
+        height: $sc-stock-image-height;
+      }
     }
 
     .stock-good-info {
@@ -88,7 +140,6 @@
     }
 
     .stock-location-group {
-      margin-bottom: 20px;
       display: flex;
     }
 
@@ -102,6 +153,11 @@
     .stock-location-right-group {
       display: flex;
       justify-content: flex-end;
+      co-list-of-values ::ng-deep {
+        co-input-text {
+          height: 100%;
+        }
+      }
     }
 
     .stock-button-toolbar {
@@ -128,15 +184,17 @@
     .stock-transfer-right-column {
       display: flex;
       flex-direction: column;
-      width: 25%;
+      width: 35%;
       float: right;
+      gap: 1em;
     }
 
     .stock-transfer-left-column {
       display: flex;
       flex-direction: column;
-      width: 25%;
+      width: 35%;
       float: left;
+      gap: 1em;
     }
 
     .ok-cancel-buttons {
@@ -150,13 +208,36 @@
       width: 100px;
     }
 
+    .stock-transfer {
+      span {
+        font-weight: bold;
+      }
+    }
+
     .stock-transfer-columns {
       display: flex;
       width: $sc-stock-transfer-column-width;
-      justify-content: space-around;
       overflow: hidden;
+      flex-direction: row;
+      gap: 2em;
+      margin: 2em;
+
+      .icon-wrapper {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        height: 100%;
+
+        co-icon {
+          height: 50px;
+          width: 50px;
+        }
+      }
     }
 
+
     .tab-link-buttons {
       cursor: $sc-stock-tab-link-buttons-pointer;
     }
@@ -194,11 +275,11 @@
     }
 
     .stock-label {
-      font-size: 10px;
+      font-size: $sc-font-size-small;
     }
 
     .stock-span {
-      font-size: 12px;
+      font-size: $sc-font-size;
       align-self: center;
     }
   }

package/lib/components/stock/style/_material-definition.scss

@@ -1,4 +1,4 @@
-$sc-stock-info-margin: 10px !default;
+$sc-stock-info-margin: 10px 0 20px 0 !default;
 $sc-stock-info-padding: 0 10px !default;
 $sc-stock-gap: 10px !default;
 $sc-stock-border-left: solid 1px lightgray !default;
@@ -19,6 +19,7 @@ $sc-stock-info-container-height: 100% !default;
 $sc-stock-image-height: 50px !default;
 $sc-stock-grid-height: 300px !default;
 $sc-stock-grid-overflow-y: auto !default;
-$sc-stock-info-width: 90% !default;
+$sc-stock-info-width: 100% !default;
+$sc-stock-info-gap: 30px !default;
 $sc-stock-image-width: 20px !default;
-$sc-stock-transfer-column-width: 600px !default;
+$sc-stock-transfer-column-width: 100% !default;

package/lib/components/tab-bar/style/_layout.scss

@@ -1,29 +1,27 @@
 @include export-module('co-tab-bar') {
   .tab-bar-primary {
-    background-color: #F5F5FC;
-    border-radius: 4px;
-    width: fit-content;
-    margin: 0 auto;
+    background-color: $sc-tab-bar-background-color;
+    border-radius: $sc-tab-bar-border-radius;
+    display: flex;
     font-size: $sc-font-size;
-    height: 23px;
-
+    gap: $sc-tab-bar-gap;
+    padding: $sc-tab-bar-padding;
     button {
-      margin: 0.25rem;
-      padding: 0.125rem;
-      border-radius: 4px;
+      margin: $sc-tab-bar-button-margin;
+      padding: $sc-tab-bar-button-padding;
+      border-radius: $sc-tab-bar-border-radius;
       border: none;
       background-color: transparent;
-      width: 125px;
       cursor: pointer;
       user-select: none;
-      font-size: 10px;
+      font-size: $sc-font-size;
       font-family: $sc-font-family;
 
       span {
-        font-size: 12px;
+        font-size: $sc-font-size;
         text-align: center;
         font-weight: bold;
-        color: #171721;
+        color: $sc-color-font;
       }
 
       &.active {
@@ -33,41 +31,42 @@
   }
 
   .tab-bar {
-    align-self: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    gap: 10px;
   }
 
   .tab-bar-wrapper {
     display: grid;
     grid-template-columns: 15% 70% 15%;
-    margin-left: 20px;
-    margin-right: 20px;
+    margin: 20px 0;
   }
 
   .secondary-tab-bar {
-    background-color: #F5F5FC;
-    border-radius: 4px;
-    width: fit-content;
-    margin: 5px auto 0;
+    background-color: $sc-tab-bar-background-color;
+    border-radius: $sc-tab-bar-border-radius;
+    display: flex;
     font-size: $sc-font-size;
-    height: 23px;
-
+    gap: $sc-tab-bar-gap;
+    padding: $sc-tab-bar-padding;
     button {
-      margin: 0.25rem;
-      padding: 0.125rem;
-      border-radius: 4px;
+      margin: $sc-tab-bar-button-margin;
+      padding: $sc-tab-bar-button-padding;
+      border-radius: $sc-tab-bar-border-radius;
       border: none;
       background-color: transparent;
-      width: 125px;
       cursor: pointer;
       user-select: none;
-      font-size: 10px;
+      font-size: $sc-font-size;
       font-family: $sc-font-family;
 
       span {
-        font-size: 12px;
+        font-size: $sc-font-size;
         text-align: center;
         font-weight: bold;
-        color: #171721;
+        color: $sc-color-font;
       }
 
       &.active {

package/lib/components/tab-bar/style/_material-definition.scss

@@ -0,0 +1,6 @@
+$sc-tab-bar-border-radius: 5px !default;
+$sc-tab-bar-background-color: #F5F5FC !default;
+$sc-tab-bar-gap: 15px !default;
+$sc-tab-bar-padding: 0 15px !default;
+$sc-tab-bar-button-padding: 5px !default;
+$sc-tab-bar-button-margin: 8px !default;

package/lib/service/stock.service.d.ts

@@ -1,3 +1,4 @@
+import { EventEmitter } from "@angular/core";
 import { PrintStockStickers } from "@colijnit/sharedapi/build/model/print-stock-stickers";
 import { GetStockHistoryRequest } from "@colijnit/articleapi/build/model/get-stock-history-request";
 import { ArticleStock as ArticleStockBo } from "@colijnit/articleapi/build/model/article-stock.bo";
@@ -18,6 +19,7 @@ export declare class StockService {
     private _sharedService;
     stockStickers: PrintStockStickers;
     printLayoutParams: SendMethodParams;
+    readonly warehouseSelected: EventEmitter<StockManagementWarehouses>;
     constructor(_sharedService: SharedConnectorService);
     getStockHistory(data: GetStockHistoryRequest): Promise<StockHistoryBo[]>;
     getStockInformation(data: ArticleStock): Promise<ArticleStockBo[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/sharedcomponents",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "private": false,
   "dependencies": {
     "chart.js": "4.3.0",
@@ -12,7 +12,7 @@
     "@colijnit/articleapi": ">=1.0.26",
     "@colijnit/mainapi": ">=1.0.21",
     "@colijnit/corecomponents_v12": ">=12.1.8",
-    "@colijnit/ioneconnector": ">=3.1.0",
+    "@colijnit/ioneconnector": ">=3.1.5",
     "@colijnit/sharedapi": ">=1.0.16",
     "pdf-lib": ">=1.17.1",
     "pdfjs-dist": ">=3.8.162",