From 9608231455973325bf6940751800fc14c2125163 Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Mon, 4 Mar 2024 13:03:13 +0100 Subject: [PATCH] modal --- .../src/app/_interfaces/modalContent.ts | 2 +- matsen-tool/src/app/app.component.scss | 18 +++++++++++++ .../new-contact/new-contact.component.ts | 27 +++++++++---------- .../partners-detail.component.ts | 9 ++++--- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/matsen-tool/src/app/_interfaces/modalContent.ts b/matsen-tool/src/app/_interfaces/modalContent.ts index 5e7ab30..7d7bb13 100644 --- a/matsen-tool/src/app/_interfaces/modalContent.ts +++ b/matsen-tool/src/app/_interfaces/modalContent.ts @@ -1,3 +1,3 @@ export interface ModalContent { - inputData: any; + partner: any; } \ No newline at end of file diff --git a/matsen-tool/src/app/app.component.scss b/matsen-tool/src/app/app.component.scss index d83566a..3a73578 100644 --- a/matsen-tool/src/app/app.component.scss +++ b/matsen-tool/src/app/app.component.scss @@ -1,3 +1,21 @@ img { width: 247px; +} + +::ng-deep { + .modal-content { + padding: 1rem; + } + .modal-dialog { + &:before { + content: ""; + display: block; + background: #fff; + width: 30px; + height: 30px; + position: absolute; + right: -30px; + top: -30px; + } + } } \ No newline at end of file diff --git a/matsen-tool/src/app/contacts/new-contact/new-contact.component.ts b/matsen-tool/src/app/contacts/new-contact/new-contact.component.ts index a991dce..5dc8946 100644 --- a/matsen-tool/src/app/contacts/new-contact/new-contact.component.ts +++ b/matsen-tool/src/app/contacts/new-contact/new-contact.component.ts @@ -1,7 +1,7 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {FormGroup} from "@angular/forms"; import {contactForm} from "@app/_forms/apiForms"; -import {ContactJsonld, ContactService} from "@app/core/api/v1"; +import {ContactJsonld, ContactService, PartnerJsonld} from "@app/core/api/v1"; import {Subscription} from "rxjs"; import {ModalContent} from "@app/_interfaces/modalContent"; @@ -13,7 +13,7 @@ import {ModalContent} from "@app/_interfaces/modalContent"; }) export class NewContactComponent implements ModalContent, OnInit { - @Input() public inputData: any; + @Input() public partner!: PartnerJsonld; @Output() public submit: EventEmitter = new EventEmitter(); protected contactForm: FormGroup; @@ -30,12 +30,11 @@ export class NewContactComponent implements ModalContent, OnInit { } ngOnInit(): void { - console.log(this.inputData); - this.contactForm.patchValue({"partner": this.inputData}); + console.log(this.partner.id); + this.contactForm.patchValue({"partner": this.partner}); } onSubmit() { - //console.log(this.partnerId); if (this.contactForm.valid) { // Hier können Sie die Daten senden oder weitere Aktionen durchführen console.log(this.selectedImage); @@ -44,16 +43,16 @@ export class NewContactComponent implements ModalContent, OnInit { let newContact: ContactJsonld = this.contactForm.value as ContactJsonld; newContact.posts = []; - this.submit.emit("HALLO DANIEL"); + // this.submit.emit("HALLO DANIEL"); - // this.contactSub = this.contactService.contactsPost( - // this.contactForm.value as ContactJsonld - // ).subscribe( - // data => { - // console.log(data); - // this.submit.emit("HALLO DANIEL"); - // } - // ); + this.contactSub = this.contactService.contactsPost( + this.contactForm.value as ContactJsonld + ).subscribe( + data => { + console.log(data); + this.submit.emit("HALLO DANIEL"); + } + ); } } 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 6534826..2ea1b5a 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 @@ -95,9 +95,12 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { } openModalNewContact() { - const modalRef = this.modalService.open(ModalComponent); - modalRef.componentInstance.dynamicComponent = NewContactComponent; - modalRef.componentInstance.inputData = ModalComponent.createInputData(this.partner.id); + const modalRef = this.modalService.open(NewContactComponent); + modalRef.componentInstance.partner = this.partner; + modalRef.componentInstance.submit.subscribe(($e: any) => { + console.log($e); + this.modalService.dismissAll(); + }); } openModalNewPosting() {