From f8c646e69959a47faa3f81f1d723fda19224e71d Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 12 Jun 2024 13:24:54 +0200 Subject: [PATCH] dit und dat --- .../document-list/document-list.component.ts | 14 +++++++++++--- .../partner-list/partner-list.component.ts | 2 -- .../partners-detail/partners-detail.component.html | 6 ++++++ .../partners-detail/partners-detail.component.ts | 3 +++ .../products-detail/products-detail.component.html | 14 ++++++++++---- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/matsen-tool/src/app/_views/documents/document-list/document-list.component.ts b/matsen-tool/src/app/_views/documents/document-list/document-list.component.ts index 256a82c..9f8b002 100644 --- a/matsen-tool/src/app/_views/documents/document-list/document-list.component.ts +++ b/matsen-tool/src/app/_views/documents/document-list/document-list.component.ts @@ -1,5 +1,5 @@ -import {AfterViewInit, Component, OnInit, ViewChild} from '@angular/core'; -import {DocumentJsonld, DocumentService} from "@app/core/api/v1"; +import {AfterViewInit, Component, Input, OnInit, ViewChild} from '@angular/core'; +import {DocumentJsonld, DocumentService, PartnerJsonld, ProductJsonld} from "@app/core/api/v1"; import {AppHelperService} from "@app/_helpers/app-helper.service"; import {MatSort, Sort} from "@angular/material/sort"; import {Subscription} from "rxjs"; @@ -15,6 +15,8 @@ import {NewDocumentComponent} from "@app/_views/documents/new-document/new-docum }) export class DocumentListComponent implements OnInit, AfterViewInit { + @Input() public product!: ProductJsonld; + @Input() public partner!: PartnerJsonld; @ViewChild(MatSort) sort; @ViewChild("pagingComponent", { static: false }) pagingComponent!: PagingComponent; @@ -49,7 +51,13 @@ export class DocumentListComponent implements OnInit, AfterViewInit { getData = () => { this.documentsSub = this.documentService.documentsGetCollection( this.pagingComponent.getPageIndex(), - this.pagingComponent.getPageSize() + this.pagingComponent.getPageSize(), + undefined, + undefined, + this.partner !== undefined ? this.partner.id : undefined, + undefined, + this.product !== undefined ? this.product.id : undefined + ).subscribe( data => { this.documents = data["hydra:member"]; diff --git a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts index b84adc8..73e4eea 100644 --- a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts +++ b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts @@ -132,8 +132,6 @@ export class PartnerListComponent implements OnInit, AfterViewInit { } getPartnerProducts = (searchValue = undefined) => { - console.log(this.partnerType); - console.log(searchValue); this.partnersSub = this.partnerProductService.partnerProductsGetCollection( this.pagingComponent.getPageIndex(), this.pagingComponent.getPageSize(), diff --git a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html index d219f58..8b86183 100644 --- a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html +++ b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.html @@ -84,3 +84,9 @@ > + + + + diff --git a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts index 2cbd7f2..051be7c 100644 --- a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts +++ b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts @@ -16,6 +16,7 @@ import {ContactListComponent} from "@app/_views/contacts/contact-list/contact-li import {TaskListComponent} from "@app/_views/tasks/task-list/task-list.component"; import {ProductListComponent} from "@app/_views/products/product-list/product-list.component"; import {SaleListComponent} from "@app/_views/sales/sale-list/sale-list.component"; +import {DocumentListComponent} from "@app/_views/documents/document-list/document-list.component"; @Component({ selector: 'app-partners-detail', @@ -34,6 +35,8 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { @ViewChild("postListComponent", { static: false }) postsComponent!: PostListComponent; @ViewChild("toggleSales", { static: true }) toggleSales!: ToggleComponent; @ViewChild("salesListComponent", { static: false }) salesListComponent!: SaleListComponent; + @ViewChild("toggleDocuments", { static: true }) toggleDocuments!: ToggleComponent; + @ViewChild("documentsListComponent", { static: false }) documentsListComponent!: DocumentListComponent; protected user: User | null; diff --git a/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html b/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html index 38edf4f..a385eb3 100644 --- a/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html +++ b/matsen-tool/src/app/_views/products/products-detail/products-detail.component.html @@ -19,10 +19,10 @@
{{product.name}} + src="{{product.imageUrl}}" width="247" height="94" + alt="{{product.name}}" title="{{product.name}}"/> + src="/assets/images/icons/dummy-product.png" width="247" height="94" alt=""/>
+ + + + \ No newline at end of file