todos

matsen-tool/src/app/_components/paging/paging.component.ts

@@ -1,10 +1,5 @@
-import {AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild} from '@angular/core';
+import {ChangeDetectorRef, Component, Input, OnInit, ViewChild} from '@angular/core';
 import {MatPaginator, MatPaginatorIntl, PageEvent} from "@angular/material/paginator";
-import {NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
-import {Observable, throwError} from "rxjs";
-import {MatTableDataSource} from "@angular/material/table";
-import {AppHelperService} from "@app/_helpers/app-helper.service";
-import {Sort} from "@angular/material/sort";
 
 @Component({
   selector: 'app-paging',

matsen-tool/src/app/_forms/apiForms.ts

@@ -480,6 +480,8 @@ export const taskForm = new FormGroup({
   partner: new FormControl(null, []),
   partnerName: new FormControl(null, []),
   partnerType: new FormControl(null, []),
+  product: new FormControl(null, [Validators.required]),
+  productName: new FormControl(null, []),
   contact: new FormControl(null, []),
   contactName: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),
@@ -500,6 +502,8 @@ export const taskJsonhalForm = new FormGroup({
   partner: new FormControl(null, []),
   partnerName: new FormControl(null, []),
   partnerType: new FormControl(null, []),
+  product: new FormControl(null, [Validators.required]),
+  productName: new FormControl(null, []),
   contact: new FormControl(null, []),
   contactName: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),
@@ -519,6 +523,8 @@ export const taskJsonldForm = new FormGroup({
   partner: new FormControl(null, []),
   partnerName: new FormControl(null, []),
   partnerType: new FormControl(null, []),
+  product: new FormControl(null, [Validators.required]),
+  productName: new FormControl(null, []),
   contact: new FormControl(null, []),
   contactName: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),

matsen-tool/src/app/_views/posts/new-post/new-post.component.html

@@ -11,13 +11,13 @@
         </div>
 
         <div class="mb-3">
-            <app-search-input #partnerProductSearchInput
-                              [formId]="'product'"
-                              [formLabelLangKey]="'form.product'"
-                              [dataField]="'partnerName'"
-                              [documentForm]="postForm"
-                              [documentFormField]="'partnerName'"
-                              [fetchFunction]="fetchPartnerProducts">
+            <app-search-input #productSearchInput
+                  [formId]="'product'"
+                  [formLabelLangKey]="'form.product'"
+                  [dataField]="'partnerName'"
+                  [documentForm]="postForm"
+                  [documentFormField]="'partnerName'"
+                  [fetchFunction]="fetchProducts">
             </app-search-input>
             <input type="hidden" formControlName="product"/>
         </div>

matsen-tool/src/app/_views/posts/new-post/new-post.component.ts

@@ -2,7 +2,7 @@ import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angula
 import {ModalStatus} from "@app/_helpers/modal.states";
 import {FormGroup} from "@angular/forms";
 import {postForm} from "@app/_forms/apiForms";
-import {PartnerJsonld, PartnerProductService, PostJsonld, PostService} from "@app/core/api/v1";
+import {PartnerJsonld, PartnerProductService, PostJsonld, PostService, ProductService} from "@app/core/api/v1";
 import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer";
 import {AppHelperService} from "@app/_helpers/app-helper.service";
 import {Observable, Subscription} from "rxjs";
@@ -17,14 +17,14 @@ import {map} from "rxjs/operators";
 export class NewPostComponent implements OnInit {
     @Input() public posting!: PostJsonld;
     @Output() public submit: EventEmitter<ModalStatus> = new EventEmitter<ModalStatus>();
-    @ViewChild('partnerProductSearchInput', { static: false }) $partnerProductSearchInput!: SearchInputComponent;
+    @ViewChild('productSearchInput', { static: false }) $productSearchInput!: SearchInputComponent;
 
     protected postForm: FormGroup;
     protected postSub: Subscription;
 
     constructor(
         private postService: PostService,
-        private partnerProductService: PartnerProductService,
+        protected productService: ProductService,
         protected appHelperService: AppHelperService,
     ) {
         this.postForm = postForm;
@@ -33,22 +33,11 @@ export class NewPostComponent implements OnInit {
 
     ngOnInit(): void {
         this.postForm = FormGroupInitializer.initFormGroup(this.postForm, this.posting);
-        console.log(this.posting);
     }
 
-    fetchPartnerProducts = (term: string): Observable<{ id: any; name: any }[]> => {
-        return this.partnerProductService.partnerProductsGetCollection(
-            1,
-            50,
-            String(this.posting.partner),
-            undefined,
-            undefined,
-            undefined,
-            term
-        ).pipe(
-            map((response) =>
-                response['hydra:member'].map(
-                    partnerProduct => ({id: partnerProduct.product, name: partnerProduct.productName}))),
+    fetchProducts = (term: string): Observable<{ id: any; name: any }[]> => {
+        return this.productService.productsGetCollection(1, 50, term).pipe(
+            map((response) => response['hydra:member'].map(product => ({id: product.id, name: product.name}))),
         );
     }
 

matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html

@@ -3,18 +3,26 @@
 <div class="spt-form">
     <form [formGroup]="saleForm" (ngSubmit)="onSubmit()">
         <div class="mb-3">
-            <label for="partner" class="form-label">{{ 'form.partner' | translate }}:</label>
-            <input type="text" class="form-control" id="partner" [ngbTypeahead]="searchPartners"
-                   [inputFormatter]="formatter" [value]="saleForm.get('partnerName')?.value"
-                   [resultFormatter]="formatter" [editable]="false" (selectItem)="onPartnerSelect($event)"/>
+            <app-search-input #partnerSearchInput
+                  [formId]="'partner'"
+                  [formLabelLangKey]="'form.partner'"
+                  [dataField]="'partnerName'"
+                  [documentForm]="saleForm"
+                  [documentFormField]="'partnerName'"
+                  [fetchFunction]="fetchPartners">
+            </app-search-input>
             <input type="hidden" formControlName="partner"/>
         </div>
 
         <div class="mb-3">
-            <label for="product" class="form-label">{{ 'form.product' | translate }}:</label>
-            <input type="text" class="form-control" id="product" [ngbTypeahead]="searchProducts"
-                   [inputFormatter]="formatter" [value]="saleForm.get('productName')?.value"
-                   [resultFormatter]="formatter" [editable]="false" (selectItem)="onProductSelect($event)"/>
+            <app-search-input #productSearchInput
+                  [formId]="'product'"
+                  [formLabelLangKey]="'form.product'"
+                  [dataField]="'partnerName'"
+                  [documentForm]="saleForm"
+                  [documentFormField]="'partnerName'"
+                  [fetchFunction]="fetchProducts">
+            </app-search-input>
             <input type="hidden" formControlName="product"/>
         </div>
 

matsen-tool/src/app/_views/sales/new-sale/new-sale.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 import {
     MediaObjectService,
     PartnerJsonld,
@@ -15,6 +15,7 @@ import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer";
 import {saleForm} from "@app/_forms/apiForms";
 import {AppHelperService} from "@app/_helpers/app-helper.service";
 import {filter, map} from "rxjs/operators";
+import {SearchInputComponent} from "@app/_components/search-input/search-input.component";
 
 @Component({
     selector: 'app-new-sale',
@@ -24,6 +25,8 @@ import {filter, map} from "rxjs/operators";
 export class NewSaleComponent implements OnInit {
     @Input() public sale!: SaleJsonld;
     @Output() public submit: EventEmitter<ModalStatus> = new EventEmitter<ModalStatus>();
+    @ViewChild('partnerSearchInput', { static: false }) $partnerSearchInput!: SearchInputComponent;
+    @ViewChild('productSearchInput', { static: false }) $productSearchInput!: SearchInputComponent;
 
     protected saleForm: FormGroup;
     protected saleSub: Subscription;
@@ -46,48 +49,16 @@ export class NewSaleComponent implements OnInit {
         this.saleForm = FormGroupInitializer.initFormGroup(this.saleForm, this.sale);
     }
 
-    protected searchPartners: OperatorFunction<string, readonly {
-        id: any;
-        name: any
-    }[]> = (text$: Observable<string>) =>
-        text$.pipe(
-            debounceTime(200),
-            distinctUntilChanged(),
-            filter((term) => term.length >= 2),
-            switchMap((term) => this.fetchPartners(term)),
-            map((partners) => partners.slice(0, 10)),
-        );
-
-    protected searchProducts: OperatorFunction<string, readonly {
-        id: any;
-        name: any
-    }[]> = (text$: Observable<string>) =>
-        text$.pipe(
-            debounceTime(200),
-            distinctUntilChanged(),
-            filter((term) => term.length >= 2),
-            switchMap((term) => this.fetchProducts(term)),
-            map((products) => products.slice(0, 10)),
-        );
-
-    protected fetchPartners(term: string): Observable<{ id: any; name: any }[]> {
-        return this.partnerService.partnersGetCollection(1, 50, undefined, undefined, term).pipe(
-            map((response) => response['hydra:member'].map(partner => ({id: partner.id, name: partner.name}))),
-        );
-    }
-
-    protected fetchProducts(term: string): Observable<{ id: any; name: any }[]> {
+    fetchProducts = (term: string): Observable<{ id: any; name: any }[]> => {
         return this.productService.productsGetCollection(1, 50, term).pipe(
             map((response) => response['hydra:member'].map(product => ({id: product.id, name: product.name}))),
         );
     }
 
-    protected onPartnerSelect(selectedItem: any): void {
-        this.saleForm.get('partner')?.setValue(selectedItem.item.id);
-    }
-
-    protected onProductSelect(selectedItem: any): void {
-        this.saleForm.get('product')?.setValue(selectedItem.item.id);
+    fetchPartners = (term: string): Observable<{ id: any; name: any }[]> => {
+        return this.partnerService.partnersGetCollection(1, 50, undefined, undefined, term).pipe(
+            map((response) => response['hydra:member'].map(partner => ({id: partner.id, name: partner.name}))),
+        );
     }
 
     onSubmit() {

matsen-tool/src/app/_views/tasks/task-list/task-list.component.html

@@ -11,6 +11,7 @@
                 <div class="card p-3">
                     <div class="position-relative">
                         <h3 class="m-0" *ngIf="task.partner"><a href="/{{task.partnerType}}/{{this.appHelperService.extractId(task.partner)}}">{{task.partnerName}}</a></h3>
+                        <h3 class="m-0" *ngIf="task.product"><a href="/product/{{this.appHelperService.extractId(task.product)}}">{{task.productName}}</a></h3>
                         <span class="info d-flex position-absolute">
                                 <span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
                                 <span class="importance" [attr.data-importance]="task.prio"></span>

matsen-tool/src/app/core/api/v1/api/comment.service.ts

@@ -186,7 +186,7 @@ export class CommentService {
     /**
      * Retrieves a Comment resource.
      * Retrieves a Comment resource.
-     * @param id CommentApi identifier
+     * @param id Comment identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -261,7 +261,7 @@ export class CommentService {
     /**
      * Updates the Comment resource.
      * Updates the Comment resource.
-     * @param id CommentApi identifier
+     * @param id Comment identifier
      * @param comment The updated Comment resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/contact.service.ts

@@ -198,7 +198,7 @@ export class ContactService {
     /**
      * Retrieves a Contact resource.
      * Retrieves a Contact resource.
-     * @param id ContactApi identifier
+     * @param id Contact identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -273,7 +273,7 @@ export class ContactService {
     /**
      * Updates the Contact resource.
      * Updates the Contact resource.
-     * @param id ContactApi identifier
+     * @param id Contact identifier
      * @param contact The updated Contact resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/contactPartnerProduct.service.ts

@@ -198,7 +198,7 @@ export class ContactPartnerProductService {
     /**
      * Removes the ContactPartnerProduct resource.
      * Removes the ContactPartnerProduct resource.
-     * @param id ContactPartnerProductApi identifier
+     * @param id ContactPartnerProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -269,7 +269,7 @@ export class ContactPartnerProductService {
     /**
      * Retrieves a ContactPartnerProduct resource.
      * Retrieves a ContactPartnerProduct resource.
-     * @param id ContactPartnerProductApi identifier
+     * @param id ContactPartnerProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */

matsen-tool/src/app/core/api/v1/api/document.service.ts

@@ -210,7 +210,7 @@ export class DocumentService {
     /**
      * Retrieves a Document resource.
      * Retrieves a Document resource.
-     * @param id DocumentApi identifier
+     * @param id Document identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -285,7 +285,7 @@ export class DocumentService {
     /**
      * Updates the Document resource.
      * Updates the Document resource.
-     * @param id DocumentApi identifier
+     * @param id Document identifier
      * @param document The updated Document resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/partner.service.ts

@@ -218,7 +218,7 @@ export class PartnerService {
     /**
      * Retrieves a Partner resource.
      * Retrieves a Partner resource.
-     * @param id PartnerApi identifier
+     * @param id Partner identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -293,7 +293,7 @@ export class PartnerService {
     /**
      * Updates the Partner resource.
      * Updates the Partner resource.
-     * @param id PartnerApi identifier
+     * @param id Partner identifier
      * @param partner The updated Partner resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/partnerFollow.service.ts

@@ -222,7 +222,7 @@ export class PartnerFollowService {
     /**
      * Removes the PartnerFollow resource.
      * Removes the PartnerFollow resource.
-     * @param id PartnerFollowApi identifier
+     * @param id PartnerFollow identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -293,7 +293,7 @@ export class PartnerFollowService {
     /**
      * Retrieves a PartnerFollow resource.
      * Retrieves a PartnerFollow resource.
-     * @param id PartnerFollowApi identifier
+     * @param id PartnerFollow identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */

matsen-tool/src/app/core/api/v1/api/partnerProduct.service.ts

@@ -227,7 +227,7 @@ export class PartnerProductService {
     /**
      * Removes the PartnerProduct resource.
      * Removes the PartnerProduct resource.
-     * @param id PartnerProductApi identifier
+     * @param id PartnerProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -298,7 +298,7 @@ export class PartnerProductService {
     /**
      * Retrieves a PartnerProduct resource.
      * Retrieves a PartnerProduct resource.
-     * @param id PartnerProductApi identifier
+     * @param id PartnerProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */

matsen-tool/src/app/core/api/v1/api/post.service.ts

@@ -252,7 +252,7 @@ export class PostService {
     /**
      * Retrieves a Post resource.
      * Retrieves a Post resource.
-     * @param id PostingApi identifier
+     * @param id Post identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -327,7 +327,7 @@ export class PostService {
     /**
      * Updates the Post resource.
      * Updates the Post resource.
-     * @param id PostingApi identifier
+     * @param id Post identifier
      * @param postPostingPatch The updated Post resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/product.service.ts

@@ -196,7 +196,7 @@ export class ProductService {
     /**
      * Retrieves a Product resource.
      * Retrieves a Product resource.
-     * @param id ProductApi identifier
+     * @param id Product identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -271,7 +271,7 @@ export class ProductService {
     /**
      * Updates the Product resource.
      * Updates the Product resource.
-     * @param id ProductApi identifier
+     * @param id Product identifier
      * @param product The updated Product resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/sale.service.ts

@@ -210,7 +210,7 @@ export class SaleService {
     /**
      * Retrieves a Sale resource.
      * Retrieves a Sale resource.
-     * @param id SaleApi identifier
+     * @param id Sale identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -285,7 +285,7 @@ export class SaleService {
     /**
      * Updates the Sale resource.
      * Updates the Sale resource.
-     * @param id SaleApi identifier
+     * @param id Sale identifier
      * @param sale The updated Sale resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/task.service.ts

@@ -222,7 +222,7 @@ export class TaskService {
     /**
      * Retrieves a Task resource.
      * Retrieves a Task resource.
-     * @param id TaskApi identifier
+     * @param id Task identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -297,7 +297,7 @@ export class TaskService {
     /**
      * Updates the Task resource.
      * Updates the Task resource.
-     * @param id TaskApi identifier
+     * @param id Task identifier
      * @param task The updated Task resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/taskNote.service.ts

@@ -198,7 +198,7 @@ export class TaskNoteService {
     /**
      * Retrieves a TaskNote resource.
      * Retrieves a TaskNote resource.
-     * @param id TaskNoteApi identifier
+     * @param id TaskNote identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -273,7 +273,7 @@ export class TaskNoteService {
     /**
      * Updates the TaskNote resource.
      * Updates the TaskNote resource.
-     * @param id TaskNoteApi identifier
+     * @param id TaskNote identifier
      * @param taskNote The updated TaskNote resource
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.

matsen-tool/src/app/core/api/v1/api/user.service.ts

@@ -196,7 +196,7 @@ export class UserService {
     /**
      * Retrieves a User resource.
      * Retrieves a User resource.
-     * @param id UserApi identifier
+     * @param id User identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */

matsen-tool/src/app/core/api/v1/api/userProduct.service.ts

@@ -215,7 +215,7 @@ export class UserProductService {
     /**
      * Removes the UserProduct resource.
      * Removes the UserProduct resource.
-     * @param id UserProductApi identifier
+     * @param id UserProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -286,7 +286,7 @@ export class UserProductService {
     /**
      * Retrieves a UserProduct resource.
      * Retrieves a UserProduct resource.
-     * @param id UserProductApi identifier
+     * @param id UserProduct identifier
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */

matsen-tool/src/app/core/api/v1/model/task.ts

@@ -26,6 +26,8 @@ export interface Task {
     partner?: string | null;
     readonly partnerName?: string | null;
     readonly partnerType?: Task.PartnerTypeEnum | null;
+    product: string | null;
+    readonly productName?: string | null;
     contact?: string | null;
     readonly contactName?: string | null;
     prio: Task.PrioEnum;

matsen-tool/src/app/core/api/v1/model/taskJsonhal.ts

@@ -28,6 +28,8 @@ export interface TaskJsonhal {
     partner?: string | null;
     readonly partnerName?: string | null;
     readonly partnerType?: TaskJsonhal.PartnerTypeEnum | null;
+    product: string | null;
+    readonly productName?: string | null;
     contact?: string | null;
     readonly contactName?: string | null;
     prio: TaskJsonhal.PrioEnum;

matsen-tool/src/app/core/api/v1/model/taskJsonld.ts

@@ -30,6 +30,8 @@ export interface TaskJsonld {
     partner?: string | null;
     readonly partnerName?: string | null;
     readonly partnerType?: TaskJsonld.PartnerTypeEnum | null;
+    product: string | null;
+    readonly productName?: string | null;
     contact?: string | null;
     readonly contactName?: string | null;
     prio: TaskJsonld.PrioEnum;