@colijnit/sharedcomponents 1.0.32 → 1.0.34

package/fesm2015/colijnit-sharedcomponents.js

@@ -1078,10 +1078,9 @@ StockComponent.decorators = [
 
         </co-stock-location>
         <co-stock-transfer *ngIf="showStockTransfer"
-                           (handleCancelClicked)="backToStock()"
+                           (handleClick)="backToStock()"
                             [article]="stockTransferArticle"
                            [articleToTransfer]="stockTransferArticleDetails"
-                           [stockSticker]="stockService.stockStickers"
                            (handleStickerClicked)="handleStickerClicked.emit($event)"
                            [articleWarehouse]="articleWarehouse"
                            [allWarehouses]="allWarehouses"
@@ -1324,7 +1323,6 @@ class StockInformationGridComponent {
         this.getArticleDetails(data);
         this.hideOrShowTabs = false;
         this.hideOrShowLocationTab = true;
-        this._stockService.lockArticleDetails(this.articleDetailsInformation);
     }
     handleHistoryClick() {
         this.historyClicked.emit();
@@ -1402,29 +1400,39 @@ class StockInformationGridComponent {
     getOrderData() {
         return __awaiter(this, void 0, void 0, function* () {
             const orderData = new ArticleTransaction$1();
-            orderData.type = "V";
+            orderData.type = "I";
             orderData.goodId = this.articleStockInformation[0].goodId.toString();
             this.orderInformation = yield this._stockService.getArticleTransaction(orderData);
         });
     }
-    onSelectLocation() {
+    onLocationDropdownClick() {
         this._stockService.getStockManagementLocations(this.selectedWarehouse).then((locations) => {
             this.stockLocations = locations;
         });
     }
+    onLocationSelected(location) {
+        this.selectedArticleDetailsData.locationNo = location;
+    }
     onOkClickSendLocations() {
-        console.log(this.article);
-        this.selectedArticleDetailsData.selected = true;
-        this.selectedArticleDetailsData.goodId = this.article.goodId;
-        this.selectedArticleDetailsData.entryDate = new Date();
-        this.selectedArticleDetailsData.warehouseNo = this.selectedWarehouse;
-        this._stockService.updateArticleDetails(this.selectedArticleDetailsData);
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log(this.article);
+            this.selectedArticleDetailsData.selected = true;
+            this.selectedArticleDetailsData.goodId = this.article.goodId;
+            this.selectedArticleDetailsData.entryDate = new Date();
+            this.selectedArticleDetailsData.warehouseNo = this.selectedWarehouse;
+            yield this._stockService.updateArticleDetails(this.selectedArticleDetailsData);
+            yield this._stockService.getArticleDetails(this.articleDetailsInformation).then((details) => {
+                this.articleDetails = details;
+            });
+        });
     }
     onCancelClickSendLocations() {
     }
-    amountInStockChanged(data, row) {
-        console.log(data);
-        console.log(row);
+    amountInStockChanged(data) {
+        this.selectedArticleDetailsData.amountInStock = data;
+    }
+    lockSelectedRow(row) {
+        this._stockService.lockArticleDetails(row);
     }
 }
 StockInformationGridComponent.decorators = [
@@ -1458,7 +1466,7 @@ StockInformationGridComponent.decorators = [
           <co-simple-grid-column [headerText]="'ECONOMICAL_STOCK'" [field]="'economicalStock'" [order]="14"></co-simple-grid-column>
           <co-simple-grid-column [headerText]="'LOCATION'" [field]="'locationNo'" [order]="15">
             <ng-template #template let-row="row">
-              <span [textContent]="'Bekijken'" (click)="onLocationClick(row)"></span>
+              <span class="location-link" [textContent]="'Bekijken'" (click)="onLocationClick(row)"></span>
             </ng-template>
           </co-simple-grid-column>
       </co-simple-grid>
@@ -1469,16 +1477,15 @@ StockInformationGridComponent.decorators = [
                       [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>
+        <co-simple-grid-column [headerText]="'CUSTOMER'" [field]="'customerName'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'DATE'">
           <ng-template #template let-row="row">
             <span [textContent]="row.transactionDate | date:'dd-MM-yyyy'"></span>
           </ng-template>
         </co-simple-grid-column>
         <co-simple-grid-column [headerText]="'AMOUNT'" [field]="'amountInOrder'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'WAREHOUSE'" [field]="'wareHouseNr'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'DESCRIPTION'" [field]="'locationNr'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'STOCK'" [field]="'amountInStock'"></co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'WAREHOUSE'" [field]="'warehouseNumber'"></co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'DESCRIPTION'" [field]="'warehouseDescription'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'TRANSFER'" [field]="'transfer'">
           <ng-template #template let-row="row">
             <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.DeliveryTruck)" (click)="handleStockTransferClick($event)"></co-icon>
@@ -1504,13 +1511,12 @@ StockInformationGridComponent.decorators = [
         </co-simple-grid-column>
         <co-simple-grid-column [headerText]="'AMOUNT'" [field]="'amountInOrder'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'RESERVED'" [field]="'reserved'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'FREE_STOCK'" [field]="'freeStock'"></co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'FREE_STOCK'" [field]="'InOrderForStock'"></co-simple-grid-column>
         <co-simple-grid-column [headerText]="'DELIVERY_DATE1'">
           <ng-template #template let-row="row">
             <span [textContent]="row.deliveryDate | date:'dd-MM-yyyy'"></span>
           </ng-template>
         </co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'RESERVE'" [field]="'reservation'"></co-simple-grid-column>
       </co-simple-grid>
     </div>
 
@@ -1538,6 +1544,7 @@ StockInformationGridComponent.decorators = [
                       [showToolbar]="true"
                       [showDelete]="true"
                       [inlineEdit]="true"
+                      (dblClickRow)="lockSelectedRow($event)"
       >
         <div class="stock-location-group">
           <div class="stock-location-left-group">
@@ -1550,19 +1557,19 @@ StockInformationGridComponent.decorators = [
                                [collection]="stockLocations"
                                [fields]="dataLocationFields"
                                [placeholder]="'LOCATION'"
-                               (click)="onSelectLocation()"
+                               (click)="onLocationDropdownClick()"
                                [required]="true"
             ></co-drop-down-list>
           </ng-template>
         </co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'BATCH'" [field]="'batchNo'">
+        <co-simple-grid-column *ngIf="articleDetails" [headerText]="'BATCH'" [field]="'batchNo'">
           <ng-template #editTemplate let-row="row">
             <co-input-text [(model)]="row.batchNo"
                            [placeholder]="'BATCH'"
             ></co-input-text>
           </ng-template>
         </co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'SERIAL_NO'" [field]="'serialNo'">
+        <co-simple-grid-column *ngIf="articleDetails" [headerText]="'SERIAL_NO'" [field]="'serialNo'">
           <ng-template #editTemplate let-row="row">
             <co-input-text [(model)]="row.serialNo"
                            [placeholder]="'SERIAL_NO'"
@@ -1573,16 +1580,35 @@ StockInformationGridComponent.decorators = [
           <ng-template #editTemplate let-row="row">
             <co-input-text  [(model)]="row.amountInStock"
                             [label]="'STOCK'"
-                            (modelChange)="amountInStockChanged($event, row)"
+                            (modelChange)="amountInStockChanged($event)"
             ></co-input-text>
           </ng-template>
         </co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'ALLOCATED'" [field]="'stockAssigned'" ></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'AVAILABLE_STOCK'" [field]="'perceptibleStorage'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'PHYSICAL_STOCK'" [field]="'amountInStockOriginal'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'VALUTA'" [field]="'currency'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'PURCHASE_PRICE'" [field]="'purchasePrice'"></co-simple-grid-column>
-        <co-simple-grid-column [headerText]="'SUPPLIER_NUMBER'" [field]="'supplierNo'"></co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'ALLOCATED'" [field]="'stockAssigned'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.stockAssigned"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'AVAILABLE_STOCK'" [field]="'amountInStockFree'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.amountInStockFree"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'VALUTA'" [field]="'currency'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.currency"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'PURCHASE_PRICE'" [field]="'purchasePrice'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.purchasePrice"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'SUPPLIER_NUMBER'" [field]="'supplierNo'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.supplierNo"></span>
+          </ng-template>
+        </co-simple-grid-column>
         <co-simple-grid-column [headerText]="'TRANSFER'" [field]="'transfer'">
           <ng-template #template let-row="row">
             <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.DeliveryTruck)" (click)="handleStockTransferClick(row)"></co-icon>
@@ -1660,7 +1686,6 @@ StockInformationGridComponent.decorators = [
     </div>
     <co-send-method-dialog *ngIf="showSendMethodDialog"
                            (closeClick)="showSendMethodDialog = false"
-                           (printButtonClicked)="printStockStickers()"
     ></co-send-method-dialog>
   `,
                 encapsulation: ViewEncapsulation.None
@@ -1745,7 +1770,7 @@ StockLocationComponent.propDecorators = {
 class StockTransferComponent {
     constructor(_stockService) {
         this._stockService = _stockService;
-        this.handleCancelClicked = new EventEmitter();
+        this.handleClick = new EventEmitter();
         this.handleStickerClicked = new EventEmitter();
         this.allWarehousesDropdownFields = { text: "warehouseDescription", value: "warehouseNo" };
         this.allLocationDropdownFields = { text: "locationNo", value: "locationNo" };
@@ -1762,10 +1787,11 @@ class StockTransferComponent {
             data.selected = true;
             data.entryDate = new Date;
             yield this._stockService.updateArticleDetails(data);
+            this.handleClick.emit();
         });
     }
     handleCancelClick() {
-        this.handleCancelClicked.emit();
+        this.handleClick.emit();
     }
     handleSelectedWarehouse(event) {
         this.selectedWarehouse = event;
@@ -1830,17 +1856,20 @@ StockTransferComponent.decorators = [
             <co-drop-down-list [collection]="warehouses"
                                [fields]="allWarehousesDropdownFields"
                                (modelChange)="handleSelectedWarehouse($event)"
+                               [placeholder]="'Magazijn'"
                                [(model)]="articleToTransfer.targetWarehouse">
             </co-drop-down-list>
             <co-drop-down-list [collection]="locations"
                                [fields]="allLocationDropdownFields"
                                [(model)]="articleToTransfer.targetLocation"
+                               [placeholder]="'Locatie'"
             >
             </co-drop-down-list>
             <co-drop-down-list [collection]="stockState"
                                [fields]="stockStateDropdownField"
                                [placeholder]="'Voorraadstatus'"
-                               [(model)]="articleToTransfer.stockStateId">
+                               [(model)]="articleToTransfer.stockStateId"
+            >
             </co-drop-down-list>
             <co-input-text [placeholder]="'Omschrijving'"
                            [(model)]="articleToTransfer.stockStateRemark">
@@ -1867,7 +1896,7 @@ StockTransferComponent.propDecorators = {
     articleToTransfer: [{ type: Input }],
     articleWarehouse: [{ type: Input }],
     allWarehouses: [{ type: Input }],
-    handleCancelClicked: [{ type: Output }],
+    handleClick: [{ type: Output }],
     handleStickerClicked: [{ type: Output }]
 };