From 245a7c43604c36c48dd53cea6dede8db97cf8450 Mon Sep 17 00:00:00 2001
From: Florian Eisenmenger <floeis@MBP-von-Florian.fritz.box>
Date: Thu, 28 Mar 2024 16:07:35 +0100
Subject: [PATCH] bugfixes

---
 .../contacts-detail/contacts-detail.component.html   |  4 ++--
 .../contacts-detail/contacts-detail.component.ts     |  3 ++-
 matsen-tool/src/app/documents/documents.component.ts |  4 +++-
 .../new-document/new-document.component.html         |  2 +-
 matsen-tool/src/app/home/home.component.html         |  2 +-
 matsen-tool/src/app/home/home.component.ts           |  3 ++-
 .../partners-detail/partners-detail.component.html   |  6 +++---
 .../postings/new-comment/new-comment.component.html  |  2 +-
 .../postings/new-posting/new-posting.component.html  |  2 +-
 .../src/app/sales/new-sale/new-sale.component.html   |  2 +-
 .../sales/sales-detail/sales-detail.component.html   | 12 ++++++------
 .../app/sales/sales-detail/sales-detail.component.ts |  9 +++++++--
 .../tasks/new-task-note/new-task-note.component.html |  2 +-
 .../src/app/tasks/new-task/new-task.component.html   |  2 +-
 matsen-tool/src/app/tasks/tasks.component.html       |  4 ++--
 matsen-tool/src/app/tasks/tasks.component.ts         |  3 ++-
 16 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html
index d3f9d06..fda3e4d 100644
--- a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html
+++ b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html
@@ -39,7 +39,7 @@
                     </div>
                     <div>
                         <h3>{{ post.headline }}</h3>
-                        <p>{{ post.message }}</p>
+                        <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(post.message)"></p>
                     </div>
                     <span *ngIf="post.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"
                           data-action="edit" (click)="openModalEditPosting(post)"></span>
@@ -53,7 +53,7 @@
                             <p>{{ comment.ownerName }}</p>
                         </div>
                         <div>
-                            <p>{{ comment.message }}</p>
+                            <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(comment.message)"></p>
                         </div>
                         <span *ngIf="comment.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"
                               data-action="edit" (click)="openModalEditComment(comment)"></span>
diff --git a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts
index 895d0f2..d749a78 100644
--- a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts
+++ b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts
@@ -46,7 +46,8 @@ export class ContactsDetailComponent implements OnInit, AfterViewInit {
         private accountService: AccountService,
         private route: ActivatedRoute,
         private postService: PostService,
-        private modalService: NgbModal
+        private modalService: NgbModal,
+        protected apiConverter: ApiConverter
     ) {
         this.user = this.accountService.userValue;
 
diff --git a/matsen-tool/src/app/documents/documents.component.ts b/matsen-tool/src/app/documents/documents.component.ts
index 71e1d64..602df31 100644
--- a/matsen-tool/src/app/documents/documents.component.ts
+++ b/matsen-tool/src/app/documents/documents.component.ts
@@ -12,6 +12,7 @@ import {NewDocumentComponent} from "@app/documents/new-document/new-document.com
 import {TranslateModule} from "@ngx-translate/core";
 import {ModalStatus} from "@app/_helpers/modal.states";
 import {NewCommentComponent} from "@app/postings/new-comment/new-comment.component";
+import {ApiConverter} from "@app/_helpers/api.converter";
 
 @Component({
     selector: 'app-documents',
@@ -41,7 +42,8 @@ export class DocumentsComponent {
     constructor(
         private router: Router,
         private modalService: NgbModal,
-        private documentService: DocumentService
+        private documentService: DocumentService,
+        protected apiConverter: ApiConverter
     ) {
         this.sort = new MatSort();
         this.displayedColumns = ['pos', 'name', 'description', 'partnerName', 'productName', 'createdAt', 'createdByName', 'download', 'edit'];
diff --git a/matsen-tool/src/app/documents/new-document/new-document.component.html b/matsen-tool/src/app/documents/new-document/new-document.component.html
index 8673075..1e3433a 100644
--- a/matsen-tool/src/app/documents/new-document/new-document.component.html
+++ b/matsen-tool/src/app/documents/new-document/new-document.component.html
@@ -9,7 +9,7 @@
 
         <div class="mb-3">
             <label for="description" class="form-label">{{ 'form.description' | translate }}:</label>
-            <input type="text" class="form-control" id="description" formControlName="description"/>
+            <textarea class="form-control" id="description" formControlName="description" cols="50" rows="5"></textarea>
         </div>
 
         <div class="mb-3">
diff --git a/matsen-tool/src/app/home/home.component.html b/matsen-tool/src/app/home/home.component.html
index 368c90f..55d4e42 100644
--- a/matsen-tool/src/app/home/home.component.html
+++ b/matsen-tool/src/app/home/home.component.html
@@ -80,7 +80,7 @@
                     </div>
                     <div class="collapse" id="collapse-{{ApiConverter.extractId(task.id)}}">
                         <div class="pt-3 pe-5 position-relative">
-                            <p class="m-0">{{task.description}}</p>
+                            <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(task.description)"></p>
                             <p>Zugewiesen an: {{task.assignedToName}}</p>
                             <span *ngIf="task.createdBy === user?.id" class="position-absolute bi bi-pencil p-2"
                                   data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
diff --git a/matsen-tool/src/app/home/home.component.ts b/matsen-tool/src/app/home/home.component.ts
index e77bcf6..2ae2dba 100644
--- a/matsen-tool/src/app/home/home.component.ts
+++ b/matsen-tool/src/app/home/home.component.ts
@@ -57,7 +57,8 @@ export class HomeComponent implements OnInit, AfterViewInit {
         private accountService: AccountService,
         private postService: PostService,
         private userService: UserService,
-        private taskService: TaskService
+        private taskService: TaskService,
+        protected apiConverter: ApiConverter
     ) {
         this.user = this.accountService.userValue;
         // this.accountService.user.subscribe(x => this.user = x);
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
index 074ed3e..c88c2aa 100644
--- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
+++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
@@ -108,7 +108,7 @@
                 </div>
                 <div class="collapse" id="collapse-{{ApiConverter.extractId(task.id)}}">
                     <div class="pt-3 pe-5 position-relative">
-                        <p class="m-0">{{ task.description }}</p>
+                        <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(task.description)"></p>
                         <p>Zugewiesen an: {{ task.assignedToName }}</p>
                         <span *ngIf="task.createdBy === user?.id" class="position-absolute bi bi-pencil p-2"
                               data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
@@ -168,7 +168,7 @@
                     </div>
                     <div>
                         <h3>{{ post.headline }}</h3>
-                        <p>{{ post.message }}</p>
+                        <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(post.message)"></p>
                     </div>
                     <span *ngIf="post.owner === user?.id" class="position-absolute bi bi-pencil p-2"
                           data-type="user-tool"
@@ -183,7 +183,7 @@
                             <p>{{ comment.ownerName }}</p>
                         </div>
                         <div>
-                            <p>{{ comment.message }}</p>
+                            <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(comment.message)"></p>
                         </div>
                         <span *ngIf="comment.owner === user?.id" class="position-absolute bi bi-pencil p-2"
                               data-type="user-tool" data-action="edit" (click)="openModalEditComment(comment)"></span>
diff --git a/matsen-tool/src/app/postings/new-comment/new-comment.component.html b/matsen-tool/src/app/postings/new-comment/new-comment.component.html
index e99e7f9..f812585 100644
--- a/matsen-tool/src/app/postings/new-comment/new-comment.component.html
+++ b/matsen-tool/src/app/postings/new-comment/new-comment.component.html
@@ -4,7 +4,7 @@
     <form [formGroup]="commentForm" (ngSubmit)="onSubmit()">
         <div class="mb-3">
             <label for="message" class="form-label">{{'form.comment' | translate}}:</label>
-            <input type="text" class="form-control" id="message" formControlName="message" />
+            <textarea class="form-control" id="message" formControlName="message" cols="50" rows="5"></textarea>
             <div class="form-text" *ngIf="commentForm.get('message')?.invalid && commentForm.get('message')?.touched">
                 {{'form.comment' | translate}} {{'form.mandatory' | translate}}.
             </div>
diff --git a/matsen-tool/src/app/postings/new-posting/new-posting.component.html b/matsen-tool/src/app/postings/new-posting/new-posting.component.html
index 86e9210..e27dca9 100644
--- a/matsen-tool/src/app/postings/new-posting/new-posting.component.html
+++ b/matsen-tool/src/app/postings/new-posting/new-posting.component.html
@@ -12,7 +12,7 @@
 
         <div class="mb-3">
             <label for="message" class="form-label">{{'form.message' | translate}}:</label>
-            <input type="text" class="form-control" id="message" formControlName="message" />
+            <textarea class="form-control" id="message" formControlName="message" cols="50" rows="5"></textarea>
             <div class="form-text" *ngIf="postForm.get('message')?.invalid && postForm.get('message')?.touched">
                 {{'form.message' | translate}} {{'form.mandatory' | translate}}.
             </div>
diff --git a/matsen-tool/src/app/sales/new-sale/new-sale.component.html b/matsen-tool/src/app/sales/new-sale/new-sale.component.html
index ad100d2..2e42519 100644
--- a/matsen-tool/src/app/sales/new-sale/new-sale.component.html
+++ b/matsen-tool/src/app/sales/new-sale/new-sale.component.html
@@ -33,7 +33,7 @@
 
         <div class="mb-3">
             <label for="comment" class="form-label">{{ 'form.comment' | translate }}:</label>
-            <input type="text" class="form-control" id="comment" formControlName="comment" />
+            <textarea class="form-control" id="comment" formControlName="comment" cols="50" rows="5"></textarea>
         </div>
 
 <!--        <div class="mb-3">-->
diff --git a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html
index aa0415a..e0ab762 100644
--- a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html
+++ b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html
@@ -13,11 +13,11 @@
                     <dt *ngIf="sale.profit">{{'overview.profit' | translate}}:</dt>
                     <dd *ngIf="sale.profit">{{ sale.profit }}</dd>
                     <dt *ngIf="sale.comment">{{'overview.comment' | translate}}:</dt>
-                    <dd *ngIf="sale.comment">{{ sale.comment }}</dd>
+                    <dd *ngIf="sale.comment" [innerHTML]="apiConverter.getSafeLongtext(sale.comment)"></dd>
                 </dl>
             </div>
             <div class="col-4"></div>
-            <span class="position-absolute bi bi-pencil p-2" data-type="user-tool" data-action="edit"
+            <span *ngIf="sale.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool" data-action="edit"
                   (click)="openModalEditSale()"></span>
         </div>
     </div>
@@ -33,12 +33,12 @@
             <div class="card">
                 <div class="card-body">
                     <div class="d-flex justify-content-between align-items-center">
-                        <p>{{ post.createdAt | date:'dd.MM.YYYY HH:mm' }}</p>
+                        <p>{{ post.createdAt | date:'dd.MM.YYYY' }}</p>
                         <p>{{ post.ownerName }}</p>
                     </div>
                     <div>
                         <h3>{{ post.headline }}</h3>
-                        <p>{{ post.message }}</p>
+                        <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(post.message)"></p>
                     </div>
                     <span *ngIf="post.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"
                           data-action="edit" (click)="openModalEditPosting(post)"></span>
@@ -48,11 +48,11 @@
                 <div class="card ms-5" *ngFor="let comment of post.comments">
                     <div class="card-body">
                         <div class="d-flex justify-content-between align-items-center">
-                            <p>{{ comment.createdAt | date:'dd.MM.YYYY HH:mm' }}</p>
+                            <p>{{ comment.createdAt | date:'dd.MM.YYYY' }}</p>
                             <p>{{ comment.ownerName }}</p>
                         </div>
                         <div>
-                            <p>{{ comment.message }}</p>
+                            <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(comment.message)"></p>
                         </div>
                         <span *ngIf="comment.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"
                               data-action="edit" (click)="openModalEditComment(comment)"></span>
diff --git a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.ts b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.ts
index 97fd280..fb6d289 100644
--- a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.ts
+++ b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.ts
@@ -12,6 +12,7 @@ import {NewCommentComponent} from "@app/postings/new-comment/new-comment.compone
 import {NewContactComponent} from "@app/contacts/new-contact/new-contact.component";
 import {NewSaleComponent} from "@app/sales/new-sale/new-sale.component";
 import {ActivatedRoute} from "@angular/router";
+import {ApiConverter} from "@app/_helpers/api.converter";
 
 @Component({
   selector: 'app-sales-detail',
@@ -45,7 +46,8 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
       private saleService: SaleService,
       private route: ActivatedRoute,
       private postService: PostService,
-      private modalService: NgbModal
+      private modalService: NgbModal,
+      protected apiConverter: ApiConverter
   ) {
     this.user = this.accountService.userValue;
 
@@ -82,6 +84,7 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
     ).subscribe(
         data => {
           this.sale = data;
+          this.getPostsData();
         }
     );
   }
@@ -96,10 +99,12 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
         undefined,
         this.id,
         undefined,
-        false
+        undefined,
+        true
     ).subscribe(
         data => {
           this.posts = data["hydra:member"];
+          console.log(this.posts);
           this.postsLength = Number(data["hydra:totalItems"]);
           this.posts.forEach(posts => {
             if (posts.id) {
diff --git a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html
index 99eed1c..6479903 100644
--- a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html
+++ b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html
@@ -4,7 +4,7 @@
     <form [formGroup]="taskNoteForm" (ngSubmit)="onSubmit()">
         <div class="mb-3">
             <label for="message" class="form-label">{{ 'form.comment' | translate }}:</label>
-            <input type="text" class="form-control" id="message" formControlName="message"/>
+            <textarea class="form-control" id="message" formControlName="message" cols="50" rows="5"></textarea>
             <div class="form-text" *ngIf="taskNoteForm.get('message')?.invalid && taskNoteForm.get('message')?.touched">
                 {{ 'form.comment' | translate }} {{ 'form.mandatory' | translate }}.
             </div>
diff --git a/matsen-tool/src/app/tasks/new-task/new-task.component.html b/matsen-tool/src/app/tasks/new-task/new-task.component.html
index f54c938..63cabfd 100644
--- a/matsen-tool/src/app/tasks/new-task/new-task.component.html
+++ b/matsen-tool/src/app/tasks/new-task/new-task.component.html
@@ -12,7 +12,7 @@
 
         <div class="mb-3">
             <label for="description" class="form-label">{{ 'form.description' | translate }}:</label>
-            <input type="text" class="form-control" id="description" formControlName="description"/>
+            <textarea class="form-control" id="description" formControlName="description" cols="50" rows="5"></textarea>
             <div class="form-text" *ngIf="taskForm.get('description')?.invalid && taskForm.get('description')?.touched">
                 {{ 'form.description' | translate }} {{ 'form.mandatory' | translate }}.
             </div>
diff --git a/matsen-tool/src/app/tasks/tasks.component.html b/matsen-tool/src/app/tasks/tasks.component.html
index db85167..14ea9fe 100644
--- a/matsen-tool/src/app/tasks/tasks.component.html
+++ b/matsen-tool/src/app/tasks/tasks.component.html
@@ -18,7 +18,7 @@
                 </div>
                 <div class="collapse" id="collapse-{{ApiConverter.extractId(task.id)}}">
                     <div class="pt-3 pe-5 position-relative">
-                        <p class="m-0">{{task.description}}</p>
+                        <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(task.description)"></p>
                         <p>Zugewiesen an: {{task.assignedToName}}</p>
                         <span *ngIf="task.createdBy === user?.id" class="position-absolute bi bi-pencil p-2"
                               data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
@@ -33,7 +33,7 @@
                             <p>{{ taskNote.ownerName }}</p>
                         </div>
                         <div>
-                            <p>{{ taskNote.message }}</p>
+                            <p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(taskNote.message)"></p>
                         </div>
                         <span *ngIf="taskNote.owner === user?.id" class="position-absolute bi bi-pencil p-2"
                               data-type="user-tool" data-action="edit" (click)="openModalEditTaskNote(taskNote)"></span>
diff --git a/matsen-tool/src/app/tasks/tasks.component.ts b/matsen-tool/src/app/tasks/tasks.component.ts
index 0eab2ec..c7b8bf8 100644
--- a/matsen-tool/src/app/tasks/tasks.component.ts
+++ b/matsen-tool/src/app/tasks/tasks.component.ts
@@ -39,7 +39,8 @@ export class TasksComponent implements OnInit, AfterViewInit {
     constructor(
         private modalService: NgbModal,
         private accountService: AccountService,
-        private taskService: TaskService
+        private taskService: TaskService,
+        protected apiConverter: ApiConverter
     ) {
         this.user = this.accountService.userValue;