fabrikantencore 2.4.3 → 2.4.4

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

@@ -0,0 +1,185 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ProductsService } from '../../../../services/products.service';
+import { FiltersApiClient, FiltersViewModel, FilterOptionViewModel, CreateFilterOptionRequest, CreateFilterOptionResponse, CreateFilterRequest, CreateFilterResponse, ConnectEigenschapOptieRequest, ProductsApiClient } from '../../../../swagger/SwaggerClient';
+
+@Component({
+  selector: 'app-beheer-products-koppel-filteroption-dailog',
+  templateUrl: './beheer-products-koppel-filteroption-dailog.component.html',
+  styleUrls: ['./beheer-products-koppel-filteroption-dailog.component.scss']
+})
+export class BeheerProductsKoppelFilteroptionDailogComponent implements OnInit {
+
+  public FiltersViewModel: FiltersViewModel;
+
+  public FilterNaamNieuw: string = "";
+  public FilterOptionNaamNieuw: string = "";
+
+  public LoadingFilters: boolean = true;
+  public LoadingOpties: boolean = true;
+  public FilterSelected: number;
+  public FilterOptionSelected: number;
+
+  public BCBEigenschapOptieId: number;
+  public Location: string;
+
+  constructor(
+    public dialogRef: MatDialogRef<BeheerProductsKoppelFilteroptionDailogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private FiltersApiClient: FiltersApiClient,
+    private ProductsApiClient: ProductsApiClient,
+    private ProductsService: ProductsService) {
+    this.BCBEigenschapOptieId = data.bcbeigenschapoptieid;
+    this.Location = data.location;
+    this.FilterNaamNieuw = data.suggestedfilter;
+    this.FilterOptionNaamNieuw = data.suggestedoption;
+  }
+
+  ngOnInit(): void {
+    this.LoadFilters();
+    //this.LoadOpties();
+  }
+
+  public handleKeyUpFilter(e: any) {
+    if (e.keyCode === 13) {
+      this.NieuwFilterToevoegen();
+    }
+  }
+
+  public handleKeyUpFilterOption(e: any) {
+    if (e.keyCode === 13) {
+      this.NieuwFilterOptionToevoegen();
+    }
+  }
+
+  public NieuwFilterToevoegen(): void {
+    this.LoadingFilters = true;
+
+    var requestfilter: CreateFilterRequest = new CreateFilterRequest();
+
+    requestfilter.name = this.FilterNaamNieuw;
+
+    this.FiltersApiClient.createFilter(requestfilter).subscribe((model: CreateFilterResponse) => {
+      this.LoadingFilters = false;
+
+      var requestfilteroption = new CreateFilterOptionRequest();
+
+      requestfilteroption.filterId = model.id;
+      requestfilteroption.name = this.FilterOptionNaamNieuw;
+
+      this.FiltersApiClient.createFilterOption(requestfilteroption).subscribe((model: CreateFilterOptionResponse) => {
+        this.LoadingFilters = false;
+
+        this.dialogRef.close({ filter: null, filteroption: model.id });
+      }, (error: Response) => {
+        if (error.status == 400)
+          console.log(error.json());
+        else {
+          console.log('An unexpected error occured');
+          console.log(error);
+        }
+
+        this.LoadingFilters = false;
+      });
+
+    }, (error: Response) => {
+      if (error.status == 400)
+        console.log(error.json());
+      else {
+        console.log('An unexpected error occured');
+        console.log(error);
+      }
+
+      this.LoadingFilters = false;
+    });
+  }
+
+  public NieuwFilterOptionToevoegen(): void {
+    this.LoadingFilters = true;
+
+    var requestfilteroption = new CreateFilterOptionRequest();
+
+    requestfilteroption.filterId = this.FilterSelected;
+    requestfilteroption.name = this.FilterOptionNaamNieuw;
+
+    this.FiltersApiClient.createFilterOption(requestfilteroption).subscribe((model: CreateFilterOptionResponse) => {
+      this.LoadingFilters = false;
+
+      this.dialogRef.close({ filter: null, filteroption: model.id });
+    }, (error: Response) => {
+      if (error.status == 400)
+        console.log(error.json());
+      else {
+        console.log('An unexpected error occured');
+        console.log(error);
+      }
+
+      this.LoadingFilters = false;
+    });
+  }
+
+  public BestaandToevoegen(): void {
+    this.dialogRef.close({ filter: null, filteroption: this.FilterOptionSelected });
+  }
+
+  public GetSelectedFiltersOptions(): Array<FilterOptionViewModel> {
+    var array = new Array<FilterOptionViewModel>();
+
+    var temparray = this.FiltersViewModel?.filterViewModels;
+
+    if (temparray != null) {
+      for (var i = 0; i < temparray.length; i++) {
+        if (temparray[i].id == this.FilterSelected) {
+          return temparray[i].filterOptionViewModels as Array<FilterOptionViewModel>;
+        }
+      }
+    }
+
+    return array;
+  }
+
+  public KoppelManyName(): void {
+    this.dialogRef.close({ filter: this.FilterSelected, filteroption: null });
+  }
+
+  public Loading(): boolean {
+    return this.LoadingFilters;
+  }
+
+  private LoadFilters(): void {
+    this.LoadingFilters = true;
+
+    this.FiltersApiClient.getFiltersViewModel().subscribe((model: FiltersViewModel) => {
+      this.FiltersViewModel = model;
+      this.LoadingFilters = false;
+    }, (error: Response) => {
+      if (error.status == 400)
+        console.log(error.json());
+      else {
+        console.log('An unexpected error occured');
+        console.log(error);
+      }
+
+      this.LoadingFilters = false;
+    });
+  }
+
+  private LoadOpties(): void {
+    if (this.ProductsService.BCBProductViewModel != null) {
+      this.LoadingOpties = true;
+
+      var request = new ConnectEigenschapOptieRequest();
+
+      request.bcbEigenschapOptieId = this.BCBEigenschapOptieId;
+      request.bcbProductId = this.ProductsService.BCBProductViewModel.id;
+      request.location = this.Location;
+
+      //this.ProductsApiClient.connectBCBEigenschapOptieFilterOptionPreview(request).subscribe((model: ConnectEigenschapOptieResponse) => {
+      //  this.ConnectEigenschapOptieResponse = model;
+      //  this.LoadingOpties = false;
+      //}, (error: Response) => {
+      //  alert(error);
+      //});
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+<mat-card>
+  <div class="product-bar">
+    <div class="product-first block">
+      <mat-form-field appearance="fill" class="full-width">
+        <mat-label>Naam</mat-label>
+        <input matInput [(ngModel)]="ProductViewModel.name">
+      </mat-form-field>
+    </div>
+    <div class="block">
+      <button mat-raised-button (click)="ResetImport()">
+        Reset Import
+      </button>
+    </div>
+    <div class="block">
+      <button mat-raised-button [disabled]="true">
+        Opslaan
+      </button>
+    </div>
+    <div class="block">
+      <button mat-raised-button [disabled]="true">
+        Verwijderen
+      </button>
+    </div>
+  </div>
+</mat-card>
+

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

@@ -0,0 +1,15 @@
+.product-bar {
+  display: flex;
+}
+
+.product-first {
+  flex: auto;
+}
+
+.full-width {
+  width: 100%;
+}
+
+.block {
+  padding: 3px;
+}

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

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

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

@@ -0,0 +1,23 @@
+import { Component, OnInit, Input, ChangeDetectorRef } from '@angular/core';
+import { ProductsService } from '../../../../services/products.service';
+import { ProductViewModel } from '../../../../swagger/SwaggerClient';
+
+@Component({
+  selector: 'app-beheer-products-product',
+  templateUrl: './beheer-products-product.component.html',
+  styleUrls: ['./beheer-products-product.component.scss']
+})
+export class BeheerProductsProductComponent implements OnInit {
+
+  @Input() ProductViewModel: ProductViewModel;
+
+  constructor(public ProductsService: ProductsService, private ChangeDetectorRef: ChangeDetectorRef) { }
+
+  public ResetImport(): void {
+    this.ProductsService.ResetImport(this.ProductViewModel.id, -1, this.ChangeDetectorRef);
+  }
+
+  ngOnInit(): void {
+  }
+
+}

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

@@ -0,0 +1,96 @@
+<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 gap">
+        <div class="displayflex flex-auto gap">
+          <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>
+
+          <button mat-raised-button (click)="ProductsService.Reload(this.ChangeDetectorRef)">
+            Refresh
+          </button>
+        </div>
+
+        <div class="displayflex gap" style="text-align: right;">
+          <button mat-raised-button (click)="Status()">
+            Status
+          </button>
+          <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 [ngClass]="{'selected' : ProductsService.ProductViewModel == product, 'warning': !product.imported || !product.connected}">
+                  <td (click)="SelectProduct(product)" class="table-row"><span class="importspan">{{ GetImportStatus(product) }}</span></td>
+                  <td (click)="SelectProduct(product)" class="table-row">{{ product.id }}</td>
+                  <td (click)="SelectProduct(product)" class="table-row">{{ product.name }}</td>
+                  <td (click)="SelectProduct(product)" class="table-row">{{ 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

@@ -0,0 +1,89 @@
+.full-width {
+  width: 100%;
+}
+
+.full-height {
+  height: 100%;
+}
+
+.gap {
+    gap: 3px;
+}
+
+.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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,175 @@
+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 Status(): void {
+    this.ProductsService.CheckStatus(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?.id == product.id) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public SelectProduct(product: ProductViewModel) {
+    this.ProductsService.ProductViewModel = product;
+    this.ProductsService.BCBProductViewModel = undefined;
+
+    this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+  }
+
+  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-rangeinput/beheer-rangeinput.component.html

@@ -0,0 +1,24 @@
+<div class="filter-name">
+  <div class="flexauto">
+    <mat-form-field appearance="fill" class="full-width">
+      <mat-label>Name</mat-label>
+      <input matInput [(ngModel)]="rangeinput.name">
+    </mat-form-field>
+  </div>
+  <div class="save-div">
+    <button mat-raised-button (click)="Save()">Save</button>
+  </div>
+</div>
+<div>
+  <div class="filter-name">
+    <div class="flexauto">
+      Requires
+    </div>
+    <button mat-raised-button (click)="RequireRangeInputFilterOption()">FilterOption</button>
+  </div>
+
+  <div *ngFor="let option of rangeinput.requiresRangeInputFilterOptions" class="required-option" [ngClass]="{ 'AND': option.filterOptionRequiredType == 0, 'OR': option.filterOptionRequiredType == 1 }">
+    {{ option.requiredFilterName }}: {{ option.requiredFilterOptionName }}
+    <button mat-raised-button (click)="RemoveRequireRangeInputFilterOption(option)">Remove</button>
+  </div>
+</div>