@colijnit/sharedcomponents 1.0.21 → 1.0.22

package/fesm2015/colijnit-sharedcomponents.js

@@ -8,6 +8,7 @@ import pdfjsWorker from 'pdfjs-dist/build/pdf.worker.entry';
 import { CommonModule } from '@angular/common';
 import SignaturePad from 'signature_pad';
 import { PrintStockStickers } from '@colijnit/sharedapi/build/model/print-stock-stickers';
+import { PrintPriceStickers } from '@colijnit/sharedapi/build/model/print-price-stickers.bo';
 import { Articles } from '@colijnit/articleapi/build/articles';
 import { Sharedapi } from '@colijnit/sharedapi/build/sharedapi';
 import { Printer } from '@colijnit/sharedapi/build/model/report/printer.bo';
@@ -33,7 +34,6 @@ import { StockManagementWarehouses } from '@colijnit/articleapi/build/model/stoc
 import { StockLocation } from '@colijnit/articleapi/build/model/stock-location.bo';
 import { ArticleTransaction } from '@colijnit/articleapi/build/model/article-transaction.bo';
 import { BehaviorSubject } from 'rxjs';
-import { PrintPriceStickers } from '@colijnit/sharedapi/build/model/print-price-stickers.bo';
 import { GetStockHistoryRequest } from '@colijnit/articleapi/build/model/get-stock-history-request';
 import { ArticleStock as ArticleStock$1 } from '@colijnit/articleapi/build/model/article-stock';
 import { CoDialogPromptModule, InputCheckboxModule, InputComboBoxModule, IconModule, InputNumberPickerModule, CoDialogWizardModule, ButtonModule, CoGridModule, InputRadioButtonModule, DropDownModule, SimpleGridModule, ImageModule, InputTextModule, InputTextareaModule } from '@colijnit/corecomponents_v12';
@@ -1276,9 +1276,10 @@ class SharedConnectorService {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.connector = new Articles(this._optionsService.options);
+            this.articleConnector = new Articles(this._optionsService.options);
             this.sharedConnector = new Sharedapi(this._optionsService.options);
-            this._optionsService.options.session = this.connector.session && this.sharedConnector.session;
+            console.log(this.articleConnector);
+            console.log(this.sharedConnector);
         });
     }
     getAllPrinters(showAll = true) {
@@ -1345,7 +1346,7 @@ class SharedConnectorService {
     getArticleFullObject(goodId) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getArticleFullObject(goodId).then((result) => {
+                return this.articleConnector.getArticleFullObject(goodId).then((result) => {
                     // if (result.validationResult && result.validationResult.success) {
                     //   if (result.resultObject) {
                     //     resolve(this._boFactory.makeWithRawBackendData(ArticleExtended, result.resultObject));
@@ -1360,7 +1361,7 @@ class SharedConnectorService {
     getStockHistory(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getStockHistory(request).then((result) => {
+                return this.articleConnector.getStockHistory(request).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObject && result.resultObject.hasOwnProperty("stockHistory")) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(StockHistoryBo, result.resultObject.stockHistory));
@@ -1376,7 +1377,7 @@ class SharedConnectorService {
     getStockInformation(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getStockInformation(data).then((result) => {
+                return this.articleConnector.getStockInformation(data).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(ArticleStock, result.resultObjects));
@@ -1392,7 +1393,7 @@ class SharedConnectorService {
     getStockManagementWarehouses() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getStockManagementWarehouses().then((result) => {
+                return this.articleConnector.getStockManagementWarehouses().then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(StockManagementWarehouses, result.resultObjects));
@@ -1408,7 +1409,7 @@ class SharedConnectorService {
     getStockManagementLocations(warehouseNo) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getStockManagementLocations(warehouseNo).then((result) => {
+                return this.articleConnector.getStockManagementLocations(warehouseNo).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(StockLocation, result.resultObjects));
@@ -1424,7 +1425,7 @@ class SharedConnectorService {
     getArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getArticleDetails(data).then((result) => {
+                return this.articleConnector.getArticleDetails(data).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(ArticleDetailsBo, result.resultObjects));
@@ -1440,7 +1441,7 @@ class SharedConnectorService {
     updateArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.updateArticleDetails(data).then((result) => __awaiter(this, void 0, void 0, function* () {
+                return this.articleConnector.updateArticleDetails(data).then((result) => __awaiter(this, void 0, void 0, function* () {
                     if (result.validationResult && result.validationResult.success) {
                         yield this.commit();
                         resolve(true);
@@ -1455,7 +1456,7 @@ class SharedConnectorService {
     lockArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.lockArticleDetails(data).then((result) => __awaiter(this, void 0, void 0, function* () {
+                return this.articleConnector.lockArticleDetails(data).then((result) => __awaiter(this, void 0, void 0, function* () {
                     if (result.validationResult && result.validationResult.success) {
                         yield this.commit();
                         resolve(true);
@@ -1470,7 +1471,7 @@ class SharedConnectorService {
     getStockStatus() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getStockState().then((result) => {
+                return this.articleConnector.getStockState().then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(StockStatus, result.resultObjects));
@@ -1502,7 +1503,7 @@ class SharedConnectorService {
     getArticleTransaction(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.getArticleTransaction(data).then((result) => {
+                return this.articleConnector.getArticleTransaction(data).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         if (result.resultObjects) {
                             resolve(this._boFactory.makeBOArrayFromRawBackendDataArray(ArticleTransaction, result.resultObjects));
@@ -1516,7 +1517,7 @@ class SharedConnectorService {
         });
     }
     commit() {
-        return this.connector.commit();
+        return this.articleConnector.commit();
     }
 }
 SharedConnectorService.ɵprov = i0.ɵɵdefineInjectable({ factory: function SharedConnectorService_Factory() { return new SharedConnectorService(i0.ɵɵinject(OptionsService)); }, token: SharedConnectorService, providedIn: "root" });
@@ -1529,58 +1530,35 @@ SharedConnectorService.ctorParameters = () => [
     { type: OptionsService }
 ];
 
-class SharedService {
-    constructor(options, connector) {
-        this.options = options;
-        this.connector = connector;
-    }
-    init(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.options.initialize(options);
-            this.connector.connect();
-        });
-    }
-}
-SharedService.ɵprov = i0.ɵɵdefineInjectable({ factory: function SharedService_Factory() { return new SharedService(i0.ɵɵinject(OptionsService), i0.ɵɵinject(SharedConnectorService)); }, token: SharedService, providedIn: "root" });
-SharedService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: "root"
-            },] }
-];
-SharedService.ctorParameters = () => [
-    { type: OptionsService },
-    { type: SharedConnectorService }
-];
-
-class StockService extends SharedService {
-    constructor() {
-        super(...arguments);
+class StockService {
+    constructor(_sharedService) {
+        this._sharedService = _sharedService;
         this.printSticker = new PrintStockStickers();
         this.printPriceSticker = new PrintPriceStickers();
     }
     getPrintStockStickers(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.connector.getPrintStockStickers(data);
+            yield this._sharedService.getPrintStockStickers(data);
         });
     }
     getPrintPriceStickers(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.connector.getPrintPriceStickers(data);
+            yield this._sharedService.getPrintPriceStickers(data);
         });
     }
     getAllPrinters(showAll = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getAllPrinters(showAll);
+            return yield this._sharedService.getAllPrinters(showAll);
         });
     }
     getStockHistory(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockHistory(data);
+            return yield this._sharedService.getStockHistory(data);
         });
     }
     getStockInformation(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockInformation(data);
+            return yield this._sharedService.getStockInformation(data);
         });
     }
     // public async getStockStickerPrintLayouts(data: StockStickersPrintLayouts): Promise<StockStickersPrintLayouts[]> {
@@ -1588,78 +1566,72 @@ class StockService extends SharedService {
     // }
     getArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getArticleDetails(data);
+            return yield this._sharedService.getArticleDetails(data);
         });
     }
     updateArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.updateArticleDetails(data);
+            return yield this._sharedService.updateArticleDetails(data);
         });
     }
     getStockState() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockStatus();
+            return yield this._sharedService.getStockStatus();
         });
     }
     getStockStickerTemplates(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockStickerTemplates(data);
+            return yield this._sharedService.getStockStickerTemplates(data);
         });
     }
     getStockManagementWarehouses() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockManagementWarehouses();
+            return yield this._sharedService.getStockManagementWarehouses();
         });
     }
     getStockManagementLocations(warehouseNo) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getStockManagementLocations(warehouseNo);
+            return yield this._sharedService.getStockManagementLocations(warehouseNo);
         });
     }
     getArticleTransaction(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getArticleTransaction(data);
+            return yield this._sharedService.getArticleTransaction(data);
         });
     }
     lockArticleDetails(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.lockArticleDetails(data);
+            return yield this._sharedService.lockArticleDetails(data);
         });
     }
     commit() {
-        return this.connector.commit();
+        return this._sharedService.commit();
     }
 }
-StockService.ɵprov = i0.ɵɵdefineInjectable({ factory: function StockService_Factory() { return new StockService(i0.ɵɵinject(OptionsService), i0.ɵɵinject(SharedConnectorService)); }, token: StockService, providedIn: "root" });
+StockService.ɵprov = i0.ɵɵdefineInjectable({ factory: function StockService_Factory() { return new StockService(i0.ɵɵinject(SharedConnectorService)); }, token: StockService, providedIn: "root" });
 StockService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
+];
+StockService.ctorParameters = () => [
+    { type: SharedConnectorService }
 ];
 
 class StockComponent {
-    constructor(stockService, _optionsService) {
+    constructor(stockService, _optionsService, _dictionary, _changeDetector) {
         this.stockService = stockService;
         this._optionsService = _optionsService;
+        this._dictionary = _dictionary;
+        this._changeDetector = _changeDetector;
         this.handleStickerClicked = new EventEmitter();
         this.showStockInformationGrid = true;
         this.showStockLocation = false;
         this.showStockTransfer = false;
         this.allAvailableStock = 0;
         this.allTechnicalStock = 0;
-        this._publicOptions = true;
-    }
-    set options(value) {
-        if (value) {
-            if (typeof value === "string") {
-                this._options = JSON.parse(value);
-            }
-            else {
-                this._options = value;
-            }
-            this._publicOptions = true;
-            this._optionsService.initialize(this._options).then();
-        }
+        this._subscriptions = [];
+        this._subscriptions.push(this._optionsService.optionsLoaded.subscribe(loaded => this._handleSettingsLoaded(loaded)));
     }
     set article(article) {
         this.articleExtended = article;
@@ -1669,6 +1641,9 @@ class StockComponent {
     showClass() {
         return true;
     }
+    ngOnDestroy() {
+        this._subscriptions.forEach(subscription => subscription.unsubscribe());
+    }
     backToStockLinesClicked() {
         this.showStockLocation = false;
         this.showStockInformationGrid = true;
@@ -1701,6 +1676,25 @@ class StockComponent {
             this.stockInformation.forEach((articleStock) => this.allTechnicalStock += articleStock.technicalStock);
         });
     }
+    _handleSettingsLoaded(loaded) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (loaded) {
+                yield this._initConnection().then();
+            }
+        });
+    }
+    _initConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // await this._connector.connect(this._optionsService.options);
+            if (this._optionsService.options.url) {
+                this._dictionary.rootUrl = this._optionsService.options.url.replace("/ajaxservice", "");
+            }
+            yield this._dictionary.setDictionary(this._optionsService.options.languageCode);
+            setTimeout(() => {
+                this._changeDetector.detectChanges();
+            });
+        });
+    }
 }
 StockComponent.decorators = [
     { type: Component, args: [{
@@ -1743,12 +1737,13 @@ StockComponent.decorators = [
 ];
 StockComponent.ctorParameters = () => [
     { type: StockService },
-    { type: OptionsService }
+    { type: OptionsService },
+    { type: DictionaryService },
+    { type: ChangeDetectorRef }
 ];
 StockComponent.propDecorators = {
     stock: [{ type: ViewChild, args: [StockComponent,] }],
     handleStickerClicked: [{ type: Output }],
-    options: [{ type: Input }],
     article: [{ type: Input }],
     articleWarehouse: [{ type: Input }],
     allWarehouses: [{ type: Input }],
@@ -2050,6 +2045,7 @@ StockInformationGridComponent.decorators = [
                       [showToolbar]="true"
                       (addRow)="addNewRow()"
                       [inlineEdit]="true"
+                      [rowsPerPage]="20"
       >
           <co-simple-grid-column [headerText]="'WAREHOUSE'" [field]="'warehouseNo'" [order]="10"></co-simple-grid-column>
           <co-simple-grid-column [headerText]="'DESCRIPTION'" [field]="'warehouseName'" [order]="11"></co-simple-grid-column>
@@ -2066,6 +2062,7 @@ StockInformationGridComponent.decorators = [
       <co-simple-grid *ngIf="activeTab === tabs[1]"
                       [data]="inOrderInformation"
                       class="simple-grid"
+                      [rowsPerPage]="20"
       >
         <co-simple-grid-column [headerText]="'IN_ORDER2'" [field]="'transactionNr'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'CUSTOMER'" [field]="'user'"></co-simple-grid-column>
@@ -2089,6 +2086,7 @@ StockInformationGridComponent.decorators = [
       <co-simple-grid *ngIf="activeTab === tabs[2]"
                       [data]="orderInformation"
                       class="simple-grid"
+                      [rowsPerPage]="20"
       >
         <co-simple-grid-column [headerText]="'PURCHASE_ORDER_NR'" [field]="'transactionNr'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'DATE'" [field]="'transactionDate'"></co-simple-grid-column>
@@ -2119,6 +2117,7 @@ StockInformationGridComponent.decorators = [
 <!--      TODO move to own component stock-location-->
       <co-simple-grid [data]="articleDetails"
                       class="simple-grid"
+                      [rowsPerPage]="20"
       >
         <div class="stock-location-group">
           <div class="stock-location-left-group">
@@ -2166,6 +2165,7 @@ StockInformationGridComponent.decorators = [
       </div>
       <co-simple-grid [data]="stockHistoryInformation"
                       class="simple-grid"
+                      [rowsPerPage]="20"
       >
         <co-simple-grid-column [headerText]="'MUTATION_DATE'" [field]="'mutationDate'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'MUTATION_TIME'" [field]="'mutationTime'"></co-simple-grid-column>
@@ -2191,7 +2191,7 @@ StockInformationGridComponent.decorators = [
 
     <div class="stock-button-toolbar">
       <div class="stock-button-left-group">
-        <co-button [label]="'HISTORY'" (click)="handleHistoryClick()"></co-button>
+        <co-button *ngIf="activeTab === tabs[0]" [label]="'HISTORY'" (click)="handleHistoryClick()"></co-button>
       </div>
       <div class="stock-button-middle-group">
         <div class="button-left">
@@ -2462,24 +2462,8 @@ class SendMethodDialogComponent {
         this.startSignatureClicked = new EventEmitter();
         this.printButtonClicked = new EventEmitter();
         this._subscriptions = [];
-        this._publicOptions = true;
         this._subscriptions.push(this._optionsService.optionsLoaded.subscribe(loaded => this._handleSettingsLoaded(loaded)));
     }
-    set options(value) {
-        if (value) {
-            if (typeof value === "string") {
-                this._options = JSON.parse(value);
-            }
-            else {
-                this._options = value;
-            }
-            this._publicOptions = true;
-            this._optionsService.initialize(this._options).then();
-        }
-    }
-    get options() {
-        return this._options;
-    }
     set articleData(data) {
         this.stockService.printSticker.goodId = data.goodId;
         this.stockService.printSticker.warehouse = data.warehouseNo;
@@ -2725,7 +2709,6 @@ SendMethodDialogComponent.propDecorators = {
     showPrintPriceStickers: [{ type: Input }],
     showPrintStockStickers: [{ type: Input }],
     priceListCodeData: [{ type: Input }],
-    options: [{ type: Input }],
     showDialog: [{ type: Input }],
     headerTitle: [{ type: Input }],
     printerList: [{ type: Input }],
@@ -2858,8 +2841,7 @@ StockModule.decorators = [
                     StockComponent
                 ],
                 providers: [
-                    StockService,
-                    SharedConnectorService
+                    StockService
                 ]
             },] }
 ];
@@ -3187,6 +3169,29 @@ LayoutSwitcherModule.decorators = [
             },] }
 ];
 
+class SharedService {
+    constructor(options, connector) {
+        this.options = options;
+        this.connector = connector;
+    }
+    init(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.options.initialize(options);
+            this.connector.connect();
+        });
+    }
+}
+SharedService.ɵprov = i0.ɵɵdefineInjectable({ factory: function SharedService_Factory() { return new SharedService(i0.ɵɵinject(OptionsService), i0.ɵɵinject(SharedConnectorService)); }, token: SharedService, providedIn: "root" });
+SharedService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: "root"
+            },] }
+];
+SharedService.ctorParameters = () => [
+    { type: OptionsService },
+    { type: SharedConnectorService }
+];
+
 /*
  * Public API Surface of sharedcomponents
  */
@@ -3195,5 +3200,5 @@ LayoutSwitcherModule.decorators = [
  * Generated bundle index. Do not edit.
  */
 
-export { DocsignComponent, DocsignModule, KeyPadComponent, KeyPadModule, LayoutSwitcherComponent, LayoutSwitcherModule, SendMethodDialogComponent, SendMethodDialogModule, SharedService, StockComponent, StockModule, SignatureComponent as ɵa, SignaturesComponent as ɵb, StockService as ɵc, OptionsService as ɵd, DictionaryService as ɵe, SharedConnectorService as ɵf, IconCacheService as ɵg, StockInformationComponent as ɵh, StockInformationGridComponent as ɵi, StockLocationComponent as ɵj, StockTransferComponent as ɵk, StockChangeAmountComponent as ɵl };
+export { DocsignComponent, DocsignModule, KeyPadComponent, KeyPadModule, LayoutSwitcherComponent, LayoutSwitcherModule, SendMethodDialogComponent, SendMethodDialogModule, SharedService, StockComponent, StockModule, SignatureComponent as ɵa, SignaturesComponent as ɵb, StockService as ɵc, SharedConnectorService as ɵd, OptionsService as ɵe, DictionaryService as ɵf, IconCacheService as ɵg, StockInformationComponent as ɵh, StockInformationGridComponent as ɵi, StockLocationComponent as ɵj, StockTransferComponent as ɵk, StockChangeAmountComponent as ɵl };
 //# sourceMappingURL=colijnit-sharedcomponents.js.map