From 135df085140d63b0d037d74eda9f8735f88f0fef Mon Sep 17 00:00:00 2001
From: Florian Eisenmenger <floeis@MBP-von-Florian.fritz.box>
Date: Mon, 17 Jun 2024 15:42:17 +0200
Subject: [PATCH] bugfixing

---
 .../search-select/search-select.component.html            | 1 +
 .../_components/search-select/search-select.component.ts  | 4 +---
 .../documents/new-document/new-document.component.html    | 6 ++++--
 .../src/app/_views/posts/new-post/new-post.component.html | 5 +++--
 .../src/app/_views/posts/new-post/new-post.component.ts   | 1 -
 .../src/app/_views/posts/post-list/post-list.component.ts | 4 +++-
 .../products/assign-product/assign-product.component.html | 8 +++++---
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/matsen-tool/src/app/_components/search-select/search-select.component.html b/matsen-tool/src/app/_components/search-select/search-select.component.html
index 5ae07c4..3d6d2e5 100644
--- a/matsen-tool/src/app/_components/search-select/search-select.component.html
+++ b/matsen-tool/src/app/_components/search-select/search-select.component.html
@@ -26,6 +26,7 @@
                         </ng-container>
                         <ng-container *ngIf="column.columnType == COLUMN_TYPE_IMAGE">
                             <td  mat-cell *matCellDef="let element">
+                                X{{element.imageUrl}}X
                                 <img *ngIf="element.imageUrl !== null && element.imageUrl !== undefined"
                                      src="{{ getElementValue(element, column) }}" width="40" height="40"/>
                                 <img *ngIf="element.imageUrl === null || element.imageUrl === undefined"
diff --git a/matsen-tool/src/app/_components/search-select/search-select.component.ts b/matsen-tool/src/app/_components/search-select/search-select.component.ts
index 91fc11c..85c98e3 100644
--- a/matsen-tool/src/app/_components/search-select/search-select.component.ts
+++ b/matsen-tool/src/app/_components/search-select/search-select.component.ts
@@ -98,10 +98,8 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
         this.documentForm.get(this.formId)?.setValue(row.id);
         if (this.displayedDataSubResource !== undefined) {
             this.paragraphRef.nativeElement.textContent = row[this.displayedDataSubResource][this.displayedDataField];
-            console.log(row[this.displayedDataSubResource][this.displayedDataField]);
         } else {
             this.paragraphRef.nativeElement.textContent = row[this.displayedDataField];
-            console.log(row[this.displayedDataField]);
         }
         this.searchBoxFilled = true;
         this.searchBoxOpen = false;
@@ -141,7 +139,7 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
         res.columnHeader = columnHeader;
         res.columnType = columnType;
         res.field = field;
-        res.subResource = subResource
+        res.subResource = subResource;
         return res;
     }
 
diff --git a/matsen-tool/src/app/_views/documents/new-document/new-document.component.html b/matsen-tool/src/app/_views/documents/new-document/new-document.component.html
index f4097db..d709733 100644
--- a/matsen-tool/src/app/_views/documents/new-document/new-document.component.html
+++ b/matsen-tool/src/app/_views/documents/new-document/new-document.component.html
@@ -13,6 +13,7 @@
         </div>
 
         <div class="mb-3">
+            <label for="partner" class="form-label">{{ 'form.partner' | translate }}:</label>
             <app-search-select #partnerSearchSelect
                                [formId]="'partnerIri'"
                                [formLabelLangKey]="'form.partner'"
@@ -24,10 +25,11 @@
                                [dataSet]="document.partner"
             >
             </app-search-select>
-            <input type="hidden" formControlName="partner"/>
+            <input type="hidden" id="partner" formControlName="partner"/>
         </div>
 
         <div class="mb-3">
+            <label for="product" class="form-label">{{ 'form.product' | translate }}:</label>
             <app-search-select #productSearchSelect
                                [formId]="'productIri'"
                                [formLabelLangKey]="'form.product'"
@@ -39,7 +41,7 @@
                                [dataSet]="document.product"
             >
             </app-search-select>
-            <input type="hidden" formControlName="product"/>
+            <input type="hidden" id="product" formControlName="product"/>
         </div>
 
         <div class="mb-3" *ngIf="documentForm.get('documentUrl')?.value === null">
diff --git a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
index 88f4947..3be3244 100644
--- a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
+++ b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
@@ -11,6 +11,7 @@
         </div>
 
         <div class="mb-3">
+            <label for="product" class="form-label">{{ 'form.product' | translate }}:</label>
             <ng-container *ngIf="posting.saleIri === null || posting.saleIri === undefined">
                 <app-search-select *ngIf="this.posting.id === null || this.posting.id === undefined"
                                    #productSearchSelect
@@ -23,12 +24,12 @@
                                    [displayedDataField]="'name'"
                 >
                 </app-search-select>
-                <input type="hidden" *ngIf="this.posting.id === null || this.posting.id === undefined"
+                <input id="product" type="hidden" *ngIf="this.posting.id === null || this.posting.id === undefined"
                        formControlName="product"/>
             </ng-container>
             <input type="text"
                    *ngIf="posting.saleIri !== null && posting.saleIri !== undefined && (this.posting.id === null || this.posting.id === undefined)"
-                   class="form-control" disabled value="{{product?.name}}"/>
+                   class="form-control" disabled value="{{product.name}}"/>
             <input type="text" *ngIf="this.posting.id !== null && this.posting.id !== undefined" class="form-control"
                    disabled value="{{posting.product?.name}}"/>
         </div>
diff --git a/matsen-tool/src/app/_views/posts/new-post/new-post.component.ts b/matsen-tool/src/app/_views/posts/new-post/new-post.component.ts
index f5f9d30..a2aa401 100644
--- a/matsen-tool/src/app/_views/posts/new-post/new-post.component.ts
+++ b/matsen-tool/src/app/_views/posts/new-post/new-post.component.ts
@@ -49,7 +49,6 @@ export class NewPostComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        console.log(this.posting);
         this.postForm = FormGroupInitializer.initFormGroup(this.postForm, this.posting);
     }
 
diff --git a/matsen-tool/src/app/_views/posts/post-list/post-list.component.ts b/matsen-tool/src/app/_views/posts/post-list/post-list.component.ts
index fa2ca06..295c868 100644
--- a/matsen-tool/src/app/_views/posts/post-list/post-list.component.ts
+++ b/matsen-tool/src/app/_views/posts/post-list/post-list.component.ts
@@ -11,7 +11,6 @@ import {
 } from "@app/core/api/v1";
 import {MatTableDataSource} from "@angular/material/table";
 import {NewPostComponent} from "@app/_views/posts/new-post/new-post.component";
-import {NgbModal, NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
 import {AppHelperService} from "@app/_helpers/app-helper.service";
 import {PagingComponent} from "@app/_components/paging/paging.component";
 import {NewCommentComponent} from "@app/_views/posts/new-comment/new-comment.component";
@@ -141,6 +140,9 @@ export class PostListComponent implements OnInit, AfterViewInit {
         if (this.partner !== undefined) {
             post.partnerIri = this.partner?.id;
         }
+        if (this.contact !== undefined) {
+            post.contactIri = this.contact.id;
+        }
         if (this.sale !== undefined) {
             post.partnerIri = this.sale?.partnerIri;
             post.productIri = this.sale?.productIri;
diff --git a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html
index 2138cf6..89f429b 100644
--- a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html
+++ b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html
@@ -3,6 +3,7 @@
 <div class="spt-form">
     <form [formGroup]="form" (ngSubmit)="onSubmit()">
         <div class="mb-3" *ngIf="this.partnerProduct">
+            <label for="product" class="form-label">{{ 'form.product' | translate }}:</label>
             <app-search-select #productSearchSelect
                [formId]="'productIri'"
                [formLabelLangKey]="'form.product'"
@@ -12,11 +13,12 @@
                [searchSelectColDefs]="colDefProducts"
                [displayedDataField]="'name'"
             >
-                <input type="hidden" formControlName="productIri" value="{{partnerProduct.productIri}}"/>
+                <input type="hidden" id="product" formControlName="productIri" value="{{partnerProduct.productIri}}"/>
             </app-search-select>
         </div>
         <div class="mb-3" *ngIf="this.contactPartnerProduct">
-            <app-search-select #productSearchSelect
+            <label for="partnerProduct" class="form-label">{{ 'form.product' | translate }}:</label>
+            <app-search-select #partnerSearchSelect
                [formId]="'partnerProductIri'"
                [formLabelLangKey]="'form.product'"
                [documentForm]="form"
@@ -26,7 +28,7 @@
                [displayedDataField]="'name'"
                [displayedDataSubResource]="'product'"
             >
-                <input type="hidden" formControlName="partnerProductIri" value="{{contactPartnerProduct.partnerProductIri}}"/>
+                <input type="hidden" id="partnerProduct" formControlName="partnerProductIri" value="{{contactPartnerProduct.partnerProductIri}}"/>
             </app-search-select>
         </div>
         <button type="submit" class="btn btn-primary" [disabled]="form.invalid">{{'form.send' | translate}}</button>