diff --git a/matsen-tool/src/app/_helpers/api.converter.ts b/matsen-tool/src/app/_helpers/api.converter.ts index d123b42..de94881 100644 --- a/matsen-tool/src/app/_helpers/api.converter.ts +++ b/matsen-tool/src/app/_helpers/api.converter.ts @@ -1,5 +1,11 @@ +import {DomSanitizer, SafeHtml} from "@angular/platform-browser"; +import {Injectable} from "@angular/core"; + +@Injectable({ providedIn: 'root' }) export class ApiConverter { + constructor(private sanitizer: DomSanitizer) {} + public static extractId(iri: string | undefined): string { if (iri !== undefined) { const iriRegex = /\/(\d+)$/; @@ -20,4 +26,11 @@ export class ApiConverter { } return ""; } + + public getSafeLongtext(longtext: any): SafeHtml { + if (longtext) { + return this.sanitizer.bypassSecurityTrustHtml(longtext.replace(/\n/g, '
')); + } + return false; + } } \ No newline at end of file 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 8d7c122..d3f9d06 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 @@ -1,5 +1,5 @@
-
+

{{ contact.firstName }} {{ contact.lastName }}

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 6cd58fd..895d0f2 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 @@ -12,6 +12,7 @@ import {User} from "@app/_models"; import {AccountService} from "@app/_services"; import {NewCommentComponent} from "@app/postings/new-comment/new-comment.component"; import {ApiConverter} from "@app/_helpers/api.converter"; +import {constructorParametersDownlevelTransform} from "@angular/compiler-cli"; @Component({ selector: 'app-contacts-detail', diff --git a/matsen-tool/src/app/partners/new-partner/new-partner.component.html b/matsen-tool/src/app/partners/new-partner/new-partner.component.html index 10d8417..3733ea8 100644 --- a/matsen-tool/src/app/partners/new-partner/new-partner.component.html +++ b/matsen-tool/src/app/partners/new-partner/new-partner.component.html @@ -40,6 +40,11 @@
+
+ + +
+
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 29e15b9..074ed3e 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 @@ -39,6 +39,11 @@
+
+
+

+
+
@@ -82,31 +87,6 @@
-
-
-
-

Kunden Details

-
-
-
-
-

Viel Platz für Freitext

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt - ut - labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo - dolores - et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. - Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt - ut - labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo - dolores - et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit - amet.

-
-
-
-
-
@@ -154,8 +134,10 @@
- {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} {{ 'basic.comment-it' | translate }} @@ -212,8 +194,10 @@
- {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} {{ 'basic.comment-it' | translate }} diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts index f9752fa..9029e7a 100644 --- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts +++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts @@ -87,7 +87,8 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { private partnerFollowService: PartnerFollowService, private contactService: ContactService, private postService: PostService, - private taskService: TaskService + private taskService: TaskService, + protected apiConverter: ApiConverter ) { this.id = ""; this.partnerDetailSub = new Subscription(); @@ -151,6 +152,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { ).subscribe( data => { this.partner = data; + console.log(this.partner); } ); } diff --git a/matsen-tool/src/assets/scss/_basics.scss b/matsen-tool/src/assets/scss/_basics.scss index 0195420..1d917e6 100644 --- a/matsen-tool/src/assets/scss/_basics.scss +++ b/matsen-tool/src/assets/scss/_basics.scss @@ -34,6 +34,7 @@ img { .importance { display: block; width: 50vw; + max-width: 800px; height: 5px; position: absolute; right: 0; @@ -47,4 +48,12 @@ img { &[data-importance="high"] { background: #bb1414; } +} + +.contacts { + img { + object-fit: cover; + height: 120px; + width: 100%; + } } \ No newline at end of file