fabrikantencore 2.0.7 → 2.0.8

package/src/app/modules/fabrikantencore/beheer/components/beheer-products/beheer-products.component.html

@@ -1,99 +0,0 @@
-<app-beheer-nav></app-beheer-nav>
-
-<div *ngIf="ProductsService.Loading() || ImportSetsService.LoadingImportSets">
-  <app-fab-loader></app-fab-loader>
-</div>
-<div *ngIf="!ProductsService.Loading() && !ImportSetsService.LoadingImportSets" class="main-block">
-  <mat-card>
-    <mat-card-content>
-      <div class="displayflex">
-        <div class="displayflex">
-          <mat-form-field appearance="fill">
-            <mat-label>Import set</mat-label>
-            <mat-select [(ngModel)]="ImportSetsService.BCBImportSetSelected">
-              <mat-option *ngFor="let importset of ImportSetsService.BCBImportSetsViewModel.bcbImportSetViewModels" [value]="importset.id">
-                {{importset.name}}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-         
-        </div>
-
-        <div>
-          <button mat-raised-button (click)="ProductsService.Reload(this.ChangeDetectorRef)">
-            Refresh
-          </button>
-        </div>
-
-        <div class="flex-auto" style="text-align: right;">
-          <button mat-raised-button (click)="ResetImport()">
-            Reset Import
-          </button>
-          <button mat-raised-button (click)="Import()">
-            Import
-          </button>
-          <button mat-raised-button (click)="CleanUp()">
-            CleanUp
-          </button>
-        </div>
-      </div>
-      
-
-      
-    </mat-card-content>
-  </mat-card>
-
-  <div class="displayflex" *ngIf="this.ProductsService.ProductsViewModel != undefined">
-    <div class="tree-block">
-      <div class="limiter">
-        <mat-card>
-          <mat-card-content>
-            <table class="full-width">
-              <tr class="table-head">
-                <td></td>
-                <td>Id</td>
-                <td>Naam</td>
-                <td>Variants</td>
-                <td>Importset</td>
-              </tr>
-              <ng-container *ngFor="let product of this.ProductsService.ProductsViewModel.productViewModels">
-                <tr (click)="SelectProduct(product)" class="table-row" [ngClass]="{'selected' : ProductsService.ProductViewModel == product, 'warning': !product.imported || !product.connected}">
-                  <td><span class="importspan">{{ GetImportStatus(product) }}</span></td>
-                  <td>{{ product.id }}</td>
-                  <td>{{ product.name }}</td>
-                  <td>{{ product.bcbProductViewModels.length }}</td>
-                  <td>
-                    <select [(ngModel)]="product.importSetId" (change)="SaveProduct(product)" class="full-width">
-                      <option *ngFor="let importset of ImportSetsService.BCBImportSetsViewModel.bcbImportSetViewModels" [value]="importset.id">{{importset.name}}</option>
-                    </select>
-                  </td>
-                </tr>
-                <ng-container *ngIf="ShowBCBProducts(product)">
-                  <tr>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr *ngFor="let bcbproduct of ProductsService.ProductViewModel.bcbProductViewModels" class="table-row" [ngClass]="{'selected' : ProductsService.BCBProductViewModel == bcbproduct, 'warning': !bcbproduct.imported || !bcbproduct.connected}" (click)="SelectBCBProduct(bcbproduct)">
-                    <td><span class="importspan">{{ bcbproduct.importStatus }}</span></td>
-                    <td>{{ bcbproduct.id }}</td>
-                    <td colspan="3">{{ bcbproduct.name }}</td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                  </tr>
-                </ng-container>
-              </ng-container>
-            </table>
-          </mat-card-content>
-        </mat-card>
-      </div>
-    </div>
-
-    <div class="main-content">
-      <div class="limiter">
-        <app-beheer-products-product *ngIf="ProductsService.ProductViewModel != undefined && ProductsService.BCBProductViewModel == undefined" [ProductViewModel]="ProductsService.ProductViewModel"></app-beheer-products-product>
-        <app-beheer-products-bcbproduct *ngIf="ProductsService.BCBProductViewModel != undefined" [BCBProductViewModel]="ProductsService.BCBProductViewModel"></app-beheer-products-bcbproduct>
-      </div>
-    </div>
-  </div>
-</div>
-

package/src/app/modules/fabrikantencore/beheer/components/beheer-products/beheer-products.component.scss

@@ -1,85 +0,0 @@
-.full-width {
-  width: 100%;
-}
-
-.full-height {
-  height: 100%;
-}
-
-.table-head td {
-  font-weight: bold;
-  border-bottom: 2px solid #000;
-}
-
-.table-row td {
-  border-bottom: 1px solid #000;
-  cursor: pointer;
-}
-
-.warning {
-    background-color: lightcoral;
-}
-
-.table-row:hover {
-  background-color: lightgray;
-}
-
-.limiter {
-  max-height: calc(100vh - 179px);
-  overflow: auto;
-}
-
-.selected {
-  background-color: lightblue !important;
-}
-
-.importspan {
-  margin-left: 5px;
-  font-weight: bold;
-}
-
-.main-block {
-  padding: 10px;
-  height: calc(100vh - 66px);
-  overflow: auto;
-}
-
-.main-content {
-  padding: 5px;
-  flex: auto;
-  width: 50%;
-}
-
-.tree-block {
-  padding: 5px;
-  flex: auto;
-  width: 50%;
-  max-height: calc(100vh - 66px);
-}
-
-.example-tree-invisible {
-  display: none;
-}
-
-.example-tree ul,
-.example-tree li {
-  margin-top: 0;
-  margin-bottom: 0;
-  list-style-type: none;
-}
-
-.example-tree .mat-nested-tree-node div[role=group] {
-  padding-left: 40px;
-}
-
-.example-tree div[role=group] > .mat-tree-node {
-  padding-left: 40px;
-}
-
-.displayflex {
-  display: flex;
-}
-
-.flex-auto {
-    flex: auto;
-}

package/src/app/modules/fabrikantencore/beheer/components/beheer-products/beheer-products.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BeheerProductsComponent } from './beheer-products.component';
-
-describe('BeheerProductsComponent', () => {
-  let component: BeheerProductsComponent;
-  let fixture: ComponentFixture<BeheerProductsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ BeheerProductsComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(BeheerProductsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

package/src/app/modules/fabrikantencore/beheer/components/beheer-products/beheer-products.component.ts

@@ -1,172 +0,0 @@
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { MatSelectionList } from '@angular/material/list';
-import { ProductsService } from '../../../services/products.service';
-import { ImportSetsService } from '../../../services/importsets.service';
-import { ProductsApiClient, ProductsViewModel, BCBProductViewModel, ProductViewModel, BCBImportProductRequest, BCBImportProductResponse, ImportApiClient, BCBImportSetsViewModel } from '../../../swagger/SwaggerClient';
-
-@Component({
-  selector: 'app-beheer-products',
-  templateUrl: './beheer-products.component.html',
-  styleUrls: ['./beheer-products.component.scss']
-})
-export class BeheerProductsComponent implements OnInit {
-
-
-  public BCBImportSetsViewModel?: BCBImportSetsViewModel = undefined;
-
-  constructor(public ProductsService: ProductsService,
-    public ImportSetsService: ImportSetsService,
-    private ImportApiClient: ImportApiClient,
-    public ChangeDetectorRef: ChangeDetectorRef) {
-
-  }
-
-  ngOnInit(): void {
-    this.ImportSetsService.LoadImportSets(this.ChangeDetectorRef);
-  }
-
-  public Import(): void {
-    var products = this.ProductsService.ProductsViewModel?.productViewModels;
-
-    if (products != null && products.length > 0) {
-      for (var i = 0; i < products.length; i++) {
-        var bcbproducts = products[i].bcbProductViewModels;
-
-        if (bcbproducts != null) {
-          products[i].importStatus = "0/" + bcbproducts.length;
-
-          for (var j = 0; j < bcbproducts.length; j++) {
-            bcbproducts[j].importStatus = "X";
-          }
-        }
-      }
-
-      var bcbproducts = products[0].bcbProductViewModels;
-
-      if (bcbproducts != null && bcbproducts.length > 0) {
-        this.ImportBCBProduct(bcbproducts[0]);
-      }
-    }
-  }
-
-  public ImportBCBProduct(bcbproduct: BCBProductViewModel): void {
-    var request = new BCBImportProductRequest();
-
-    request.bcbProductId = bcbproduct.id;
-
-    this.ImportApiClient.importBCBProduct(request).subscribe((model: BCBImportProductResponse) => {
-      if (!model.success) {
-        alert(model.message);
-      }
-      else {
-        bcbproduct.importStatus = "V";
-
-        var next = this.GetNextBCBProduct(bcbproduct);
-
-        if (next.importStatus == "X") {
-          this.ImportBCBProduct(next);
-        }
-        else {
-          this.ProductsService.Reload(this.ChangeDetectorRef);
-        }
-      }
-    }, (error: Response) => {
-      alert("import failed for id: " + bcbproduct.id);
-
-      if (error.status == 400)
-        console.log(error.json());
-      else {
-        console.log('An unexpected error occured');
-        console.log(error);
-      }
-    });
-  }
-
-  public ResetImport(): void {
-    this.ProductsService.ResetImport(-1, -1, this.ChangeDetectorRef);
-  }
-
-  public CleanUp(): void {
-    this.ProductsService.CleanUp();
-  }
-
-  public ShowBCBProducts(product: ProductViewModel): boolean {
-    if (this.ProductsService.ProductViewModel == product) {
-      return true;
-    }
-
-    return false;
-  }
-
-  public SelectProduct(product: ProductViewModel) {
-    if (this.ProductsService.ProductViewModel != product) {
-      this.ProductsService.ProductViewModel = product;
-      this.ProductsService.BCBProductViewModel = undefined;
-    }
-  }
-
-  public SaveProduct(product: ProductViewModel) {
-    this.ProductsService.SaveProductViewModel(product, this.ChangeDetectorRef);
-  }
-
-  public SelectBCBProduct(bcbproduct: BCBProductViewModel) {
-    if (this.ProductsService.BCBProductViewModel != bcbproduct) {
-      this.ProductsService.BCBProductViewModel = bcbproduct;
-    }
-    else {
-      this.ProductsService.BCBProductViewModel = undefined;
-    }
-  }
-
-  public GetImportStatus(product: ProductViewModel): string {
-    var text = "";
-    var active = false;
-
-    var bcbproducts = product.bcbProductViewModels;
-    if (bcbproducts != null && bcbproducts.length > 0) {
-      var count = 0;
-
-      for (var i = 0; i < bcbproducts.length; i++) {
-        if (bcbproducts[i].importStatus != "") {
-          active = true;
-
-          if (bcbproducts[i].importStatus != "X") {
-            count++;
-          }
-        }
-      }
-
-      if (active) {
-        text = count + "/" + bcbproducts.length;
-      }
-    }
-
-    return text;
-  }
-
-  public GetNextBCBProduct(bcbproduct: BCBProductViewModel): BCBProductViewModel {
-    var products = this.ProductsService.ProductsViewModel?.productViewModels;
-    var next: BCBProductViewModel = bcbproduct;
-    var found = false;
-
-    if (products != null && products.length > 0) {
-      for (var i = 0; i < products.length; i++) {
-        var bcbproducts = products[i].bcbProductViewModels;
-
-        if (bcbproducts != null) {
-          for (var j = 0; j < bcbproducts.length; j++) {
-            if (found) {
-              return bcbproducts[j];
-            }
-
-            if (bcbproducts[j] == bcbproduct) {
-              found = true;
-            }
-          }
-        }
-      }
-    }
-
-    return next;
-  }
-}

package/src/app/modules/fabrikantencore/beheer/components/beheer-searchproducts/beheer-searchproducts-koppel-dialog/beheer-searchproducts-koppel-dialog.component.html

@@ -1,45 +0,0 @@
-<div *ngIf="Loading">
-  <app-fab-loader></app-fab-loader>
-</div>
-
-<div *ngIf="!Loading">
-  <mat-tab-group>
-    <mat-tab label="Nieuw">
-      <div class="bar" *ngIf="Suggestion.length > 0">
-        <button *ngFor="let sugg of Suggestion" mat-raised-button (click)="NaamNieuw = sugg;">{{ sugg }}</button>
-      </div>
-      <div class="bar">
-        <mat-form-field appearance="fill" class="full-width">
-          <mat-label>Naam</mat-label>
-          <input matInput (keyup)="handleKeyUp($event)" [(ngModel)]="NaamNieuw">
-        </mat-form-field>
-      </div>
-
-      <div class="bar tool-bar">
-        <button mat-raised-button (click)="NieuwToevoegen()">Toevoegen</button>
-      </div>
-    </mat-tab>
-    <mat-tab label="Bestaand">
-
-      <div class="bar">
-        <mat-form-field appearance="fill" class="full-width">
-          <mat-label>Product</mat-label>
-          <mat-select [(ngModel)]="ProductSelected">
-            <mat-option *ngFor="let product of GetProductsViewModel.productViewModels" [value]="product.id">
-              {{product.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-      </div>
-
-      <div class="bar tool-bar">
-        <button mat-raised-button (click)="BestaandToevoegen()">Toevoegen</button>
-      </div>
-    </mat-tab>
-    <mat-tab label="Los">
-      <div class="bar tool-bar">
-        <button mat-raised-button (click)="LosKenmerk()">Kenmerk</button>
-      </div>
-    </mat-tab>
-  </mat-tab-group>
-</div>

package/src/app/modules/fabrikantencore/beheer/components/beheer-searchproducts/beheer-searchproducts-koppel-dialog/beheer-searchproducts-koppel-dialog.component.scss

@@ -1,14 +0,0 @@
-.full-width {
-  width: 100%;
-}
-
-.bar {
-  padding-top: 5px;
-  padding-left: 3px;
-  padding-right: 3px;
-}
-
-.tool-bar {
-  text-align: right;
-  padding-bottom: 3px;
-}

package/src/app/modules/fabrikantencore/beheer/components/beheer-searchproducts/beheer-searchproducts-koppel-dialog/beheer-searchproducts-koppel-dialog.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BeheerSearchproductsKoppelDialogComponent } from './beheer-searchproducts-koppel-dialog.component';
-
-describe('BeheerSearchproductsKoppelDialogComponent', () => {
-  let component: BeheerSearchproductsKoppelDialogComponent;
-  let fixture: ComponentFixture<BeheerSearchproductsKoppelDialogComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ BeheerSearchproductsKoppelDialogComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(BeheerSearchproductsKoppelDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

package/src/app/modules/fabrikantencore/beheer/components/beheer-searchproducts/beheer-searchproducts-koppel-dialog/beheer-searchproducts-koppel-dialog.component.ts

@@ -1,89 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { SearchProductsApiClient, NewProductRequestModel, GetProductsViewModel } from '../../../../swagger/SwaggerClient';
-
-@Component({
-  selector: 'app-beheer-searchproducts-koppel-dialog',
-  templateUrl: './beheer-searchproducts-koppel-dialog.component.html',
-  styleUrls: ['./beheer-searchproducts-koppel-dialog.component.scss']
-})
-export class BeheerSearchproductsKoppelDialogComponent implements OnInit {
-  public Loading: boolean = false;
-  public NaamNieuw: string = "";
-  public Suggestion: Array<string>;
-  public GetProductsViewModel: GetProductsViewModel;
-  public ProductSelected: number = -1;
-
-  constructor(public dialogRef: MatDialogRef<BeheerSearchproductsKoppelDialogComponent>, private SearchProductsApiClient: SearchProductsApiClient, @Inject(MAT_DIALOG_DATA) public data: any) {
-    this.Suggestion = data.suggestion;
-  }
-
-  ngOnInit(): void {
-    this.LoadProducts();
-  }
-
-  public BestaandToevoegen(): void {
-    this.dialogRef.close(this.ProductSelected);
-  }
-
-  public NieuwToevoegen(): void {
-    this.Loading = true;
-
-    var model: NewProductRequestModel = new NewProductRequestModel();
-
-    model.productName = this.NaamNieuw;
-
-    this.SearchProductsApiClient.addNewProduct(model).subscribe(model => {
-      this.Loading = false;
-
-      this.dialogRef.close(model.productId);
-    }, (error: Response) => {
-      if (error.status == 400)
-        console.log(error.json());
-      else {
-        console.log('An unexpected error occured');
-        console.log(error);
-      }
-
-      this.Loading = false;
-    });
-  }
-
-  public LosKenmerk(): void {
-    this.dialogRef.close(-2);
-  }
-
-  public handleKeyUp(e: any) {
-    if (e.keyCode === 13) {
-      this.NieuwToevoegen();
-    }
-  }
-
-  private LoadProducts(): void {
-    this.Loading = true;
-
-    this.SearchProductsApiClient.getProductsViewModel().subscribe(model => {
-      this.GetProductsViewModel = model;
-
-      var array = this.GetProductsViewModel?.productViewModels;
-
-      if (array != null && array.length > 0) {
-        var id = array[0].id;
-        if (id != null) {
-          this.ProductSelected = id;
-        }
-      }
-
-      this.Loading = false;
-    }, (error: Response) => {
-      if (error.status == 400)
-        console.log(error.json());
-      else {
-        console.log('An unexpected error occured');
-        console.log(error);
-      }
-
-      this.Loading = false;
-    });
-  }
-}

package/src/app/modules/fabrikantencore/beheer/components/beheer-searchproducts/beheer-searchproducts.component.html

@@ -1,119 +0,0 @@
-<app-beheer-nav></app-beheer-nav>
-
-<div class="main-window">
-  <div>
-    <mat-card>
-      <div class="main-block-search">
-        <div class="block">
-          <mat-form-field appearance="fill" class="full-width">
-            <mat-label>Zoekterm</mat-label>
-            <input matInput placeholder="bv. Merk Serie" (keyup)="handleKeyUp($event)" [(ngModel)]="ZoekTerm">
-          </mat-form-field>
-        </div>
-        <div class="zoeken-block">
-          <button mat-raised-button (click)="Zoek()" [disabled]="Loading">Zoeken</button>
-        </div>
-      </div>
-    </mat-card>
-
-    <div *ngIf="Loading">
-      <app-fab-loader></app-fab-loader>
-    </div>
-
-    <div *ngIf="!Loading" class="resultblock">
-      <mat-card>
-        <mat-card-content>
-          <table class="ebo-table">
-            <tr>
-              <td>
-                <button mat-raised-button (click)="SelectAll()" class="selectall">V</button>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>BOT</mat-label>
-                  <input matInput [(ngModel)]="BOT">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO1Type</mat-label>
-                  <input matInput [(ngModel)]="DO1Type">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO1Naam</mat-label>
-                  <input matInput [(ngModel)]="DO1Naam">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO2Type</mat-label>
-                  <input matInput [(ngModel)]="DO2Type">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO2Naam</mat-label>
-                  <input matInput [(ngModel)]="DO2Naam">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO3Type</mat-label>
-                  <input matInput [(ngModel)]="DO3Type">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO3Naam</mat-label>
-                  <input matInput [(ngModel)]="DO3Naam">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO4Type</mat-label>
-                  <input matInput [(ngModel)]="DO4Type">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>DO4Naam</mat-label>
-                  <input matInput [(ngModel)]="DO4Naam">
-                </mat-form-field>
-              </td>
-              <td>
-                <mat-form-field appearance="fill" class="full-width">
-                  <mat-label>Kenmerk</mat-label>
-                  <input matInput [(ngModel)]="Kenmerk">
-                </mat-form-field>
-              </td>
-            </tr>
-            <tr *ngFor="let ebo of GetEbos(false)" class="table-row" (click)="SelectRow(ebo)">
-              <td>
-                <div *ngIf="ebo.inUseBy == ''">
-                  <mat-checkbox class="row-check" [(ngModel)]="ebo.selected" [color]="Primary" (change)="UpdateSnackBar()"></mat-checkbox>
-                </div>
-              </td>
-              <ng-container *ngFor="let do of ebo.dOs">
-                <td *ngIf="ShowCell(do.doType)">{{ do.doType }}</td>
-                <td>{{ do.doNaam }}</td>
-              </ng-container>
-            </tr>
-            <tr *ngFor="let ebo of GetEbos(true)" class="table-row" (click)="SelectRow(ebo)">
-              <td>
-                <div *ngIf="ebo.inUseBy == ''">
-                  <mat-checkbox class="row-check" [(ngModel)]="ebo.selected" [color]="Primary" (change)="UpdateSnackBar()"></mat-checkbox>
-                </div>
-              </td>
-              <ng-container *ngFor="let do of ebo.dOs">
-                <td *ngIf="ShowCell(do.doType)">{{ do.doType }}</td>
-                <td>{{ do.doNaam }}</td>
-              </ng-container>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
-</div>