@colijnit/sharedcomponents 1.0.63 → 1.0.65

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

@@ -0,0 +1,41 @@
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from "@angular/core";
+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 { ArticleStockManagement } from "@colijnit/articleapi/build/model/article-stock-management";
+import { ArticleDetailsBo } from "@colijnit/articleapi/build/model/article-details.bo";
+import { StockStatus } from "@colijnit/articleapi/build/model/stock-status.bo";
+import { ArticleFlat } from "@colijnit/articleapi/build/model/article-flat.bo";
+import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
+export declare class StockLocationPopupComponent implements OnInit, OnDestroy {
+    iconCacheService: IconCacheService;
+    private _stockService;
+    private _changeDetector;
+    readonly icons: typeof Icon;
+    showConfirmationDialog: boolean;
+    newStockLine: boolean;
+    selectedArticleDetailsData: ArticleDetailsBo;
+    articleFlat: ArticleFlat;
+    articleDetailsInformation: ArticleStockManagement;
+    selectedWarehouse: StockManagementWarehouses;
+    selectedLocationNo: string;
+    articleStockInfo: ArticleDetailsBo[];
+    togglePopupEvent: EventEmitter<boolean>;
+    stockLocations: StockLocation[];
+    stockStatus: StockStatus[];
+    constructor(iconCacheService: IconCacheService, _stockService: StockService, _changeDetector: ChangeDetectorRef);
+    ngOnInit(): void;
+    statusForId(id: number): StockStatus;
+    handleStockStatusChange(status: StockStatus): void;
+    handleStockStatusRemarkChange(remark: string): void;
+    amountInStockChanged(data: any): void;
+    disabled(): boolean;
+    handleOkClick(): void;
+    ngOnDestroy(): void;
+    togglePopup(): void;
+    getStockLocations(): void;
+    locationForNumber(number: string): StockLocation;
+    locationChanged(event: StockLocation): void;
+    handleStockChange(): void;
+}

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

@@ -26,6 +26,7 @@ export declare class StockLocationComponent implements OnInit, OnDestroy {
     selectedWarehouse: StockManagementWarehouses;
     articleDetails: ArticleDetailsBo;
     showConfirmationDialog: boolean;
+    newStockLine: boolean;
     showConfirmStockRow: boolean;
     articleDetailsInformation: ArticleStockManagement;
     stockLocations: StockLocation[];
@@ -41,7 +42,8 @@ export declare class StockLocationComponent implements OnInit, OnDestroy {
     amountInStockChanged(data: any): void;
     openSendMethodDialog(data: any): void;
     handleStockTransferClick(event: any): void;
-    onOkClickSendLocations(): void;
+    onOkClickSendLocations(row: ArticleDetailsBo): void;
+    handleAddRow(): void;
     handleOkClick(): void;
     handleStockStatusChange(status: StockStatus): void;
     handleStockStatusRemarkChange(remark: string): void;

package/lib/components/stock/localization/translation.d.ts

@@ -6,12 +6,14 @@ export declare class Translation {
     AMOUNT_AVAILABLE?: string;
     AMOUNT_IN_STOCK?: string;
     AMOUNT_LATER_AVAILABLE?: string;
+    ARTICLE_NUMBER?: string;
     AVAILABILITY?: string;
     AVAILABLE_STOCK?: string;
     BACK_TO_STOCK_LINES?: string;
     BATCH?: string;
     BATCH_NO?: string;
     CANCEL?: string;
+    CHANGE_STOCK_LINE?: string;
     CHOICES?: string;
     CONFIRM_STOCK_CHANGE?: string;
     CUSTOMER?: string;
@@ -32,7 +34,9 @@ export declare class Translation {
     MUTATION_DATE?: string;
     MUTATION_TIME?: string;
     MUTATION_TYPE?: string;
+    NEW_STOCK_LINE?: string;
     OK?: string;
+    OPEN_DETAILS?: string;
     ORDER?: string;
     ORDER_COMMISSION?: string;
     ORDER_STOCK?: string;

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

@@ -13,6 +13,7 @@ import { ArticleDetailsBo } from "@colijnit/articleapi/build/model/article-detai
 import { LocalizeService } from '../../../localization/localize.service';
 import { ArticleExtended } from "@colijnit/articleapi/build/model/article-extended.bo";
 import { ArticleFlat } from "@colijnit/articleapi/build/model/article-flat.bo";
+import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
 export declare class StockTabsComponent implements OnInit {
     private _stockService;
     private _localizeService;
@@ -24,6 +25,7 @@ export declare class StockTabsComponent implements OnInit {
     warehouses: StockManagementWarehouses[];
     readonly transferIconClicked: EventEmitter<ArticleStockBo>;
     readonly sendMethodDialogClicked: EventEmitter<PrintPriceStickers>;
+    stockLocations: StockLocation[];
     selectedLocationNo: string;
     stockHistory: StockHistoryBo[];
     orderSupplyStockHistory: StockHistoryBo[];
@@ -51,6 +53,7 @@ export declare class StockTabsComponent implements OnInit {
     getOrderData(): void;
     getStockPrognose(warehouseNo: number): void;
     handleWarehouseSelected(event: StockManagementWarehouses): void;
+    getStockLocations(): void;
     getStockData(warehouse: StockManagementWarehouses): void;
     wareHouseForCode(code: number): StockManagementWarehouses;
 }

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

@@ -4,31 +4,47 @@
       co-dialog {
         .co-dialog-wrapper {
           width: 500px;
-          height: 350px;
           display: flex;
         }
-
+        .stock-dialog-header {
+          font-weight: bold;
+          margin-bottom: 10px;
+          display: block;
+        }
         .header-wrapper {
           span {
             font-weight: bold;
           }
-
           padding: 1em;
         }
-
         .dialog-wrapper {
           display: flex;
-          gap: 1em;
-          padding: 1em;
+          gap: 5px;
+          padding: 10px;
           flex-direction: column;
         }
+        .stock-dialog-row {
+          display: flex;
+          align-items: center;
+          gap: 5px;
+          > * {
+            flex: 1;
+          }
+          .stock-dialog-row-row {
+            display: flex;
+            align-items: center;
+            gap: 5px;
+          }
+        }
       }
     }
 
     .stock-info-container {
-      max-width: $sc-stock-info-container-width;
+      max-width: $sc-stock-info-container-max-width;
+      width: $sc-stock-info-container-width;
       padding: $sc-stock-info-container-padding;
       height: $sc-stock-info-container-height;
+      position: relative;
     }
 
     .stock-info {
@@ -37,6 +53,9 @@
       display: inline-flex;
       width: $sc-stock-info-width;
       gap: $sc-stock-info-gap;
+      border-width: $sc-stock-info-border-width;
+      border-color: $sc-stock-info-border-color;
+      border-style: solid;
     }
 
     .stock-info-row {
@@ -51,7 +70,9 @@
     .stock-image {
       height: $sc-stock-image-height;
       margin-right: $sc-stock-image-width;
-
+      .stock-image {
+        margin-right: 0;
+      }
       .no-image-wrapper {
         height: $sc-stock-image-height;
       }
@@ -63,11 +84,22 @@
 
     .stock-status {
       display: grid;
+      position: relative;
     }
 
     .stock-info > div:not(:first-child) {
-      padding: 0 10px;
+      padding: 0 0 0 30px;
       border-left: $sc-stock-border-left;
+      &:before {
+        content: '';
+        height: 30px;
+        width: 1px;
+        background: #DCE4EA;
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+      }
     }
 
     .stock-line {
@@ -331,6 +363,7 @@
         .co-button {
           height: 30px;
           padding: 0 10px;
+          background-color: #1A73E8;
           .co-icon {
             height: 16px;
             width: 16px;
@@ -340,6 +373,7 @@
           }
           .label {
             margin: 0 7px;
+            color: #FFF;
           }
         }
       }
@@ -370,11 +404,35 @@
     .simple-grid {
       height: $sc-stock-grid-height;
       overflow: auto;
+      .co-grid-toolbar {
+        .co-icon {
+          border-color: #1A73E8;
+          width: 38px;
+          height: 28px;
+          padding: 5px;
+          border-radius: 0;
+          svg {
+            fill: #1A73E8;
+            height: auto;
+            width: auto;
+          }
+          &:hover {
+            background: #1A73E8;
+            svg {
+              fill: #FFF;
+            }
+          }
+        }
+      }
     }
 
     .location-link {
       cursor: pointer;
-      color: $sc-color-action;
+      padding: 7px 10px;
+      text-align: center;
+      color: #FFFFFF;
+      background: $sc-color-action;
+      border-radius: 3px;
     }
 
     .co-dialog-wrapper {
@@ -383,6 +441,7 @@
 
     .stock-label {
       font-size: $sc-font-size-small;
+      align-self: center;
     }
 
     .stock-span {
@@ -417,5 +476,44 @@
       }
     }
 
-  }
+      .simple-grid-column-header {
+        border-width: 0;
+      }
+      .simple-grid-row {
+        border-width: 0;
+        border: none;
+        height: 45px;
+        font-size: 10px;
+        &:nth-child(odd) {
+          background: #f8f8fa;
+        }
+      }
+      .simple-grid-column-cell-field {
+        border-width: 1px;
+        border-radius: 0;
+        padding: 5px 10px;
+        border-color: #DCE4EA;
+      }
+      .simple-grid-column-header-label {
+        border-width: 0 0 1px 0;
+      }
+      .co-simple-grid-cell {
+        .menu-icon {
+          cursor: pointer;
+          width: 24px;
+          height: 24px;
+        }
+        .stock-amount {
+          display: flex;
+          gap: 10px;
+          align-items: center;
+          cursor: pointer;
+          .menu-icon {
+            width: 14px;
+            height: 14px;
+          }
+        }
+      }
+    }
+
 }

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

@@ -1,7 +1,9 @@
 $sc-stock-info-margin: 10px 0 20px 0 !default;
-$sc-stock-info-padding: 0 10px !default;
+$sc-stock-info-padding: 15px 10px !default;
+$sc-stock-info-border-width: 1px 0 !default;
+$sc-stock-info-border-color: #CCCCCC !default;
 $sc-stock-gap: 10px !default;
-$sc-stock-border-left: solid 1px lightgray !default;
+$sc-stock-border-left: none !default;
 $sc-stock-line-margin: 10px 0 20px 0 !default;
 $sc-stock-line-font-weight: bold !default;
 $sc-stock-simple-grid-header-fontsize: 14px !default;
@@ -13,8 +15,9 @@ $sc-stock-tab-link-buttons-active-color: $sc-color-action !default;
 $sc-stock-tab-link-buttons-pointer: pointer !default;
 $sc-stock-grid-margin: 0 0 0 0 !default;
 $sc-stock-simple-grid-column-header-wrapper-border-bottom: 1px solid black !default;
-$sc-stock-info-container-width: 100% !default;
-$sc-stock-info-container-padding: 0px !default;
+$sc-stock-info-container-max-width: 100% !default;
+$sc-stock-info-container-width: 1000px !default;
+$sc-stock-info-container-padding: 30px 0 0 0 !default;
 $sc-stock-info-container-height: 100% !default;
 $sc-stock-image-height: 50px !default;
 $sc-stock-grid-height: 300px !default;

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

@@ -6,6 +6,9 @@
     font-size: $sc-font-size;
     gap: $sc-tab-bar-gap;
     padding: $sc-tab-bar-padding;
+    position: absolute;
+    top: 10px;
+    left: 0;
     button {
       margin: $sc-tab-bar-button-margin;
       padding: $sc-tab-bar-button-padding;
@@ -16,7 +19,7 @@
       user-select: none;
       font-size: $sc-font-size;
       font-family: $sc-font-family;
-
+      border-bottom: 2px solid transparent;
       span {
         font-size: $sc-font-size;
         text-align: center;
@@ -26,6 +29,7 @@
 
       &.active {
         background-color: white;
+        border-bottom: 2px solid #1A73E8;
       }
     }
   }
@@ -41,7 +45,7 @@
   .tab-bar-wrapper {
     display: grid;
     grid-template-columns: 15% 70% 15%;
-    margin: 20px 0;
+    margin: 5px 0;
   }
 
   .secondary-tab-bar {
@@ -61,7 +65,7 @@
       user-select: none;
       font-size: $sc-font-size;
       font-family: $sc-font-family;
-
+      border-bottom: 2px solid transparent;
       span {
         font-size: $sc-font-size;
         text-align: center;
@@ -71,6 +75,7 @@
 
       &.active {
         background-color: white;
+        border-bottom: 2px solid #1A73E8;
       }
     }
   }

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

@@ -1,6 +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;
+$sc-tab-bar-border-radius: 0 !default;
+$sc-tab-bar-background-color: transparent !default;
+$sc-tab-bar-gap: 25px !default;
+$sc-tab-bar-padding: 0 !default;
+$sc-tab-bar-button-padding: 5px 0 9px 0 !default;
+$sc-tab-bar-button-margin: 0 !default;

package/lib/enum/icon.enum.d.ts

@@ -20,6 +20,7 @@ export declare enum Icon {
     DeleteLeftRegular = "delete_left_regular",
     DeliveryTruck = "delivery_truck",
     Dropzone = "dropzone",
+    EditPenRegular = "edit_pen_regular",
     Email = "email",
     EnvelopeRegular = "envelope_regular",
     EyeRegular = "eye_regular",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/sharedcomponents",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "private": false,
   "dependencies": {
     "chart.js": "4.3.0",
@@ -9,11 +9,11 @@
   "peerDependencies": {
     "@angular/common": ">=12.2.0",
     "@angular/core": ">=12.2.0",
-    "@colijnit/articleapi": ">=1.0.38",
-    "@colijnit/mainapi": ">=1.0.36",
-    "@colijnit/corecomponents_v12": ">=12.2.24",
-    "@colijnit/ioneconnector": ">=3.1.23",
-    "@colijnit/sharedapi": ">=1.0.19",
+    "@colijnit/articleapi": ">=1.0.39",
+    "@colijnit/mainapi": ">=1.0.38",
+    "@colijnit/corecomponents_v12": ">=12.2.26",
+    "@colijnit/ioneconnector": ">=3.1.24",
+    "@colijnit/sharedapi": ">=1.0.20",
     "pdf-lib": ">=1.17.1",
     "pdfjs-dist": ">=3.8.162",
     "rxjs": ">=7.4.0",