fabrikantencore 2.0.5 → 2.0.7

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

@@ -0,0 +1,16 @@
+<div class="container" [ngClass]="{'warning': !opbouw.connected, 'normal': opbouw.connected }">
+  <div class="row" (click)="Toggle()">
+    <div class="icon-td">
+      <mat-icon *ngIf="!opbouw.open">expand_more</mat-icon>
+      <mat-icon *ngIf="opbouw.open">expand_less</mat-icon>
+    </div>
+    <div class="eigenschapcel" colspan="2">
+      {{opbouw?.name}}
+    </div>
+  </div>
+  <div *ngIf="opbouw.open" class="main-block">
+    <div *ngFor="let ebo of opbouw.ebos" [ngClass]="{'warning': !ebo.connected}">
+      <app-beheer-products-ebo [ebo]="ebo"></app-beheer-products-ebo>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,51 @@
+.card {
+  margin: 3px;
+}
+
+.full-width {
+  width: 100%;
+}
+
+.row {
+  cursor: pointer;
+  display: flex;
+}
+
+.main-block {
+  padding-left: 25px;
+}
+
+.container {
+  margin: 5px;
+  padding: 5px;
+  border: 1px solid #000;
+}
+
+.eigenschapcel {
+  flex: auto;
+}
+
+.optiecel {
+  border-bottom: 1px solid #000;
+}
+
+.optiecellast {
+  width: 50%;
+}
+
+.icon-td {
+  width: 24px;
+  height: 24px;
+}
+
+.text-div {
+  flex: auto;
+}
+
+.warning {
+  background-color: lightcoral;
+}
+
+.normal {
+  background-color: white;
+}

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

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

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

@@ -0,0 +1,64 @@
+<div class="container" [ngClass]="{'warning': !eigenschap.connected, 'normal': eigenschap.connected}">
+  <div class="row" (click)="Toggle()">
+    <div class="icon-td">
+      <mat-icon *ngIf="!eigenschap.open && Show()">expand_more</mat-icon>
+      <mat-icon *ngIf="eigenschap.open && Show()">expand_less</mat-icon>
+    </div>
+    <div class="eigenschapcel" colspan="2">
+      {{eigenschap?.name}}
+    </div>
+  </div>
+  <div *ngIf="eigenschap.open">
+    <div *ngFor="let bereik of eigenschap.bereiken" class="bereik">
+      <app-beheer-products-eigenschap-bereik [bereik]="bereik"></app-beheer-products-eigenschap-bereik>
+    </div>
+    <div *ngIf="eigenschap.bereiken.length > 0 && eigenschap.rangeInputs != null">
+      <div *ngIf="eigenschap.rangeInputs.length == 0">
+        <button mat-raised-button (click)="ConnectRange()">
+          Range
+        </button>
+      </div>
+      <div *ngFor="let range of eigenschap.rangeInputs">
+        {{ range.rangeInputModel.name }}
+
+        <button mat-raised-button>
+          Remove
+        </button>
+      </div>
+    </div>
+    <div *ngFor="let optie of eigenschap.opties" [ngClass]="{'warning': !optie.connected}">
+      <div class="text-div">{{ optie.name }}</div>
+      <div>
+        <div *ngIf="!optie.connected" class="button-row">
+          <button mat-raised-button (click)="Connect(optie.id, eigenschap.name, optie.name)">
+            FilterOption
+          </button>
+          <button mat-raised-button (click)="ConnectMany(optie.id)">
+            FilterOptionMany
+          </button>
+          <button mat-raised-button (click)="ConnectCategory()">
+            Category
+          </button>
+          <button mat-raised-button (click)="Ignore(optie.id)">
+            Ignore
+          </button>
+        </div>
+        <div *ngFor="let connect of optie.bcbEigenschapOptieFilterOptionViewModels">
+          <b>{{ connect.filterOptionViewModel.filterName }}: {{ connect.filterOptionViewModel.name }}</b>&nbsp;
+          <button mat-raised-button>
+            Remove
+          </button>
+        </div>
+        <div *ngFor="let connect of optie.bcbEigenschapOptieCategoryViewModels">
+          <b>{{ connect.categoryViewModel.name }}</b>&nbsp;
+          <button mat-raised-button>
+            Remove
+          </button>
+        </div>
+        <div *ngIf="optie.ignore">
+          <b>Ignore</b>&nbsp;
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,41 @@
+
+.row {
+  cursor: pointer;
+  display: flex;
+}
+
+.displayflex {
+  display: flex;
+}
+
+.eigenschapcel {
+  flex: auto;
+}
+
+.button-row {
+  display: flex;
+  gap: 4px;
+}
+
+.container {
+  margin: 5px;
+  padding: 5px;
+  border: 1px solid #000;
+}
+
+.icon-td {
+  width: 24px;
+  height: 24px;
+}
+
+.text-div {
+  flex: auto;
+}
+
+.warning {
+  background-color: lightcoral;
+}
+
+.normal {
+  background-color: white;
+}

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

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

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

@@ -0,0 +1,147 @@
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { ImportSetsService } from '../../../../services/importsets.service';
+import { ProductsService } from '../../../../services/products.service';
+import { ProductsApiClient, ConnectBCBEigenschapRequest, ConnectManyNameRequest, ConnectManyNameResponse, ConnectEigenschapOptieResponse, BCBEigenschapViewModel, ConnectEigenschapOptieRequest } from '../../../../swagger/SwaggerClient';
+import { BeheerConnectCategoryDialogComponent } from '../../beheer-connect-category-dialog/beheer-connect-category-dialog.component';
+import { BeheerProductsConnectManynameDialogComponent } from '../beheer-products-connect-manyname-dialog/beheer-products-connect-manyname-dialog.component';
+import { BeheerProductsConnectRangeinputComponent } from '../beheer-products-connect-rangeinput/beheer-products-connect-rangeinput.component';
+import { BeheerProductsKoppelFilteroptionDailogComponent } from './../beheer-products-koppel-filteroption-dailog/beheer-products-koppel-filteroption-dailog.component';
+
+@Component({
+  selector: 'app-beheer-products-eigenschap',
+  templateUrl: './beheer-products-eigenschap.component.html',
+  styleUrls: ['./beheer-products-eigenschap.component.scss']
+})
+export class BeheerProductsEigenschapComponent implements OnInit {
+
+  @Input() eigenschap: BCBEigenschapViewModel;
+
+  constructor(
+    public ImportSetsService: ImportSetsService,
+    public ProductsService: ProductsService,
+    public dialog: MatDialog,
+    private ProductsApiClient: ProductsApiClient,
+    private ChangeDetectorRef: ChangeDetectorRef) { }
+
+  ngOnInit(): void {
+  }
+
+  public Toggle(): void {
+    this.eigenschap.open = !this.eigenschap.open;
+  }
+
+  public Connect(id: number, filter: string, option: string): void {
+    var dialogRef = this.dialog.open(BeheerProductsKoppelFilteroptionDailogComponent, {
+      data: {
+        location: this.eigenschap.location,
+        bcbeigenschapoptieid: id,
+        suggestedfilter: filter,
+        suggestedoption: option
+      }
+    });
+
+    dialogRef.afterClosed().subscribe((result: any) => {
+      if (result != null) {
+        if (result.filteroption != null && result.filteroption > 0) {
+          if (this.ProductsService.BCBProductViewModel != null) {
+            var request = new ConnectEigenschapOptieRequest();
+
+            request.bcbEigenschapOptieId = id;
+            request.filterOptionId = result.filteroption;
+            request.bcbProductId = this.ProductsService.BCBProductViewModel.id;
+            request.location = this.eigenschap.location;
+
+            this.ProductsApiClient.connectBCBEigenschapOptieFilterOption(request).subscribe(() => {
+              this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+            }, (error: Response) => {
+              alert(error);
+            });
+          }
+        }
+        else if (result.filter != null) {
+          var request2 = new ConnectManyNameRequest();
+
+          request2.bcbProductEigenschapOptieId = id;
+          request2.filterId = result.filter;
+
+          this.ProductsApiClient.connectManyName(request2).subscribe((model: ConnectManyNameResponse) => {
+            this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+          }, (error: Response) => {
+            alert(error);
+          });
+        }
+      }
+    });
+  }
+
+  public ConnectMany(id: number): void {
+    if (confirm("Weet je het zeker?")) {
+      var request = new ConnectBCBEigenschapRequest();
+
+      request.bcbEigenschapId = this.eigenschap.id;
+      request.bcbImportSetId = this.ImportSetsService.BCBImportSetSelected;
+
+      this.ProductsApiClient.connectBCBEigenschapFilter(request).subscribe(() => {
+        this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+      }, (error: Response) => {
+        alert(error);
+      });
+    }
+  }
+
+  public Ignore(id: number): void {
+    if (this.ProductsService.BCBProductViewModel != null) {
+      var request = new ConnectEigenschapOptieRequest();
+
+      request.bcbEigenschapOptieId = id;
+      request.filterOptionId = -1;
+      request.bcbProductId = this.ProductsService.BCBProductViewModel.id;
+      request.location = this.eigenschap.location;
+
+      this.ProductsApiClient.ignoreBCBEigenschapOptieFilterOption(request).subscribe(() => {
+        this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+      }, (error: Response) => {
+        alert(error);
+      });
+    }
+  }
+
+  public ConnectRange(): void {
+    var dialogRef = this.dialog.open(BeheerProductsConnectRangeinputComponent, {
+      data: {
+        bcbeigenschapid: this.eigenschap.id,
+        location: this.eigenschap.location
+      }
+    });
+  }
+
+  public ConnectCategory(): void {
+    if (confirm("Weet je het zeker?")) {
+      var request = new ConnectBCBEigenschapRequest();
+
+      request.bcbEigenschapId = this.eigenschap.id;
+      request.bcbImportSetId = this.ImportSetsService.BCBImportSetSelected;
+
+      this.ProductsApiClient.connectBCBEigenschapCategory(request).subscribe(() => {
+        this.ProductsService.LoadProduct(this.ChangeDetectorRef);
+      }, (error: Response) => {
+        alert(error);
+      });
+    }
+  }
+
+  public Show(): boolean {
+    if (this.eigenschap?.opties?.length != null &&
+      this.eigenschap.opties.length > 0) {
+      return true;
+    }
+
+    if (this.eigenschap?.bereiken?.length != null &&
+      this.eigenschap.bereiken.length > 0) {
+      return true;
+    }
+
+    return false;
+  }
+}

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

@@ -0,0 +1,5 @@
+<div class="container">
+  <div class="item">{{ bereik.typeField }}</div>
+  <div class="item">Minimum: {{ bereik.minimum }} (inclusief: {{ bereik.inclusiefMinimum }})</div>
+  <div class="item">Maximum: {{ bereik.maximum }} (inclusief: {{ bereik.inclusiefMaximum }})</div>
+</div>

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

@@ -0,0 +1,7 @@
+.container {
+  display: flex;
+}
+
+.item {
+  flex: auto;
+}

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

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

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

@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { BCBEigenschapBereikViewModel } from '../../../../swagger/SwaggerClient';
+
+@Component({
+  selector: 'app-beheer-products-eigenschap-bereik',
+  templateUrl: './beheer-products-eigenschap-bereik.component.html',
+  styleUrls: ['./beheer-products-eigenschap-bereik.component.scss']
+})
+export class BeheerProductsEigenschapBereikComponent implements OnInit {
+
+  @Input() bereik: BCBEigenschapBereikViewModel;
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

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

@@ -0,0 +1,97 @@
+<div *ngIf="Loading()">
+  <app-fab-loader></app-fab-loader>
+</div>
+
+<div *ngIf="!Loading()">
+  <mat-tab-group>
+    <mat-tab label="Nieuwe filter">
+      <div class="bar">
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Filter</mat-label>
+          <input matInput [(ngModel)]="FilterNaamNieuw">
+        </mat-form-field>
+
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Optie</mat-label>
+          <input matInput (keyup)="handleKeyUpFilter($event)" [(ngModel)]="FilterOptionNaamNieuw">
+        </mat-form-field>
+      </div>
+
+      <div class="bar tool-bar">
+        <button mat-raised-button (click)="NieuwFilterToevoegen()">Toevoegen</button>
+      </div>
+    </mat-tab>
+    <mat-tab label="Nieuwe optie">
+      <div class="bar">
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Filter</mat-label>
+          <mat-select [(ngModel)]="FilterSelected">
+            <mat-option *ngFor="let filter of FiltersViewModel.filterViewModels" [value]="filter.id">
+              {{filter.name}}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Optie</mat-label>
+          <input matInput (keyup)="handleKeyUpFilterOption($event)" [(ngModel)]="FilterOptionNaamNieuw">
+        </mat-form-field>
+      </div>
+
+      <div class="bar tool-bar">
+        <button mat-raised-button (click)="NieuwFilterOptionToevoegen()">Toevoegen</button>
+      </div>
+    </mat-tab>
+    <mat-tab label="Bestaand">
+
+      <div class="bar">
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Filter</mat-label>
+          <mat-select [(ngModel)]="FilterSelected">
+            <mat-option *ngFor="let filter of FiltersViewModel.filterViewModels" [value]="filter.id">
+              {{filter.name}}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>Optie</mat-label>
+          <mat-select [(ngModel)]="FilterOptionSelected">
+            <mat-option *ngFor="let filteroption of GetSelectedFiltersOptions()" [value]="filteroption.id">
+              {{filteroption.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="Many Name">
+      <mat-form-field appearance="fill" class="full-width">
+        <mat-label>Filter</mat-label>
+        <mat-select [(ngModel)]="FilterSelected">
+          <mat-option *ngFor="let filter of FiltersViewModel.filterViewModels" [value]="filter.id">
+            {{filter.name}}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <app-beheer-connect-manyname></app-beheer-connect-manyname>
+
+      <div class="bar tool-bar">
+        <button mat-raised-button (click)="KoppelManyName()">Koppel</button>
+      </div>
+    </mat-tab>-->
+  </mat-tab-group>
+
+  <div class="options-container">
+    <div *ngFor="let location of ConnectEigenschapOptieResponse.locations">
+      <b>{{ location.location }}</b>
+      <div *ngFor="let ebo of location.ebos">
+        {{ ebo }}
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+.full-width {
+    width: 100%;
+}
+
+.options-container {
+    max-height: 300px;
+}
+
+.tool-bar {
+    padding: 2px;
+}

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

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