sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop

Browse Source
This commit is contained in:
Lorenz Hilpert
2021-05-31 16:15:11 +02:00
parent 22e77f7fd0 eb07edaa8f
commit 79a0199234
17 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/page/catalog/src/lib/article-details/article-details.component.html
View File

@@ -117,7 +117,7 @@
<hr />
<div class="product-description">
<div class="product-description" *ngIf="item.texts?.length > 0">
<div class="info">
{{ item.texts[0].value }}
</div>

2
apps/page/catalog/src/lib/article-details/article-details.component.scss
View File

@@ -176,7 +176,7 @@
}
.product-actions {
@apply text-right px-5 pb-20;
@apply text-right px-5 pb-20 pt-2;
.cta-availabilities {
@apply text-brand border-none border-brand bg-white font-bold text-lg px-4 py-2 rounded-full;

5
apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.ts
View File

@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
import { Filter } from '@ui/filter';
import { cloneDeep } from 'lodash';
import { clone, cloneDeep } from 'lodash';
import { BehaviorSubject, Subscription } from 'rxjs';
import { first, map } from 'rxjs/operators';
import { ArticleSearchStore } from '../article-search-new.store';
@@ -22,6 +22,7 @@ export class ArticleSearchFilterComponent implements OnInit, OnDestroy {
readonly inputFilters$ = this.store.inputSelectorFilter$;
readonly mainFilters$ = this.store.mainFilter$;
queryCopy: string;
filtersCopy: Filter[];
inputFiltersCopy: Filter[];
mainFiltersCopy: Filter[];
@@ -96,12 +97,14 @@ export class ArticleSearchFilterComponent implements OnInit, OnDestroy {
}
async copyFilterLatestStatus() {
this.queryCopy = clone(this.store.query);
this.filtersCopy = cloneDeep(await this.filters$.pipe(first()).toPromise());
this.inputFiltersCopy = cloneDeep(await this.inputFilters$.pipe(first()).toPromise());
this.mainFiltersCopy = cloneDeep(await this.mainFilters$.pipe(first()).toPromise());
}
resetFilterToLatestStatus() {
this.store.setQuery({ query: this.queryCopy });
this.store.setFilter({ filter: this.filtersCopy });
this.store.setInputSelectorFilter({ filter: this.inputFiltersCopy });
this.store.setMainFilter({ filter: this.mainFiltersCopy });

4
apps/page/customer/src/lib/customer-create/customer-create-b2b.component.html
View File

@@ -32,7 +32,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>
@@ -141,7 +141,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="22">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

4
apps/page/customer/src/lib/customer-create/customer-create-branch.component.html
View File

@@ -18,7 +18,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>
@@ -138,7 +138,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="23">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

4
apps/page/customer/src/lib/customer-create/customer-create-guest.component.html
View File

@@ -17,7 +17,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>
@@ -143,7 +143,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="23">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

4
apps/page/customer/src/lib/customer-create/customer-create-online.component.html
View File

@@ -18,7 +18,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>
@@ -140,7 +140,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="23">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/payer-create/payer-create-b2b.component.html
View File

@@ -27,7 +27,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/payer-create/payer-create-b2c.component.html
View File

@@ -13,7 +13,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/payer-edit/payer-edit-b2b.component.html
View File

@@ -27,7 +27,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/payer-edit/payer-edit-b2c.component.html
View File

@@ -13,7 +13,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/shipping-create/shipping-create-b2b.component.html
View File

@@ -30,7 +30,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/shipping-create/shipping-create-b2c.component.html
View File

@@ -13,7 +13,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/shipping-edit/shipping-edit-b2b.component.html
View File

@@ -30,7 +30,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/address/shipping-edit/shipping-edit-b2c.component.html
View File

@@ -13,7 +13,7 @@
</ui-form-control>
<ui-form-control label="Titel">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/customer-data-edit/customer-data-edit-b2b.component.html
View File

@@ -23,7 +23,7 @@
</ui-form-control>
<ui-form-control label="Titel" variant="inline">
<ui-select formControlName="title" tabindex="5">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>

2
apps/page/customer/src/lib/customer-details/customer-data-edit/customer-data-edit-b2c.component.html
View File

@@ -11,7 +11,7 @@
</ui-form-control>
<ui-form-control label="Titel" variant="inline">
<ui-select formControlName="title" tabindex="2">
<ui-select-option value="Dipl. Ing." label="Dipl. Ing."></ui-select-option>
<ui-select-option value="Dipl.-Ing." label="Dipl.-Ing."></ui-select-option>
<ui-select-option value="Dr." label="Dr."></ui-select-option>
<ui-select-option value="Dr. med." label="Dr. med."></ui-select-option>
<ui-select-option value="Prof." label="Prof."></ui-select-option>