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

#678 [Trefferliste] [Kachel] Bookmark - Hinzugefügt

Browse Source
This commit is contained in:
Lorenz Hilpert
2020-07-02 10:31:15 +02:00
parent aa587de5ac
commit e96826c175
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/sales/src/app/modules/shelf/components/search-result-group/search-result-group-item.component.html
View File

@@ -1,4 +1,7 @@
<div class="paid isa-mt-9 isa-mb-9" *ngIf="!item.features?.paid">
<div class="tags">
<lib-icon name="tag_icon_preorder" width="30px"></lib-icon>
</div>
<div class="paid isa-mt-9 isa-mb-9" *ngIf="item.features?.paid">
<lib-icon height="24px" width="24px" name="Check_green_circle" class="isa-mr-10"></lib-icon>
<strong> {{ item.features?.paid }} </strong>
</div>

11
apps/sales/src/app/modules/shelf/components/search-result-group/search-result-group-item.component.scss
View File

@@ -1,5 +1,6 @@
:host {
display: block;
position: relative;
}
.grid-container {
@@ -75,8 +76,8 @@
width: 150px;
}
*:nth-child(2) {
}
// *:nth-child(2) {
// }
}
.paid {
@@ -88,3 +89,9 @@
height: 24px;
}
}
.tags {
position: absolute;
top: 0;
right: 130px;
}

15
apps/sales/src/app/modules/shelf/pages/shelf-search-results/shelf-search-results.component.html
View File

@@ -1,18 +1,3 @@
<!-- <div class="result-container">
<ng-container>
<cdk-virtual-scroll-viewport itemSize="300" #scroller [perfectScrollbar]="{minScrollbarLength: 20}">
<div *cdkVirtualFor="let order of ds; let last = last; let index = index">
<app-shelf-customer-order *ngIf="order != null; else loadingComponent" [index]="index" [last]="last"
[order]="order" [processId]="id"></app-shelf-customer-order>
</div>
<ng-template #loadingComponent>
<app-order-loading></app-order-loading>
</ng-template>
</cdk-virtual-scroll-viewport>
</ng-container></div> -->
<div class="result-container" #scroll>
<app-search-result-group class="isa-mb-10" *ngFor="let group of grouped$ | async; let i = index" [group]="group">
</app-search-result-group>

7
apps/sales/src/app/modules/shelf/pages/shelf-search-results/shelf-search-results.component.ts
View File

@@ -1,8 +1,8 @@
import { Subject, fromEvent, combineLatest } from 'rxjs';
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core';
import { Component, OnDestroy, OnInit, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core';
import { SearchStateFacade } from 'apps/sales/src/app/store/customer';
import { first, takeUntil, withLatestFrom, filter, tap } from 'rxjs/operators';
import { first, takeUntil } from 'rxjs/operators';
@Component({
selector: 'app-shelf-search-results',
@@ -20,7 +20,7 @@ export class ShelfSearchResultsComponent implements OnInit, OnDestroy {
fetching$ = this.searchStateFacade.fetching$;
constructor(private cdr: ChangeDetectorRef, private searchStateFacade: SearchStateFacade) {
constructor(private searchStateFacade: SearchStateFacade) {
this.searchStateFacade.clearResult();
}
@@ -46,7 +46,6 @@ export class ShelfSearchResultsComponent implements OnInit, OnDestroy {
}
async fetch(force = false) {
const scrollContainer: HTMLElement = this.scrollContainer.nativeElement;
const [hits, result, fetching] = await combineLatest([this.searchStateFacade.hits$, this.searchStateFacade.result$, this.fetching$])
.pipe(first())
.toPromise();