@colijnit/sharedcomponents 1.0.52 → 1.0.53

package/fesm2015/colijnit-sharedcomponents.js

@@ -1177,6 +1177,7 @@ class StockComponent {
     set article(articleOrGoodId) {
         if (articleOrGoodId instanceof ArticleExtended) {
             this.articleExtended = articleOrGoodId;
+            this._goodId = articleOrGoodId.goodId;
         }
         else if (typeof articleOrGoodId === "number") {
             this._goodId = articleOrGoodId;
@@ -1187,6 +1188,8 @@ class StockComponent {
         return true;
     }
     ngOnDestroy() {
+        this.articleExtended = undefined;
+        this.articleFlat = undefined;
         this._subscriptions.forEach(subscription => subscription.unsubscribe());
     }
     ngOnInit() {
@@ -1247,13 +1250,15 @@ class StockComponent {
     }
     loadData() {
         if (this.loaded) {
-            let request = new ArticleExtendedRequest();
-            request.goodId = this._goodId;
-            this._stockService.searchArticles(request).then((articleExtended) => {
-                this.articleExtended = articleExtended[0];
-                this._stockService.getArticleFlat(articleExtended[0].articleNumber).then(result => {
-                    this.articleFlat = result;
+            if (this._goodId && !this.articleExtended) {
+                let request = new ArticleExtendedRequest();
+                request.goodId = this._goodId;
+                this._stockService.searchArticles(request).then((articleExtended) => {
+                    this.articleExtended = articleExtended[0];
                 });
+            }
+            this._stockService.getArticleFlat(this.articleExtended.articleNumber).then(result => {
+                this.articleFlat = result;
             });
             this.getArtStockStatus();
             this.getStockManagementWarehouses();
@@ -1379,6 +1384,7 @@ const IconSvg = {
     "bring_forward_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path fill=\"#183153\" d=\"M224 464H448C456.8 464 464 456.8 464 448V224C464 215.2 456.8 208 448 208H384V160H448C483.3 160 512 188.7 512 224V448C512 483.3 483.3 512 448 512H224C188.7 512 160 483.3 160 448V384H208V448C208 456.8 215.2 464 224 464zM64 352C28.65 352 0 323.3 0 288V64C0 28.65 28.65 0 64 0H288C323.3 0 352 28.65 352 64V288C352 323.3 323.3 352 288 352H64z\"/></svg>",
     "check_duotone": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><defs><style>.fa-secondary{opacity:.4}</style></defs><path class=\"fa-primary\" d=\"M438.6 105.4C451.1 117.9 451.1 138.1 438.6 150.6L182.6 406.6C170.1 419.1 149.9 419.1 137.4 406.6L9.372 278.6C-3.124 266.1-3.124 245.9 9.372 233.4C21.87 220.9 42.13 220.9 54.63 233.4L159.1 338.7L393.4 105.4C405.9 92.88 426.1 92.88 438.6 105.4H438.6z\"/></svg>",
     "check_round": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M25,10A15,15,0,1,0,40,25,15,15,0,0,0,25,10ZM23,34l-6.24-9.09,2.81-3.59L23,26.45,27.66,16h5.58Z\" fill=\"#484f60\"/></svg>",
+    "cross_skinny": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><polygon points=\"25.35 5.52 24.65 4.81 15 14.46 5.35 4.81 4.65 5.52 14.29 15.17 4.65 24.81 5.35 25.52 15 15.87 24.65 25.52 25.35 24.81 15.71 15.17 25.35 5.52\" fill=\"#484f60\"/></g></svg>",
     "delete_left_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M432.1 208.1L385.9 256L432.1 303C442.3 312.4 442.3 327.6 432.1 336.1C423.6 346.3 408.4 346.3 399 336.1L352 289.9L304.1 336.1C295.6 346.3 280.4 346.3 271 336.1C261.7 327.6 261.7 312.4 271 303L318.1 256L271 208.1C261.7 199.6 261.7 184.4 271 175C280.4 165.7 295.6 165.7 304.1 175L352 222.1L399 175C408.4 165.7 423.6 165.7 432.1 175C442.3 184.4 442.3 199.6 432.1 208.1V208.1zM512 64C547.3 64 576 92.65 576 128V384C576 419.3 547.3 448 512 448H205.3C188.3 448 172 441.3 160 429.3L9.372 278.6C3.371 272.6 0 264.5 0 256C0 247.5 3.372 239.4 9.372 233.4L160 82.75C172 70.74 188.3 64 205.3 64L512 64zM528 128C528 119.2 520.8 112 512 112H205.3C201 112 196.9 113.7 193.9 116.7L54.63 256L193.9 395.3C196.9 398.3 201 400 205.3 400H512C520.8 400 528 392.8 528 384V128z\"/></svg>",
     "delivery_truck": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><rect x=\"15.35\" y=\"16.56\" width=\"15.14\" height=\"10.94\" transform=\"translate(-1.83 2.08) rotate(-5)\" fill=\"#484f60\"/><path d=\"M38.5,18.1l-6.9.61L32.41,28l-7.63.67a3.76,3.76,0,0,1,1.43,2.25l7.25-.63A3.83,3.83,0,0,1,41,29.6l1-.1-.52-6Zm.29,5.84-3.91.34a.51.51,0,0,1-.55-.46L34,20.1a.49.49,0,0,1,.45-.54l2.27-.2a.5.5,0,0,1,.48.25l2,3.59A.5.5,0,0,1,38.79,23.94Z\" fill=\"#484f60\"/><path d=\"M19.66,29.09a3.8,3.8,0,0,0-1,2.46l-.74.07-1.82-.94L16,29.41Z\" fill=\"#484f60\"/><path d=\"M34.56,30.62a2.74,2.74,0,1,0,2.49-3A2.73,2.73,0,0,0,34.56,30.62Z\" fill=\"#484f60\"/><path d=\"M19.74,31.91a2.74,2.74,0,1,0,2.49-3A2.74,2.74,0,0,0,19.74,31.91Z\" fill=\"#484f60\"/><rect x=\"7.96\" y=\"17.63\" width=\"5\" height=\"1\" transform=\"translate(-1.54 0.98) rotate(-5)\" fill=\"#484f60\"/><rect x=\"11.02\" y=\"29.71\" width=\"3\" height=\"1\" transform=\"translate(-2.59 1.21) rotate(-5)\" fill=\"#484f60\"/><rect x=\"9.48\" y=\"23.53\" width=\"4\" height=\"1\" transform=\"matrix(1, -0.09, 0.09, 1, -2.05, 1.09)\" fill=\"#484f60\"/></svg>",
     "email": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M31.79,38.45A17.82,17.82,0,0,1,23.86,40,13.09,13.09,0,0,1,10.41,26.42C10.41,17.63,16.83,10,26.53,10c7.63,0,13.06,5.21,13.06,12.46,0,6.33-3.53,10.3-8.19,10.3a3.42,3.42,0,0,1-3.71-3.32h-.08A6.5,6.5,0,0,1,22,32.76c-2.75,0-4.82-2.11-4.82-5.65a9.85,9.85,0,0,1,10.13-10,12.89,12.89,0,0,1,5.13,1l-1.3,8c-.43,2.54-.13,3.71,1.08,3.75,1.85.09,4.18-2.28,4.18-7.28,0-5.65-3.62-10-10.3-10S13.73,17.76,13.73,26c0,7.25,4.57,11.3,11,11.3A14.81,14.81,0,0,0,31,36ZM28,20.65a5.34,5.34,0,0,0-1.33-.18c-2.85,0-5.09,2.81-5.09,6.12,0,1.64.73,2.68,2.16,2.68,1.59,0,3.27-2,3.66-4.53Z\" fill=\"#484f60\"/></svg>",
@@ -1462,6 +1468,7 @@ var Icon;
     Icon["BringForwardRegular"] = "bring_forward_regular";
     Icon["CheckDuotone"] = "check_duotone";
     Icon["CheckRound"] = "check_round";
+    Icon["CrossSkinny"] = "cross_skinny";
     Icon["DeleteLeftRegular"] = "delete_left_regular";
     Icon["DeliveryTruck"] = "delivery_truck";
     Icon["Email"] = "email";
@@ -2321,17 +2328,23 @@ SendMethodDialogComponent.decorators = [
     <co-dialog id="sendOptionsDialog" [headerTemplate]="headerTemplate" [footerTemplate]="footerTemplate"
                (closeClick)="closeClick.emit($event)">
       <ng-template #headerTemplate>
-        <div class="co-dialog-header-title" [textContent]="headerTitle"></div>
-      </ng-template>
-      <div class="dialog-content-wrapper">
-        <div class="send-methods-wrapper">
+        <div class="co-dialog-header-title-wrapper">
+          <co-icon [iconData]="iconCacheService.getIcon(icons.EnvelopeRegular)"></co-icon>
+          <div class="co-dialog-header-title" [textContent]="headerTitle"></div>
+        </div>
+        <div class="dialog-navigation-wrapper">
           <div class="send-button-wrapper" *ngFor="let sendMethod of sendMethods; let index = index"
                [class.selected]="activeSendMethod ? sendMethod.code === activeSendMethod.code : index === 0"
                (click)="handleSendMethodClick(sendMethod)">
-            <co-icon class="custom-button-icon" [iconData]="iconCacheService.getIcon(sendMethod.icon)"></co-icon>
             <div class="custom-button-title" [textContent]="sendMethod.description"></div>
           </div>
         </div>
+      </ng-template>
+
+      <div class="dialog-content-wrapper">
+        <div class="send-methods-wrapper">
+
+        </div>
         <div #navigationItems class="send-method-navigation-wrapper" [class.smooth-scrolling]="!startUp">
           <div #faxItems class="send-method-navigation-content co-small-scrollbar">
 
@@ -2364,7 +2377,12 @@ SendMethodDialogComponent.decorators = [
       </div>
       <ng-template #footerTemplate>
         <div class="co-dialog-footer-button-wrapper">
-          <co-button [label]="'Ok'" (click)="okClick.emit(activeSendMethod ? activeSendMethod.code : '0')"></co-button>
+          <co-button class="save-button"
+                     [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
+                     (click)="okClick.emit(activeSendMethod ? activeSendMethod.code : '0')"></co-button>
+          <co-button class="close-button"
+                     [iconData]="iconCacheService.getIcon(icons.CrossSkinny)"
+                     (click)="closeClick.emit($event)"></co-button>
         </div>
       </ng-template>
     </co-dialog>
@@ -2484,7 +2502,9 @@ SendMethodEmailComponent.propDecorators = {
 };
 
 class LayoutSelectionComponent {
-    constructor() {
+    constructor(iconCacheService) {
+        this.iconCacheService = iconCacheService;
+        this.icons = Icon;
         this.layouts = [];
         this.requestChange = new EventEmitter();
         this.showLayoutList = false;
@@ -2495,6 +2515,9 @@ class LayoutSelectionComponent {
     ngOnInit() {
         if (this.layouts && this.layouts.length > 0) {
             this.currentLayout = this.layouts.find(l => l.reportId === this.request.reportId);
+            if (!this.currentLayout) {
+                this.currentLayout = this.layouts[0];
+            }
         }
     }
     handleSelectLayout(reportLayout) {
@@ -2503,6 +2526,9 @@ class LayoutSelectionComponent {
         this.requestChange.emit(this.request);
         this.showLayoutList = false;
     }
+    closeSelectLayout() {
+        this.showLayoutList = false;
+    }
 }
 LayoutSelectionComponent.decorators = [
     { type: Component, args: [{
@@ -2513,6 +2539,15 @@ LayoutSelectionComponent.decorators = [
       <div class="layout-description" [textContent]="currentLayout?.description || 'Layout kiezen'"></div>
     </div>
     <div class="layouts-wrapper co-small-scrollbar" *ngIf="showLayoutList" @showHideLayouts>
+      <div class="layouts-wrapper-header">
+        <div class="title" [textContent]="'Lay-out'"></div>
+        <div class="close-layouts">
+          <div class="dialog-close-button" (click)="closeSelectLayout()">
+            <co-icon [iconData]="iconCacheService.getIcon(icons.XSolid)"></co-icon>
+          </div>
+        </div>
+      </div>
+
       <div class="layout-selection-wrapper" *ngFor="let reportLayout of layouts"
            [class.selected]="reportLayout.reportId === currentLayout?.reportId"
            (click)="handleSelectLayout(reportLayout)">
@@ -2523,7 +2558,7 @@ LayoutSelectionComponent.decorators = [
                 animations: [
                     trigger("showHideLayouts", [
                         state("void", style({ height: 0 })),
-                        state("*", style({ height: "50%" })),
+                        state("*", style({ height: "100%" })),
                         transition("void => *", animate("200ms ease-in-out")),
                         transition("* => void", animate("200ms ease-out"))
                     ])
@@ -2531,6 +2566,9 @@ LayoutSelectionComponent.decorators = [
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
+LayoutSelectionComponent.ctorParameters = () => [
+    { type: IconCacheService }
+];
 LayoutSelectionComponent.propDecorators = {
     request: [{ type: Input }],
     layouts: [{ type: Input }],
@@ -2543,7 +2581,8 @@ class LayoutSelectionModule {
 LayoutSelectionModule.decorators = [
     { type: NgModule, args: [{
                 imports: [
-                    CommonModule
+                    CommonModule,
+                    IconModule
                 ],
                 declarations: [
                     LayoutSelectionComponent
@@ -2648,15 +2687,17 @@ SendMethodPrinterComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-send-method-printer',
                 template: `
-    <co-printer-selection [printers]="printerList"></co-printer-selection>
-    <div class="layout-signature-wrapper">
-      <co-layout-selection
-        [(request)]="sendMethodService.reportingDocumentPrintSignDocBaseRequest"
-        [layouts]="layouts"
-      ></co-layout-selection>
-      <co-signature-button
-        [request]="sendMethodService.reportingDocumentPrintSignDocBaseRequest"
-      ></co-signature-button>
+    <div class="printer-layout-selections-wrapper">
+      <co-printer-selection [printers]="printerList"></co-printer-selection>
+      <div class="layout-signature-wrapper">
+        <co-layout-selection
+          [(request)]="sendMethodService.reportingDocumentPrintSignDocBaseRequest"
+          [layouts]="layouts"
+        ></co-layout-selection>
+        <co-signature-button
+          [request]="sendMethodService.reportingDocumentPrintSignDocBaseRequest"
+        ></co-signature-button>
+      </div>
     </div>
     <co-input-checkbox
       [model]="sendMethodService.reportingDocumentPrintSignDocBaseRequest.saveDefaultPrinterForUser"
@@ -2707,6 +2748,9 @@ class PrinterSelectionComponent {
         this.sendMethodService.reportingDocumentPrintSignDocBaseRequestChanged.next(this.sendMethodService.reportingDocumentPrintSignDocBaseRequest);
         this.showPrinterList = false;
     }
+    closePrinterClicked() {
+        this.showPrinterList = false;
+    }
 }
 PrinterSelectionComponent.decorators = [
     { type: Component, args: [{
@@ -2717,6 +2761,14 @@ PrinterSelectionComponent.decorators = [
       <div class="printer-name" [textContent]="sendMethodService.reportingDocumentPrintSignDocBaseRequest.printerName || 'Printer kiezen'"></div>
     </div>
     <div class="layouts-wrapper co-small-scrollbar" *ngIf="showPrinterList" @showHideLayouts>
+      <div class="layouts-wrapper-header">
+        <div class="title" [textContent]="'Printer'"></div>
+        <div class="close-layouts">
+          <div class="dialog-close-button" (click)="closePrinterClicked()">
+            <co-icon [iconData]="iconService.getIcon(icons.XSolid)"></co-icon>
+          </div>
+        </div>
+      </div>
       <div class="printer-list-item" *ngFor="let printer of printers"
            [class.selected]="sendMethodService.reportingDocumentPrintSignDocBaseRequest.printerName === printer.name"
            (click)="handlePrinterClicked(printer)">
@@ -2731,7 +2783,7 @@ PrinterSelectionComponent.decorators = [
                 animations: [
                     trigger('showHideLayouts', [
                         state('void', style({ height: 0 })),
-                        state('*', style({ height: '50%' })),
+                        state('*', style({ height: '100%' })),
                         transition('void => *', animate('200ms ease-in-out')),
                         transition('* => void', animate('200ms ease-out'))
                     ])
@@ -3398,6 +3450,14 @@ StockLocationComponent.decorators = [
                       (keydown.enter)="onOkClickSendLocations()"
 
       >
+        <co-simple-grid-column [headerText]="'STOCK' | localize" [field]="'amountInStock'">
+          <ng-template #editTemplate let-row="row">
+            <co-input-text [(model)]="row['amountInStock']"
+                           [label]="'STOCK' | localize"
+                           (modelChange)="amountInStockChanged($event)"
+            ></co-input-text>
+          </ng-template>
+        </co-simple-grid-column>
         <co-simple-grid-column *ngIf="articleFlat?.locationRegistered" [headerText]="'LOCATION' | localize" [field]="'locationNo'">
           <ng-template #editTemplate let-row="row">
             <co-list-of-values
@@ -3427,14 +3487,6 @@ StockLocationComponent.decorators = [
             ></co-input-text>
           </ng-template>
         </co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'STOCK' | localize" [field]="'amountInStock'">
-          <ng-template #editTemplate let-row="row">
-            <co-input-text [(model)]="row['amountInStock']"
-                           [label]="'STOCK' | localize"
-                           (modelChange)="amountInStockChanged($event)"
-            ></co-input-text>
-          </ng-template>
-        </co-simple-grid-column>
         <co-simple-grid-column [headerText]="'ALLOCATED' | localize" [field]="'stockAssigned'">
           <ng-template #editTemplate let-row="row">
             <span [textContent]="row['stockAssigned']"></span>
@@ -6684,7 +6736,7 @@ SimpleTagsComponent.decorators = [
       </ng-template>
 
       <div class="dialog-content-wrapper">
-        <div class="collection-navigation">
+        <div class="collection-navigation co-small-scrollbar">
           <span class="title" [textContent]="'Beschikbare tags'"></span>
           <co-input-search
             [(model)]="searchString"
@@ -6764,17 +6816,15 @@ SimpleTagsComponent.decorators = [
 
       <ng-template #footerTemplate>
         <div class="co-dialog-footer-button-wrapper">
-          <div class="commit-button-wrapper">
-            <co-button
-              [iconData]="iconCacheService.getIcon(icon.CheckDuotone)"
-              (click)="handleSaveTags()"
-            ></co-button>
-            <co-button
-              class="cancel-button"
-              [iconData]="iconCacheService.getIcon(icon.XSolid)"
-              (click)="closeClick.next()"
-            ></co-button>
-          </div>
+          <co-button class="save-button"
+            [iconData]="iconCacheService.getIcon(icon.CheckDuotone)"
+            (click)="handleSaveTags()"
+          ></co-button>
+          <co-button
+            class="close-button"
+            [iconData]="iconCacheService.getIcon(icon.CrossSkinny)"
+            (click)="closeClick.next()"
+          ></co-button>
         </div>
       </ng-template>
     </co-dialog>